nsxiv955c39a
Shorter typedefs
+12 −12
6 files changed
| @@ -1,6 +1,6 @@ | |||
| 1 | 1 | all: sxiv | |
| 2 | 2 | ||
| 3 | − | VERSION=git-20110227 | |
| 3 | + | VERSION=git-20110301 | |
| 4 | 4 | ||
| 5 | 5 | CC?=gcc | |
| 6 | 6 | PREFIX?=/usr/local | |
| @@ -23,20 +23,20 @@ | |||
| 23 | 23 | ||
| 24 | 24 | #include "window.h" | |
| 25 | 25 | ||
| 26 | − | typedef enum scalemode_e { | |
| 26 | + | typedef enum { | |
| 27 | 27 | SCALE_DOWN = 0, | |
| 28 | 28 | SCALE_FIT, | |
| 29 | 29 | SCALE_ZOOM | |
| 30 | 30 | } scalemode_t; | |
| 31 | 31 | ||
| 32 | − | typedef enum pandir_e { | |
| 32 | + | typedef enum { | |
| 33 | 33 | PAN_LEFT = 0, | |
| 34 | 34 | PAN_RIGHT, | |
| 35 | 35 | PAN_UP, | |
| 36 | 36 | PAN_DOWN | |
| 37 | 37 | } pandir_t; | |
| 38 | 38 | ||
| 39 | − | typedef struct img_s { | |
| 39 | + | typedef struct { | |
| 40 | 40 | Imlib_Image *im; | |
| 41 | 41 | ||
| 42 | 42 | float zoom; | |
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | #include "util.h" | |
| 35 | 35 | #include "window.h" | |
| 36 | 36 | ||
| 37 | − | typedef enum appmode_e { | |
| 37 | + | typedef enum { | |
| 38 | 38 | MODE_NORMAL = 0, | |
| 39 | 39 | MODE_THUMBS | |
| 40 | 40 | } appmode_t; | |
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | 22 | #include "image.h" | |
| 23 | 23 | ||
| 24 | − | typedef struct options_s { | |
| 24 | + | typedef struct { | |
| 25 | 25 | const char **filenames; | |
| 26 | 26 | int filecnt; | |
| 27 | 27 | unsigned char from_stdin; | |
| @@ -21,14 +21,14 @@ | |||
| 21 | 21 | ||
| 22 | 22 | #include "window.h" | |
| 23 | 23 | ||
| 24 | − | typedef enum tnsdir_e { | |
| 24 | + | typedef enum { | |
| 25 | 25 | TNS_LEFT = 0, | |
| 26 | 26 | TNS_RIGHT, | |
| 27 | 27 | TNS_UP, | |
| 28 | 28 | TNS_DOWN | |
| 29 | 29 | } tnsdir_t; | |
| 30 | 30 | ||
| 31 | − | typedef struct thumb_s { | |
| 31 | + | typedef struct { | |
| 32 | 32 | Pixmap pm; | |
| 33 | 33 | int x; | |
| 34 | 34 | int y; | |
| @@ -36,7 +36,7 @@ typedef struct thumb_s { | |||
| 36 | 36 | int h; | |
| 37 | 37 | } thumb_t; | |
| 38 | 38 | ||
| 39 | − | typedef struct tns_s { | |
| 39 | + | typedef struct { | |
| 40 | 40 | thumb_t *thumbs; | |
| 41 | 41 | int cap; | |
| 42 | 42 | int cnt; | |
| @@ -23,14 +23,14 @@ | |||
| 23 | 23 | ||
| 24 | 24 | #define CLEANMASK(mask) ((mask) & ~LockMask) | |
| 25 | 25 | ||
| 26 | − | typedef enum win_cur_e { | |
| 26 | + | typedef enum { | |
| 27 | 27 | CURSOR_ARROW = 0, | |
| 28 | 28 | CURSOR_NONE, | |
| 29 | 29 | CURSOR_HAND, | |
| 30 | 30 | CURSOR_WATCH | |
| 31 | 31 | } win_cur_t; | |
| 32 | 32 | ||
| 33 | − | typedef struct win_env_s { | |
| 33 | + | typedef struct { | |
| 34 | 34 | Display *dpy; | |
| 35 | 35 | int scr; | |
| 36 | 36 | int scrw, scrh; | |
| @@ -39,7 +39,7 @@ typedef struct win_env_s { | |||
| 39 | 39 | int depth; | |
| 40 | 40 | } win_env_t; | |
| 41 | 41 | ||
| 42 | − | typedef struct win_s { | |
| 42 | + | typedef struct { | |
| 43 | 43 | Window xwin; | |
| 44 | 44 | win_env_t env; | |
| 45 | 45 | ||