---
st.c | 128 +++++++++++++++++++++++++++++++++----------------------------------
1 file changed, 64 insertions(+), 64 deletions(-)
diff --git a/st.c b/st.c
index 7423840..2c1c6e8 100644
--- a/st.c
+++ b/st.c
_AT_@ -188,84 +188,84 @@ typedef XftDraw *Draw;
typedef XftColor Color;
typedef struct {
- Rune u; /* character code */
- ushort mode; /* attribute flags */
- uint32_t fg; /* foreground */
- uint32_t bg; /* background */
+ Rune u; /* character code */
+ ushort mode; /* attribute flags */
+ uint32_t fg; /* foreground */
+ uint32_t bg; /* background */
} Glyph;
typedef Glyph *Line;
typedef struct {
Glyph attr; /* current char attributes */
- int x;
- int y;
- char state;
+ int x;
+ int y;
+ char state;
} TCursor;
/* CSI Escape sequence structs */
/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
typedef struct {
char buf[ESC_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
+ int len; /* raw string length */
char priv;
- int arg[ESC_ARG_SIZ];
- int narg; /* nb of args */
+ int arg[ESC_ARG_SIZ];
+ int narg; /* nb of args */
char mode[2];
} CSIEscape;
/* STR Escape sequence structs */
/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
typedef struct {
- char type; /* ESC type ... */
- char buf[STR_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
+ char type; /* ESC type ... */
+ char buf[STR_BUF_SIZ]; /* raw string */
+ int len; /* raw string length */
char *args[STR_ARG_SIZ];
- int narg; /* nb of args */
+ int narg; /* nb of args */
} STREscape;
/* Internal representation of the screen */
typedef struct {
- int row; /* nb row */
- int col; /* nb col */
- Line *line; /* screen */
- Line *alt; /* alternate screen */
- int *dirty; /* dirtyness of lines */
+ int row; /* nb row */
+ int col; /* nb col */
+ Line *line; /* screen */
+ Line *alt; /* alternate screen */
+ int *dirty; /* dirtyness of lines */
XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */
- TCursor c; /* cursor */
- int top; /* top scroll limit */
- int bot; /* bottom scroll limit */
- int mode; /* terminal mode flags */
- int esc; /* escape state flags */
- char trantbl[4]; /* charset table translation */
- int charset; /* current charset */
- int icharset; /* selected charset for sequence */
- int numlock; /* lock numbers in keyboard */
- int *tabs;
+ TCursor c; /* cursor */
+ int top; /* top scroll limit */
+ int bot; /* bottom scroll limit */
+ int mode; /* terminal mode flags */
+ int esc; /* escape state flags */
+ char trantbl[4]; /* charset table translation */
+ int charset; /* current charset */
+ int icharset; /* selected charset for sequence */
+ int numlock; /* lock numbers in keyboard */
+ int *tabs;
} Term;
/* Purely graphic info */
typedef struct {
- Display *dpy;
+ Display *dpy;
Colormap cmap;
- Window win;
+ Window win;
Drawable buf;
- Atom xembed, wmdeletewin, netwmname, netwmpid;
- XIM xim;
- XIC xic;
- Draw draw;
- Visual *vis;
+ Atom xembed, wmdeletewin, netwmname, netwmpid;
+ XIM xim;
+ XIC xic;
+ Draw draw;
+ Visual *vis;
XSetWindowAttributes attrs;
- int scr;
- int isfixed; /* is fixed geometry? */
- int l, t; /* left and top offset */
- int gm; /* geometry mask */
- int tw, th; /* tty width and height */
- int w, h; /* window width and height */
- int ch; /* char height */
- int cw; /* char width */
- char state; /* focus, redraw, visible */
- int cursor; /* cursor style */
+ int scr;
+ int isfixed; /* is fixed geometry? */
+ int l, t; /* left and top offset */
+ int gm; /* geometry mask */
+ int tw, th; /* tty width and height */
+ int w, h; /* window width and height */
+ int ch; /* char height */
+ int cw; /* char width */
+ char state; /* focus, redraw, visible */
+ int cursor; /* cursor style */
} XWindow;
typedef struct {
_AT_@ -276,8 +276,8 @@ typedef struct {
typedef struct {
KeySym k;
- uint mask;
- char *s;
+ uint mask;
+ char *s;
/* three valued logic variables: 0 indifferent, 1 on, -1 off */
signed char appkey; /* application keypad */
signed char appcursor; /* application cursor */
_AT_@ -301,22 +301,22 @@ typedef struct {
char *primary, *clipboard;
Atom xtarget;
- int alt;
+ int alt;
struct timespec tclick1;
struct timespec tclick2;
} Selection;
typedef union {
- int i;
- uint ui;
+ int i;
+ uint ui;
float f;
const void *v;
} Arg;
typedef struct {
- uint mod;
+ uint mod;
KeySym keysym;
- void (*func)(const Arg *);
+ void (*func)(const Arg *);
const Arg arg;
} Shortcut;
_AT_@ -337,13 +337,13 @@ static void toggleprinter(const Arg *);
/* Font structure */
typedef struct {
- int height;
- int width;
- int ascent;
- int descent;
- short lbearing;
- short rbearing;
- XftFont *match;
+ int height;
+ int width;
+ int ascent;
+ int descent;
+ short lbearing;
+ short rbearing;
+ XftFont *match;
FcFontSet *set;
FcPattern *pattern;
} Font;
_AT_@ -351,8 +351,8 @@ typedef struct {
/* Drawing Context */
typedef struct {
Color col[MAX(LEN(colorname), 256)];
- Font font, bfont, ifont, ibfont;
- GC gc;
+ Font font, bfont, ifont, ibfont;
+ GC gc;
} DC;
static void die(const char *, ...);
_AT_@ -541,8 +541,8 @@ enum {
typedef struct {
XftFont *font;
- int flags;
- Rune unicodep;
+ int flags;
+ Rune unicodep;
} Fontcache;
/* Fontcache is an array now. A new font will be appended to the array. */
--
1.8.5.5
--Multipart=_Wed__8_Jul_2015_20_45_23_+0200_.YLrupkOLV48Y1fT
Content-Type: text/x-diff;
name="0004-Make-style-consistent.patch"
Content-Disposition: attachment;
filename="0004-Make-style-consistent.patch"
Content-Transfer-Encoding: quoted-printable
Received on Mon Sep 17 2001 - 00:00:00 CEST
This archive was generated by hypermail 2.3.0 : Wed Jul 08 2015 - 22:24:09 CEST