e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add -brs to indent profile. 

SVN revision: 34096
This commit is contained in:
Kim Woelders 2008-03-23 11:54:24 +00:00
parent a39948076c
commit e7f01c2d6f
79 changed files with 285 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.indent.pro vendored
View File

@ -1 +1 @@
-i3 -bl -bad -nbap -sob -ncdb -di20 -nbc -lp -nce -npcs -sc -ncs -l80 -i3 -bl -bad -nbap -sob -ncdb -di20 -nbc -lp -nce -npcs -sc -ncs -brs -l80

9
dox/dox.h
View File

@ -66,8 +66,7 @@
typedef struct _efont Efont; typedef struct _efont Efont;
typedef struct _root typedef struct _root {
{
Window win; Window win;
Visual *vis; Visual *vis;
unsigned int depth; unsigned int depth;
@ -76,8 +75,7 @@ typedef struct _root
unsigned int w, h; unsigned int w, h;
} Root; } Root;
typedef struct _textstate typedef struct _textstate {
{
char *fontname; char *fontname;
XColor fg_col; XColor fg_col;
XColor bg_col; XColor bg_col;
@ -91,8 +89,7 @@ typedef struct _textstate
int height; int height;
} TextState; } TextState;
typedef struct _link typedef struct _link {
{
char *name; char *name;
int x, y, w, h; int x, y, w, h;
struct _link *next; struct _link *next;

3
dox/file.c
View File

@ -118,8 +118,7 @@ word_mb(char *s, int num, char *wd, int *spaceflag)
char *start, *finish, *ss, *w; char *start, *finish, *ss, *w;
int wcflg, mbflg; int wcflg, mbflg;
struct char_class struct char_class {
{
const char *name; const char *name;
wctype_t wt; wctype_t wt;
} *cc, char_class_tbl[] = } *cc, char_class_tbl[] =

18
dox/format.c
View File

@ -27,8 +27,7 @@
#define DEFAULT_LINKCOLOR_G 50 #define DEFAULT_LINKCOLOR_G 50
#define DEFAULT_LINKCOLOR_B 160 #define DEFAULT_LINKCOLOR_B 160
typedef enum _type typedef enum _type {
{
IMG, IMG,
BR, BR,
FONT, FONT,
@ -37,8 +36,7 @@ typedef enum _type
PAGE PAGE
} Type; } Type;
typedef struct _img typedef struct _img {
{
char *src; char *src;
char *src2; char *src2;
char *src3; char *src3;
@ -47,25 +45,21 @@ typedef struct _img
int w, h; int w, h;
} Img_; } Img_;
typedef struct _font typedef struct _font {
{
char *face; char *face;
int r, g, b; int r, g, b;
} Font_; } Font_;
typedef struct _p typedef struct _p {
{
float align; float align;
} P_; } P_;
typedef struct _object typedef struct _object {
{
Type type; Type type;
void *object; void *object;
} Object; } Object;
typedef struct _page typedef struct _page {
{
char *name; char *name;
int count; int count;
Object *obj; Object *obj;

3
dox/ttfont.c
View File

@ -22,8 +22,7 @@
*/ */
#include "dox.h" #include "dox.h"
struct _efont struct _efont {
{
Imlib_Font face; Imlib_Font face;
}; };

3
eesh/E.h
View File

@ -37,8 +37,7 @@
#define USE_LIBC_STRDUP 1 /* Use libc strdup if present */ #define USE_LIBC_STRDUP 1 /* Use libc strdup if present */
#endif #endif
typedef struct typedef struct {
{
Window win; Window win;
char *msg; char *msg;
} Client; } Client;

9
epp/cppexp.c
View File

@ -41,8 +41,7 @@
#include <string.h> #include <string.h>
/* This is used for communicating lists of keywords with cccp.c. */ /* This is used for communicating lists of keywords with cccp.c. */
struct arglist struct arglist {
{
struct arglist *next; struct arglist *next;
unsigned char *name; unsigned char *name;
int length; int length;
@ -124,8 +123,7 @@ struct arglist
#define SKIP_OPERAND 8 #define SKIP_OPERAND 8
/*#define UNSIGNEDP 16 */ /*#define UNSIGNEDP 16 */
struct operation struct operation {
{
short op; short op;
char rprio; /* Priority of op (relative to it right operand). */ char rprio; /* Priority of op (relative to it right operand). */
char flags; char flags;
@ -242,8 +240,7 @@ parse_number(struct operation *op, cpp_reader * pfile, const char *start,
op->op = INT; op->op = INT;
} }
struct token struct token {
{
const char *oper; const char *oper;
int token; int token;
}; };

6
epp/cpphash.h
View File

@ -2,15 +2,13 @@ enum node_type;
/* different kinds of things that can appear in the value field /* different kinds of things that can appear in the value field
of a hash node. Actually, this may be useless now. */ of a hash node. Actually, this may be useless now. */
union hashval union hashval {
{
int ival; int ival;
char *cpval; char *cpval;
DEFINITION *defn; DEFINITION *defn;
}; };
struct hashnode struct hashnode {
{
struct hashnode *next; /* double links for easy deletion */ struct hashnode *next; /* double links for easy deletion */
struct hashnode *prev; struct hashnode *prev;
struct hashnode **bucket_hdr; /* also, a back pointer to this node's hash struct hashnode **bucket_hdr; /* also, a back pointer to this node's hash

39
epp/cpplib.c
View File

@ -163,8 +163,7 @@ static const char *predefs = "";
#define REGISTER_PREFIX "" #define REGISTER_PREFIX ""
#endif #endif
struct directive struct directive {
{
int length; int length;
int (*func) (cpp_reader * pfile, struct directive * keyword, int (*func) (cpp_reader * pfile, struct directive * keyword,
unsigned char *buf, unsigned char *limit); unsigned char *buf, unsigned char *limit);
@ -180,14 +179,12 @@ struct directive
* Each value is itself a list of "tokens". * Each value is itself a list of "tokens".
* These are strings that are compared by name. */ * These are strings that are compared by name. */
struct tokenlist_list struct tokenlist_list {
{
struct tokenlist_list *next; struct tokenlist_list *next;
struct arglist *tokens; struct arglist *tokens;
}; };
struct assertion_hashnode struct assertion_hashnode {
{
struct assertion_hashnode *next; /* double links for easy deletion */ struct assertion_hashnode *next; /* double links for easy deletion */
struct assertion_hashnode *prev; struct assertion_hashnode *prev;
/* also, a back pointer to this node's hash /* also, a back pointer to this node's hash
@ -230,16 +227,14 @@ struct assertion_hashnode
char *progname; char *progname;
struct cpp_pending struct cpp_pending {
{
struct cpp_pending *next; struct cpp_pending *next;
const char *cmd; const char *cmd;
const char *arg; const char *arg;
}; };
/* Structure returned by create_definition */ /* Structure returned by create_definition */
typedef struct typedef struct {
{
struct definition *defn; struct definition *defn;
char *symnam; char *symnam;
int symlen; int symlen;
@ -303,8 +298,7 @@ static cpp_buffer *cpp_push_buffer(cpp_reader * pfile, unsigned char *buffer,
static cpp_buffer *cpp_pop_buffer(cpp_reader * pfile); static cpp_buffer *cpp_pop_buffer(cpp_reader * pfile);
/* Last arg to output_line_command. */ /* Last arg to output_line_command. */
enum file_change_code enum file_change_code {
{
same_file, enter_file, leave_file same_file, enter_file, leave_file
}; };
@ -369,8 +363,7 @@ static void parse_goto_mark(struct parse_marker *pmark,
static void parse_move_mark(struct parse_marker *pmark, static void parse_move_mark(struct parse_marker *pmark,
cpp_reader * pfile); cpp_reader * pfile);
struct file_name_list struct file_name_list {
{
struct file_name_list *next; struct file_name_list *next;
char *fname; char *fname;
/* If the following is nonzero, it is a macro name. /* If the following is nonzero, it is a macro name.
@ -393,15 +386,13 @@ struct file_name_list
/* #include <file> just looks in the stack. */ /* #include <file> just looks in the stack. */
/* -I directories are added to the end, then the defaults are added. */ /* -I directories are added to the end, then the defaults are added. */
/* The */ /* The */
static struct default_include static struct default_include {
{
const char *fname; /* The name of the directory. */ const char *fname; /* The name of the directory. */
int cplusplus; /* Only look here if we're compiling C++. */ int cplusplus; /* Only look here if we're compiling C++. */
int cxx_aware; /* Includes in this directory don't need to int cxx_aware; /* Includes in this directory don't need to
* be wrapped in extern "C" when compiling * be wrapped in extern "C" when compiling
* C++. */ * C++. */
} } include_defaults_array[]
include_defaults_array[]
#ifdef INCLUDE_DEFAULTS #ifdef INCLUDE_DEFAULTS
= INCLUDE_DEFAULTS; = INCLUDE_DEFAULTS;
@ -1184,8 +1175,7 @@ pass_thru_directive(char *buf, char *limit, cpp_reader * pfile,
* the current #define has been processed and entered into the * the current #define has been processed and entered into the
* hash table. */ * hash table. */
struct arglist struct arglist {
{
struct arglist *next; struct arglist *next;
char *name; char *name;
int length; int length;
@ -1934,8 +1924,7 @@ do_define(cpp_reader * pfile, struct directive *keyword,
/* raw and expanded are relative to ARG_BASE */ /* raw and expanded are relative to ARG_BASE */
#define ARG_BASE ((pfile)->token_buffer) #define ARG_BASE ((pfile)->token_buffer)
struct argdata struct argdata {
{
/* Strings relative to pfile->token_buffer */ /* Strings relative to pfile->token_buffer */
long raw, expanded, stringified; long raw, expanded, stringified;
int raw_length, expand_length; int raw_length, expand_length;
@ -5369,8 +5358,7 @@ add_import(cpp_reader * pfile, int fd, char *fname)
* of lines with two tokens on each line. The first token is the name * of lines with two tokens on each line. The first token is the name
* to map, and the second token is the actual name to use. */ * to map, and the second token is the actual name to use. */
struct file_name_map struct file_name_map {
{
struct file_name_map *map_next; struct file_name_map *map_next;
char *map_from; char *map_from;
char *map_to; char *map_to;
@ -5411,8 +5399,7 @@ read_filename_string(int ch, FILE * f)
} }
/* This structure holds a linked list of file name maps, one per directory. */ /* This structure holds a linked list of file name maps, one per directory. */
struct file_name_map_list struct file_name_map_list {
{
struct file_name_map_list *map_list_next; struct file_name_map_list *map_list_next;
char *map_list_name; char *map_list_name;
struct file_name_map *map_list_map; struct file_name_map *map_list_map;

39
epp/cpplib.h
View File

@ -43,8 +43,7 @@ typedef struct cpp_reader cpp_reader;
typedef struct cpp_buffer cpp_buffer; typedef struct cpp_buffer cpp_buffer;
typedef struct cpp_options cpp_options; typedef struct cpp_options cpp_options;
enum cpp_token enum cpp_token {
{
CPP_EOF = -1, CPP_EOF = -1,
CPP_OTHER = 0, CPP_OTHER = 0,
CPP_COMMENT = 1, CPP_COMMENT = 1,
@ -72,8 +71,7 @@ typedef int (*parse_cleanup_t) (cpp_buffer *, cpp_reader *);
/* A parse_marker indicates a previous position, /* A parse_marker indicates a previous position,
which we can backtrack to. */ which we can backtrack to. */
struct parse_marker struct parse_marker {
{
cpp_buffer *buf; cpp_buffer *buf;
struct parse_marker *next; struct parse_marker *next;
int position; int position;
@ -87,8 +85,7 @@ extern void cpp_skip_hspace(cpp_reader * pfile);
#define IMPORT_HASH_SIZE 31 #define IMPORT_HASH_SIZE 31
struct import_file struct import_file {
{
char *name; char *name;
ino_t inode; ino_t inode;
dev_t dev; dev_t dev;
@ -98,13 +95,11 @@ struct import_file
/* If we have a huge buffer, may need to cache more recent counts */ /* If we have a huge buffer, may need to cache more recent counts */
#define CPP_LINE_BASE(BUF) ((BUF)->buf + (BUF)->line_base) #define CPP_LINE_BASE(BUF) ((BUF)->buf + (BUF)->line_base)
enum dump_type enum dump_type {
{
dump_none = 0, dump_only, dump_names, dump_definitions dump_none = 0, dump_only, dump_names, dump_definitions
}; };
struct cpp_buffer struct cpp_buffer {
{
unsigned char *buf; unsigned char *buf;
unsigned char *cur; unsigned char *cur;
unsigned char *rlimit; /* end of valid data */ unsigned char *rlimit; /* end of valid data */
@ -160,8 +155,7 @@ typedef struct assertion_hashnode ASSERTION_HASHNODE;
#define CPP_STACK_MAX 200 #define CPP_STACK_MAX 200
#endif #endif
struct cpp_reader struct cpp_reader {
{
unsigned char *limit; unsigned char *limit;
parse_underflow_t get_token; parse_underflow_t get_token;
cpp_buffer *buffer; cpp_buffer *buffer;
@ -294,8 +288,7 @@ struct cpp_reader
#endif #endif
/* Pointed to by parse_file::data. */ /* Pointed to by parse_file::data. */
struct cpp_options struct cpp_options {
{
const char *in_fname; const char *in_fname;
/* Name of output file, for error messages. */ /* Name of output file, for error messages. */
@ -496,8 +489,7 @@ extern char *progname;
by a separate piece of code. */ by a separate piece of code. */
/* different flavors of hash nodes --- also used in keyword table */ /* different flavors of hash nodes --- also used in keyword table */
enum node_type enum node_type {
{
T_DEFINE = 1, /* the `#define' keyword */ T_DEFINE = 1, /* the `#define' keyword */
T_INCLUDE, /* the `#include' keyword */ T_INCLUDE, /* the `#include' keyword */
T_INCLUDE_NEXT, /* the `#include_next' keyword */ T_INCLUDE_NEXT, /* the `#include_next' keyword */
@ -558,8 +550,7 @@ enum node_type
{ (0, 1), (1, 1), (1, 1), ..., (1, 1), NULL } { (0, 1), (1, 1), (1, 1), ..., (1, 1), NULL }
where (x, y) means (nchars, argno). */ where (x, y) means (nchars, argno). */
struct reflist struct reflist {
{
struct reflist *next; struct reflist *next;
char stringify; /* nonzero if this arg was preceded by a char stringify; /* nonzero if this arg was preceded by a
* # operator. */ * # operator. */
@ -572,8 +563,7 @@ struct reflist
}; };
typedef struct definition DEFINITION; typedef struct definition DEFINITION;
struct definition struct definition {
{
int nargs; int nargs;
int length; /* length of expansion string */ int length; /* length of expansion string */
int predefined; /* True if the macro was builtin or */ int predefined; /* True if the macro was builtin or */
@ -583,15 +573,13 @@ struct definition
const char *file; /* File of definition */ const char *file; /* File of definition */
char rest_args; /* Nonzero if last arg. absorbs the rest */ char rest_args; /* Nonzero if last arg. absorbs the rest */
struct reflist *pattern; struct reflist *pattern;
union union {
{
/* Names of macro args, concatenated in reverse order /* Names of macro args, concatenated in reverse order
* with comma-space between them. * with comma-space between them.
* The only use of this is that we warn on redefinition * The only use of this is that we warn on redefinition
* if this differs between the old and new definitions. */ * if this differs between the old and new definitions. */
unsigned char *argnames; unsigned char *argnames;
} } args;
args;
}; };
extern unsigned char is_idchar[256]; extern unsigned char is_idchar[256];
@ -599,8 +587,7 @@ extern unsigned char is_idchar[256];
/* Stack of conditionals currently in progress /* Stack of conditionals currently in progress
(including both successful and failing conditionals). */ (including both successful and failing conditionals). */
struct if_stack struct if_stack {
{
struct if_stack *next; /* for chaining to the next stack frame */ struct if_stack *next; /* for chaining to the next stack frame */
const char *fname; /* copied from input when frame is made */ const char *fname; /* copied from input when frame is made */
int lineno; /* similarly */ int lineno; /* similarly */

138
src/E.h
View File

@ -210,14 +210,11 @@
*/ */
#include "etypes.h" #include "etypes.h"
typedef struct typedef struct {
{
int min, max; int min, max;
} } Constraints;
Constraints;
typedef struct typedef struct {
{
Window xwin; Window xwin;
Win win; Win win;
Visual *vis; Visual *vis;
@ -225,11 +222,9 @@ typedef struct
Colormap cmap; Colormap cmap;
int scr; int scr;
int w, h; int w, h;
} } RealRoot;
RealRoot;
typedef struct typedef struct {
{
Window xwin; Window xwin;
Win win; Win win;
Visual *vis; Visual *vis;
@ -238,33 +233,26 @@ typedef struct
int scr; int scr;
int w, h; int w, h;
Pixmap pmap; /* Compositing buffer */ Pixmap pmap; /* Compositing buffer */
} } VirtRoot;
VirtRoot;
/* Configuration parameters */ /* Configuration parameters */
typedef struct typedef struct {
{ struct {
struct
{
unsigned int step; /* Animation time step, ms */ unsigned int step; /* Animation time step, ms */
} animation; } animation;
struct struct {
{
char enable; char enable;
int delay; /* milliseconds */ int delay; /* milliseconds */
} autoraise; } autoraise;
struct struct {
{
char hiquality; char hiquality;
char user; char user;
int timeout; int timeout;
} backgrounds; } backgrounds;
struct struct {
{
int move_resistance; int move_resistance;
} buttons; } buttons;
struct struct {
{
unsigned int num; unsigned int num;
int dragdir; int dragdir;
int dragbar_width; int dragbar_width;
@ -279,21 +267,18 @@ typedef struct
int edge_flip_mode; int edge_flip_mode;
int edge_flip_resistance; int edge_flip_resistance;
} desks; } desks;
struct struct {
{
char headers; char headers;
char button_image; char button_image;
} dialogs; } dialogs;
struct struct {
{
char enable; /* wmdockapp only */ char enable; /* wmdockapp only */
char sticky; /* Make dockapps sticky by default */ char sticky; /* Make dockapps sticky by default */
int dirmode; int dirmode;
int startx; int startx;
int starty; int starty;
} dock; } dock;
struct struct {
{
int mode; int mode;
char clickraises; char clickraises;
char transientsfollowleader; char transientsfollowleader;
@ -305,24 +290,20 @@ typedef struct
char warp_on_next; char warp_on_next;
char warp_always; char warp_always;
} focus; } focus;
struct struct {
{
char set_xroot_info_on_root_window; char set_xroot_info_on_root_window;
} hints; } hints;
struct struct {
{
char animate; char animate;
char onscreen; char onscreen;
char warp; char warp;
char show_icons; char show_icons;
int icon_size; int icon_size;
struct struct {
{
KeySym left, right, up, down, escape, ret; KeySym left, right, up, down, escape, ret;
} key; } key;
} menus; } menus;
struct struct {
{
int mode_move; int mode_move;
int mode_resize; int mode_resize;
int mode_info; int mode_info;
@ -332,16 +313,14 @@ typedef struct
char update_while_moving; char update_while_moving;
char enable_sync_request; char enable_sync_request;
} movres; } movres;
struct struct {
{
int movres; int movres;
int menus; int menus;
int tooltips; int tooltips;
int focused; int focused;
int unfocused; int unfocused;
} opacity; } opacity;
struct struct {
{
char manual; char manual;
char manual_mouse_pointer; char manual_mouse_pointer;
char center_if_desk_full; char center_if_desk_full;
@ -356,8 +335,7 @@ typedef struct
char extra_head; /* Not used */ char extra_head; /* Not used */
#endif #endif
} place; } place;
struct struct {
{
char enable_script; char enable_script;
char *script; char *script;
char enable_logout_dialog; char enable_logout_dialog;
@ -365,24 +343,20 @@ typedef struct
char *cmd_reboot; char *cmd_reboot;
char *cmd_halt; char *cmd_halt;
} session; } session;
struct struct {
{
char animate; char animate;
int speed; int speed;
} shading; } shading;
struct struct {
{
char enable; char enable;
int edge_snap_dist; int edge_snap_dist;
int screen_snap_dist; int screen_snap_dist;
} snap; } snap;
struct struct {
{
char firsttime; char firsttime;
char animate; char animate;
} startup; } startup;
struct struct {
{
char localise; char localise;
char use_alt_font_cfg; char use_alt_font_cfg;
char *name; char *name;
@ -391,8 +365,7 @@ typedef struct
char *font_cfg; char *font_cfg;
} theme; } theme;
#ifdef ENABLE_THEME_TRANSPARENCY #ifdef ENABLE_THEME_TRANSPARENCY
struct struct {
{
int alpha; int alpha;
int border; int border;
int widget; int widget;
@ -406,8 +379,7 @@ typedef struct
int warplist; int warplist;
} trans; } trans;
#endif #endif
struct struct {
{
char enable; char enable;
char showsticky; char showsticky;
char showshaded; char showshaded;
@ -419,8 +391,7 @@ typedef struct
int icon_mode; int icon_mode;
} warplist; } warplist;
struct struct {
{
char argb_internal_objects; char argb_internal_objects;
char argb_internal_clients; char argb_internal_clients;
char argb_clients; char argb_clients;
@ -436,23 +407,18 @@ typedef struct
char memory_paranoia; char memory_paranoia;
char save_under; char save_under;
char difftime; char difftime;
} } EConf;
EConf;
typedef struct typedef struct {
{ struct {
struct
{
unsigned int startup_id; unsigned int startup_id;
} apps; } apps;
struct struct {
{
char *name; char *name;
char *dir; char *dir;
char *cache_dir; char *cache_dir;
} conf; } conf;
struct struct {
{
char *name; char *name;
int screens; int screens;
#ifdef HAVE_XINERAMA #ifdef HAVE_XINERAMA
@ -462,8 +428,7 @@ typedef struct
XID server_time; XID server_time;
#endif #endif
} display; } display;
struct struct {
{
Time time; Time time;
int cx, cy; /* Any detected pointer movement */ int cx, cy; /* Any detected pointer movement */
int mx, my; /* Motion event */ int mx, my; /* Motion event */
@ -480,55 +445,45 @@ typedef struct
unsigned int damage_count; unsigned int damage_count;
#endif #endif
} events; } events;
struct struct {
{
int server_grabbed; int server_grabbed;
char pointer_grab_active; char pointer_grab_active;
Window pointer_grab_window; Window pointer_grab_window;
} grabs; } grabs;
struct struct {
{
const char *lang; const char *lang;
char utf8_int; /* Use UTF-8 internally */ char utf8_int; /* Use UTF-8 internally */
char utf8_loc; /* Locale is UTF-8 */ char utf8_loc; /* Locale is UTF-8 */
} locale; } locale;
struct struct {
{
unsigned int mod_key_mask; unsigned int mod_key_mask;
unsigned int mod_combos[8]; unsigned int mod_combos[8];
} masks; } masks;
struct struct {
{
char check; /* Avoid losing windows offscreen */ char check; /* Avoid losing windows offscreen */
char swap; char swap;
int swapcoord_x, swapcoord_y; int swapcoord_x, swapcoord_y;
} move; } move;
struct struct {
{
signed char enable_features; signed char enable_features;
char doing_manual; char doing_manual;
char doing_slide; char doing_slide;
} place; } place;
struct struct {
{
int w_old; int w_old;
int h_old; int h_old;
} screen; } screen;
struct struct {
{
unsigned int extensions; unsigned int extensions;
} server; } server;
struct struct {
{
Pixmap ext_pmap; Pixmap ext_pmap;
char ext_pmap_valid; char ext_pmap_valid;
} root; } root;
struct struct {
{
char *path; char *path;
} theme; } theme;
struct struct {
{
char *exec_name; /* argv[0] */ char *exec_name; /* argv[0] */
char master; /* We are the master E */ char master; /* We are the master E */
char single; /* No slaves */ char single; /* No slaves */
@ -563,8 +518,7 @@ typedef struct
char showing_desktop; char showing_desktop;
Window button_proxy_win; Window button_proxy_win;
char firsttime; char firsttime;
} } EMode;
EMode;
/* /*
* Function prototypes * Function prototypes

12
src/aclass.c
View File

@ -32,15 +32,12 @@
#include "grabs.h" #include "grabs.h"
#include <ctype.h> #include <ctype.h>
typedef struct _actiontype typedef struct _actiontype {
{
char *params; char *params;
struct _actiontype *next; struct _actiontype *next;
} } ActionType;
ActionType;
struct _action struct _action {
{
char event; char event;
char anymodifier; char anymodifier;
int modifiers; int modifiers;
@ -53,8 +50,7 @@ struct _action
ActionType *action; ActionType *action;
}; };
struct _actionclass struct _actionclass {
{
char *name; char *name;
int num; int num;
Action **list; Action **list;

6
src/arrange.c
View File

@ -29,15 +29,13 @@
#define DEBUG_ARRANGE 0 #define DEBUG_ARRANGE 0
typedef struct typedef struct {
{
void *data; void *data;
int x, y, w, h; int x, y, w, h;
int p; int p;
} RectBox; } RectBox;
typedef struct typedef struct {
{
int x, y; int x, y;
int p, q; int p, q;
} RectInfo; } RectInfo;

6
src/backgrounds.c
View File

@ -36,8 +36,7 @@
#include "timers.h" #include "timers.h"
#include "xwin.h" #include "xwin.h"
typedef struct typedef struct {
{
char *file; char *file;
char *real_file; char *real_file;
EImage *im; EImage *im;
@ -46,8 +45,7 @@ typedef struct
int xperc, yperc; int xperc, yperc;
} BgPart; } BgPart;
struct _background struct _background {
{
char *name; char *name;
Pixmap pmap; Pixmap pmap;
time_t last_viewed; time_t last_viewed;

30
src/borders.h
View File

@ -27,27 +27,20 @@
#include "eimage.h" #include "eimage.h"
#include "etypes.h" #include "etypes.h"
typedef struct typedef struct {
{
int originbox; int originbox;
struct struct {
{
int percent; int percent;
int absolute; int absolute;
} } x , y;
x , y; } WinPoint;
}
WinPoint;
typedef struct typedef struct {
{
Constraints width, height; Constraints width, height;
WinPoint topleft, bottomright; WinPoint topleft, bottomright;
} } Geometry;
Geometry;
typedef struct typedef struct {
{
Geometry geom; Geometry geom;
ImageClass *iclass; ImageClass *iclass;
ActionClass *aclass; ActionClass *aclass;
@ -56,11 +49,9 @@ typedef struct
signed char ontop; signed char ontop;
int flags; int flags;
char keep_for_shade; char keep_for_shade;
} } WinPart;
WinPart;
struct _border struct _border {
{
char *name; char *name;
char *group_border_name; char *group_border_name;
EImageBorder border; EImageBorder border;
@ -73,8 +64,7 @@ struct _border
ActionClass *aclass; ActionClass *aclass;
}; };
struct _ewinbit struct _ewinbit {
{
EWin *ewin; /* Belongs to */ EWin *ewin; /* Belongs to */
Win win; Win win;
int x, y, w, h; int x, y, w, h;

15
src/buttons.c
View File

@ -41,8 +41,7 @@
ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | \ ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | \
PointerMotionMask) PointerMotionMask)
typedef struct typedef struct {
{
Constraints width, height; Constraints width, height;
int xorigin, yorigin; int xorigin, yorigin;
int xabs, xrel; int xabs, xrel;
@ -50,11 +49,9 @@ typedef struct
int xsizerel, xsizeabs; int xsizerel, xsizeabs;
int ysizerel, ysizeabs; int ysizerel, ysizeabs;
char size_from_image; char size_from_image;
} } BGeometry;
BGeometry;
struct _button struct _button {
{
EObj o; EObj o;
BGeometry geom; BGeometry geom;
ImageClass *iclass; ImageClass *iclass;
@ -77,8 +74,7 @@ struct _button
static Ecore_List *button_list = NULL; static Ecore_List *button_list = NULL;
static struct static struct {
{
Button *button; Button *button;
char loading_user; char loading_user;
char move_pending; char move_pending;
@ -925,8 +921,7 @@ ButtonsSighan(int sig, void *prm __UNUSED__)
} }
} }
typedef struct typedef struct {
{
int id; int id;
int match; int match;
const char *regex; const char *regex;

3
src/comms.c
View File

@ -29,8 +29,7 @@
#include "e16-ecore_list.h" #include "e16-ecore_list.h"
#include "xwin.h" #include "xwin.h"
typedef struct typedef struct {
{
char *name; char *name;
Window xwin; Window xwin;
char *msg; char *msg;

12
src/container.h
View File

@ -28,21 +28,18 @@
typedef struct _container Container; typedef struct _container Container;
typedef struct typedef struct {
{
unsigned int anim_time; /* Animation run time (ms) */ unsigned int anim_time; /* Animation run time (ms) */
} ContainerCfg; } ContainerCfg;
typedef struct typedef struct {
{
void *obj; void *obj;
int xo, yo, wo, ho; /* Outer */ int xo, yo, wo, ho; /* Outer */
int xi, yi, wi, hi; /* Inner */ int xi, yi, wi, hi; /* Inner */
EImage *im; EImage *im;
} ContainerObject; } ContainerObject;
typedef struct typedef struct {
{
void (*Init) (Container * ct); void (*Init) (Container * ct);
void (*Exit) (Container * ct, int wm_exit); void (*Exit) (Container * ct, int wm_exit);
void (*Signal) (Container * ct, int signal, void *prm); void (*Signal) (Container * ct, int signal, void *prm);
@ -52,8 +49,7 @@ typedef struct
EImage * im); EImage * im);
} ContainerOps; } ContainerOps;
struct _container struct _container {
{
const ContainerOps *ops; const ContainerOps *ops;
const char *wm_name; const char *wm_name;
const char *menu_title; const char *menu_title;

3
src/cursors.c
View File

@ -29,8 +29,7 @@
#include "emodule.h" #include "emodule.h"
#include "xwin.h" #include "xwin.h"
struct _ecursor struct _ecursor {
{
char *name; char *name;
char *file; char *file;
Cursor cursor; Cursor cursor;

6
src/desktops.c
View File

@ -53,15 +53,13 @@
#define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32 #define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32
typedef struct typedef struct {
{
Desk *current; Desk *current;
Desk *previous; Desk *previous;
Desk *desk[ENLIGHTENMENT_CONF_NUM_DESKTOPS]; Desk *desk[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
unsigned int order[ENLIGHTENMENT_CONF_NUM_DESKTOPS]; unsigned int order[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
int drag_x0, drag_y0; int drag_x0, drag_y0;
} } Desktops;
Desktops;
static void DeskRaise(unsigned int num); static void DeskRaise(unsigned int num);
static void DeskLower(unsigned int num); static void DeskLower(unsigned int num);

9
src/desktops.h
View File

@ -34,8 +34,7 @@
#define DESK_BG_TIMEOUT 3 #define DESK_BG_TIMEOUT 3
#define DESK_BG_RECONFIGURE_ALL 4 #define DESK_BG_RECONFIGURE_ALL 4
struct _desk struct _desk {
{
EObj o; EObj o;
unsigned int num; unsigned int num;
char viewable; char viewable;
@ -43,8 +42,7 @@ struct _desk
Button *tag; Button *tag;
int current_area_x; int current_area_x;
int current_area_y; int current_area_y;
struct struct {
{
Background *bg; Background *bg;
EObj *o; EObj *o;
#if USE_COMPOSITE #if USE_COMPOSITE
@ -55,8 +53,7 @@ struct _desk
unsigned long pixel; unsigned long pixel;
unsigned int seq_no; unsigned int seq_no;
} bg; } bg;
struct struct {
{
int dirty; int dirty;
EObj *latest; EObj *latest;
char update_client_list; char update_client_list;

36
src/dialog.c
View File

@ -34,8 +34,7 @@
#define DEBUG_DIALOGS 0 #define DEBUG_DIALOGS 0
typedef struct typedef struct {
{
char horizontal; char horizontal;
char numeric; char numeric;
@ -71,34 +70,29 @@ typedef struct
Win border_win; Win border_win;
} DItemSlider; } DItemSlider;
typedef struct typedef struct {
{
Win area_win; Win area_win;
int w, h; int w, h;
DialogItemCallbackFunc *init_func; DialogItemCallbackFunc *init_func;
DialogItemCallbackFunc *event_func; DialogItemCallbackFunc *event_func;
} DItemArea; } DItemArea;
typedef struct typedef struct {
{
Win check_win; Win check_win;
int check_orig_w, check_orig_h; int check_orig_w, check_orig_h;
char onoff; char onoff;
char *onoff_ptr; char *onoff_ptr;
} DItemCheckButton; } DItemCheckButton;
typedef struct typedef struct {
{
char *image; char *image;
} DItemImage; } DItemImage;
typedef struct typedef struct {
{
char horizontal; char horizontal;
} DItemSeparator; } DItemSeparator;
typedef struct typedef struct {
{
int num_columns; int num_columns;
char border; char border;
char homogenous_h; char homogenous_h;
@ -107,8 +101,7 @@ typedef struct
DItem **items; DItem **items;
} DItemTable; } DItemTable;
typedef struct typedef struct {
{
Win radio_win; Win radio_win;
int radio_orig_w, radio_orig_h; int radio_orig_w, radio_orig_h;
char onoff; char onoff;
@ -119,8 +112,7 @@ typedef struct
DialogItemCallbackFunc *event_func; DialogItemCallbackFunc *event_func;
} DItemRadioButton; } DItemRadioButton;
struct _ditem struct _ditem {
{
int type; int type;
Dialog *dlg; Dialog *dlg;
DialogCallbackFunc *func; DialogCallbackFunc *func;
@ -140,8 +132,7 @@ struct _ditem
int x, y, w, h; int x, y, w, h;
Win win; Win win;
char *text; char *text;
union union {
{
DItemCheckButton check_button; DItemCheckButton check_button;
DItemTable table; DItemTable table;
DItemImage image; DItemImage image;
@ -149,8 +140,7 @@ struct _ditem
DItemRadioButton radio_button; DItemRadioButton radio_button;
DItemSlider slider; DItemSlider slider;
DItemArea area; DItemArea area;
} } item;
item;
char realized; char realized;
char update; char update;
@ -160,16 +150,14 @@ struct _ditem
char clicked; char clicked;
}; };
typedef struct typedef struct {
{
KeyCode key; KeyCode key;
DialogCallbackFunc *func; DialogCallbackFunc *func;
int val; int val;
void *data; void *data;
} DKeyBind; } DKeyBind;
struct _dialog struct _dialog {
{
EWin *ewin; EWin *ewin;
Win win; Win win;
int w, h; int w, h;

3
src/dialog.h
View File

@ -57,8 +57,7 @@ typedef struct _ditem DItem;
typedef void (DialogCallbackFunc) (Dialog * d, int val, void *data); typedef void (DialogCallbackFunc) (Dialog * d, int val, void *data);
typedef void (DialogItemCallbackFunc) (DItem * di, int val, void *data); typedef void (DialogItemCallbackFunc) (DItem * di, int val, void *data);
typedef struct typedef struct {
{
const char *name; const char *name;
const char *label; const char *label;
const char *title; const char *title;

3
src/draw.c
View File

@ -44,8 +44,7 @@ static const char gray_bits[] = { 0x01, 0x02 };
static const char gray3_bits[] = { 0x01, 0x00, 0x04, 0x00 }; static const char gray3_bits[] = { 0x01, 0x00, 0x04, 0x00 };
#endif #endif
typedef struct typedef struct {
{
EObj o; EObj o;
Pixmap mask; Pixmap mask;
GC gc; GC gc;

6
src/e16-ecore_list.c
View File

@ -43,14 +43,12 @@
#if !USE_ECORE #if !USE_ECORE
struct _ecore_list_node struct _ecore_list_node {
{
void *data; void *data;
struct _ecore_list_node *next; struct _ecore_list_node *next;
}; };
struct _ecore_list struct _ecore_list {
{
Ecore_List_Node *first; /* The first node in the list */ Ecore_List_Node *first; /* The first node in the list */
Ecore_List_Node *last; /* The last node in the list */ Ecore_List_Node *last; /* The last node in the list */
Ecore_List_Node *current; /* The current node in the list */ Ecore_List_Node *current; /* The current node in the list */

27
src/ecompmgr.c
View File

@ -91,8 +91,7 @@
typedef struct _cmhook ECmWinInfo; typedef struct _cmhook ECmWinInfo;
struct _cmhook struct _cmhook {
{
EObj *next; /* Paint order */ EObj *next; /* Paint order */
EObj *prev; /* Paint order */ EObj *prev; /* Paint order */
Pixmap pixmap; Pixmap pixmap;
@ -142,8 +141,7 @@ struct _cmhook
#define ECM_OR_ON_MAPUNMAP 2 #define ECM_OR_ON_MAPUNMAP 2
#define ECM_OR_ON_CREATE 3 #define ECM_OR_ON_CREATE 3
static struct static struct {
{
char enable; char enable;
char resize_fix_enable; char resize_fix_enable;
char use_name_pixmap; char use_name_pixmap;
@ -151,27 +149,22 @@ static struct
char use_cow; char use_cow;
#endif #endif
int mode; int mode;
struct struct {
{
int mode; int mode;
int offset_x, offset_y; int offset_x, offset_y;
struct struct {
{
int opacity; int opacity;
int radius; int radius;
} blur; } blur;
struct struct {
{
int opacity; int opacity;
} sharp; } sharp;
} shadows; } shadows;
struct struct {
{
char enable; char enable;
unsigned int time; /* Fading time, ms */ unsigned int time; /* Fading time, ms */
} fading; } fading;
struct struct {
{
int mode; int mode;
int opacity; int opacity;
} override_redirect; } override_redirect;
@ -185,8 +178,7 @@ static struct
#define ECM_MODE_WINDOW 2 #define ECM_MODE_WINDOW 2
#define ECM_MODE_AUTO 3 #define ECM_MODE_AUTO 3
static struct static struct {
{
int mode; int mode;
Window root; Window root;
#if USE_COMPOSITE_OVERLAY_WINDOW #if USE_COMPOSITE_OVERLAY_WINDOW
@ -760,8 +752,7 @@ ECompMgrDamageAll(void)
static Picture transBlackPicture; static Picture transBlackPicture;
typedef struct typedef struct {
{
int size; int size;
double *data; double *data;
} conv; } conv;

3
src/ecompmgr.h
View File

@ -28,8 +28,7 @@
#include "eobj.h" #include "eobj.h"
#include "etypes.h" #include "etypes.h"
typedef struct typedef struct {
{
char enable; char enable;
int shadow; int shadow;
char fading; char fading;

6
src/econfig.c
View File

@ -29,14 +29,12 @@
* Braindead flat ASCII config file implementation * Braindead flat ASCII config file implementation
*/ */
typedef struct typedef struct {
{
char *key; char *key;
char *value; char *value;
} ECfgFileItem; } ECfgFileItem;
typedef struct typedef struct {
{
FILE *fs; FILE *fs;
int nitms; int nitms;
ECfgFileItem *pitms; ECfgFileItem *pitms;

9
src/econfig.h
View File

@ -23,8 +23,7 @@
#ifndef _ECONFIG_H_ #ifndef _ECONFIG_H_
#define _ECONFIG_H_ #define _ECONFIG_H_
typedef struct typedef struct {
{
const char *name; const char *name;
void *ptr; void *ptr;
char type; char type;
@ -32,14 +31,12 @@ typedef struct
void (*func) (void *item, const char *value); void (*func) (void *item, const char *value);
} CfgItem; } CfgItem;
typedef struct typedef struct {
{
int num; int num;
const CfgItem *lst; const CfgItem *lst;
} CfgItemList; } CfgItemList;
typedef enum typedef enum {
{
ITEM_TYPE_BOOL, ITEM_TYPE_BOOL,
ITEM_TYPE_INT, ITEM_TYPE_INT,
ITEM_TYPE_HEX, ITEM_TYPE_HEX,

3
src/edbus.c
View File

@ -37,8 +37,7 @@
#define D2printf(fmt...) #define D2printf(fmt...)
#endif #endif
typedef struct typedef struct {
{
char *name; char *name;
DBusConnection *conn; DBusConnection *conn;
DBusWatch *watch; DBusWatch *watch;

3
src/eglx.c
View File

@ -107,8 +107,7 @@ glx_funcs_init(void)
static void EobjTexturesFree(void); static void EobjTexturesFree(void);
typedef struct typedef struct {
{
XVisualInfo *vi; XVisualInfo *vi;
GLXContext ctx; GLXContext ctx;
GLXFBConfig fbc; GLXFBConfig fbc;

3
src/eglx.h
View File

@ -30,8 +30,7 @@
typedef struct _etexture ETexture; typedef struct _etexture ETexture;
struct _etexture struct _etexture {
{
unsigned int texture; unsigned int texture;
unsigned short target; unsigned short target;
unsigned char type; unsigned char type;

3
src/eimage.h
View File

@ -29,8 +29,7 @@
typedef void EImage; typedef void EImage;
typedef void EImageColorModifier; typedef void EImageColorModifier;
typedef struct typedef struct {
{
int left, right, top, bottom; int left, right, top, bottom;
} EImageBorder; } EImageBorder;

6
src/emodule.h
View File

@ -26,8 +26,7 @@
#include "econfig.h" #include "econfig.h"
#include "ipc.h" #include "ipc.h"
typedef struct typedef struct {
{
const char *name; const char *name;
const char *nick; const char *nick;
void (*Signal) (int sig, void *prm); void (*Signal) (int sig, void *prm);
@ -35,8 +34,7 @@ typedef struct
CfgItemList cfg; CfgItemList cfg;
} EModule; } EModule;
typedef enum typedef enum {
{
ESIGNAL_NONE, ESIGNAL_NONE,
ESIGNAL_INIT, ESIGNAL_INIT,
ESIGNAL_CONFIGURE, ESIGNAL_CONFIGURE,

3
src/eobj.c
View File

@ -594,8 +594,7 @@ void
EobjsSlideBy(EObj ** peo, int num, int dx, int dy, int speed) EobjsSlideBy(EObj ** peo, int num, int dx, int dy, int speed)
{ {
int i, k, x, y; int i, k, x, y;
struct _xy struct _xy {
{
int x, y; int x, y;
} *xy; } *xy;

6
src/eobj.h
View File

@ -28,8 +28,7 @@
typedef struct _eobj EObj; typedef struct _eobj EObj;
struct _eobj struct _eobj {
{
Win win; /* The top level window */ Win win; /* The top level window */
short type; /* Ewin, button, other, ... */ short type; /* Ewin, button, other, ... */
short ilayer; /* Internal stacking layer */ short ilayer; /* Internal stacking layer */
@ -48,8 +47,7 @@ struct _eobj
unsigned fade:1; /* Enable fading */ unsigned fade:1; /* Enable fading */
unsigned fading:1; /* Is fading */ unsigned fading:1; /* Is fading */
unsigned ghost:1; /* Ghost window */ unsigned ghost:1; /* Ghost window */
struct struct {
{
char *wm_name; char *wm_name;
char *wm_res_name; char *wm_res_name;
char *wm_res_class; char *wm_res_class;

9
src/events.c
View File

@ -56,14 +56,12 @@ static const char *EventName(unsigned int type);
* Server extension handling * Server extension handling
*/ */
typedef struct typedef struct {
{
int event_base, error_base; int event_base, error_base;
int major, minor; int major, minor;
} EServerExtData; } EServerExtData;
typedef struct typedef struct {
{
const char *name; const char *name;
unsigned int ix; unsigned int ix;
int (*query_ext) (Display * dpy, int *event, int *error); int (*query_ext) (Display * dpy, int *event, int *error);
@ -206,8 +204,7 @@ ExtQuery(const EServerExt * ext)
* File descriptor handling * File descriptor handling
*/ */
struct _EventFdDesc struct _EventFdDesc {
{
const char *name; const char *name;
int fd; int fd;
void (*handler) (void); void (*handler) (void);

6
src/ewin-ops.h
View File

@ -23,8 +23,7 @@
#ifndef _EWIN_OPS_H_ #ifndef _EWIN_OPS_H_
#define _EWIN_OPS_H_ #define _EWIN_OPS_H_
typedef enum typedef enum {
{
EWIN_OP_INVALID, EWIN_OP_INVALID,
EWIN_OP_BORDER, EWIN_OP_BORDER,
@ -77,8 +76,7 @@ typedef enum
EWIN_OP_NO_REDIRECT, EWIN_OP_NO_REDIRECT,
} winop_e; } winop_e;
typedef struct typedef struct {
{
const char *name; const char *name;
char len; char len;
char ok_ipc; char ok_ipc;

15
src/ewins.c
View File

@ -1794,11 +1794,9 @@ EwinWarpTo(EWin * ewin)
Mode.mouse_over_ewin = ewin; Mode.mouse_over_ewin = ewin;
} }
typedef union typedef union {
{
unsigned int all; unsigned int all;
struct struct {
{
unsigned char rsvd; unsigned char rsvd;
unsigned char inh_app; unsigned char inh_app;
unsigned char inh_user; unsigned char inh_user;
@ -1806,11 +1804,9 @@ typedef union
} f; } f;
} EWinMiscFlags; } EWinMiscFlags;
typedef union typedef union {
{
unsigned int all; unsigned int all;
struct struct {
{
unsigned nua:1; unsigned nua:1;
unsigned ctf:1; unsigned ctf:1;
unsigned nbg:1; unsigned nbg:1;
@ -1912,8 +1908,7 @@ EwinSlideIn(int val __UNUSED__, void *data)
/* /*
* Change requests * Change requests
*/ */
static struct static struct {
{
unsigned int flags; unsigned int flags;
EWin ewin_old; EWin ewin_old;
} EWinChanges; } EWinChanges;

51
src/ewins.h
View File

@ -34,11 +34,9 @@
#define OPSRC_USER 2 #define OPSRC_USER 2
#define OPSRC_WM 3 #define OPSRC_WM 3
typedef union typedef union {
{
unsigned char all:8; unsigned char all:8;
struct struct {
{
unsigned char rsvd:2; unsigned char rsvd:2;
unsigned char border:1; /* W */ unsigned char border:1; /* W */
unsigned char close:1; /* AU */ unsigned char close:1; /* AU */
@ -56,8 +54,7 @@ typedef union
#define EwinInhGetWM(ewin, item) (ewin->inh_wm.b.item) #define EwinInhGetWM(ewin, item) (ewin->inh_wm.b.item)
#define EwinInhSetWM(ewin, item, on) ewin->inh_wm.b.item = (on) #define EwinInhSetWM(ewin, item, on) ewin->inh_wm.b.item = (on)
typedef struct typedef struct {
{
void (*Init) (EWin * ewin); void (*Init) (EWin * ewin);
void (*Layout) (EWin * ewin, int *px, int *py, int *pw, void (*Layout) (EWin * ewin, int *px, int *py, int *pw,
int *ph); int *ph);
@ -65,8 +62,7 @@ typedef struct
void (*Close) (EWin * ewin); void (*Close) (EWin * ewin);
} EWinOps; } EWinOps;
struct _ewin struct _ewin {
{
EObj o; EObj o;
char type; char type;
Win win_container; Win win_container;
@ -76,8 +72,7 @@ struct _ewin
const Border *previous_border; const Border *previous_border;
EWinBit *bits; EWinBit *bits;
struct struct {
{
Win win; Win win;
int x, y, w, h, bw; int x, y, w, h, bw;
int grav; int grav;
@ -85,8 +80,7 @@ struct _ewin
long event_mask; long event_mask;
} client; } client;
struct struct {
{
char state; char state;
char visibility; char visibility;
char shaped; char shaped;
@ -132,8 +126,7 @@ struct _ewin
unsigned inhibit_actions:1; unsigned inhibit_actions:1;
unsigned inhibit_focus:1; unsigned inhibit_focus:1;
} state; } state;
struct struct {
{
/* User config */ /* User config */
unsigned int focused_opacity; unsigned int focused_opacity;
unsigned never_use_area:1; unsigned never_use_area:1;
@ -160,8 +153,7 @@ struct _ewin
EWinInhibit inh_app; EWinInhibit inh_app;
EWinInhibit inh_user; EWinInhibit inh_user;
EWinInhibit inh_wm; EWinInhibit inh_wm;
struct struct {
{
char *wm_icon_name; char *wm_icon_name;
char *wm_role; char *wm_role;
char *wm_command; char *wm_command;
@ -192,8 +184,7 @@ struct _ewin
char is_group_leader; char is_group_leader;
} icccm; } icccm;
struct struct {
{
unsigned valid:1; unsigned valid:1;
unsigned decor_border:1; unsigned decor_border:1;
unsigned decor_resizeh:1; unsigned decor_resizeh:1;
@ -207,8 +198,7 @@ struct _ewin
unsigned func_maximize:1; unsigned func_maximize:1;
unsigned func_close:1; unsigned func_close:1;
} mwm; } mwm;
struct struct {
{
char *wm_name; char *wm_name;
char *wm_icon_name; char *wm_icon_name;
unsigned int *wm_icon, wm_icon_len; unsigned int *wm_icon, wm_icon_len;
@ -218,11 +208,9 @@ struct _ewin
XID sync_request_counter; XID sync_request_counter;
long long sync_request_count; long long sync_request_count;
#endif #endif
union union {
{
unsigned char all; unsigned char all;
struct struct {
{
unsigned desktop:1; unsigned desktop:1;
unsigned dock:1; unsigned dock:1;
unsigned toolbar:1; unsigned toolbar:1;
@ -234,18 +222,15 @@ struct _ewin
} b; } b;
} type; } type;
} ewmh; } ewmh;
struct struct {
{
signed char gravity; signed char gravity;
int ax, ay; /* Current placed area */ int ax, ay; /* Current placed area */
int gx, gy; /* Distance to edge given by gravity */ int gx, gy; /* Distance to edge given by gravity */
} place; } place;
struct struct {
{
int left, right, top, bottom; int left, right, top, bottom;
} strut; } strut;
struct struct {
{
char shape; char shape;
char border; char border;
} update; } update;
@ -264,13 +249,11 @@ struct _ewin
int head; /* Unused? */ int head; /* Unused? */
int vx, vy; /* Position in virtual root */ int vx, vy; /* Position in virtual root */
struct struct { /* Saved state before maximization */
{ /* Saved state before maximization */
int x, y; /* Position */ int x, y; /* Position */
int w, h; /* Size */ int w, h; /* Size */
} save_max; } save_max;
struct struct { /* Saved state before fullscreen */
{ /* Saved state before fullscreen */
int x, y; /* Position */ int x, y; /* Position */
int w, h; /* Size */ int w, h; /* Size */
int layer; /* Layer */ int layer; /* Layer */

3
src/fonts.c
View File

@ -23,8 +23,7 @@
#include "E.h" #include "E.h"
#include "e16-ecore_list.h" #include "e16-ecore_list.h"
typedef struct typedef struct {
{
char *name; char *name;
char *font; char *font;
} FontAlias; } FontAlias;

12
src/fx.c
View File

@ -40,8 +40,7 @@
#define FX_OP_STOP 2 #define FX_OP_STOP 2
#define FX_OP_TOGGLE 3 #define FX_OP_TOGGLE 3
typedef struct typedef struct {
{
const char *name; const char *name;
void (*init_func) (const char *name); void (*init_func) (const char *name);
void (*desk_func) (void); void (*desk_func) (void);
@ -49,8 +48,7 @@ typedef struct
void (*pause_func) (void); void (*pause_func) (void);
char enabled; char enabled;
char paused; char paused;
} } FXHandler;
FXHandler;
/****************************** RIPPLES *************************************/ /****************************** RIPPLES *************************************/
@ -172,13 +170,11 @@ static Window fx_raindrops_win = None;
static int fx_raindrops_number = 4; static int fx_raindrops_number = 4;
static PixImg *fx_raindrops_draw = NULL; static PixImg *fx_raindrops_draw = NULL;
typedef struct typedef struct {
{
int x, y; int x, y;
int count; int count;
PixImg *buf; PixImg *buf;
} } DropContext;
DropContext;
static DropContext fx_raindrops[4]; static DropContext fx_raindrops[4];

9
src/glwin.c
View File

@ -50,18 +50,15 @@
#define D2printf(fmt...) #define D2printf(fmt...)
#endif /* ENABLE_DEBUG */ #endif /* ENABLE_DEBUG */
static struct static struct {
{
char mode; char mode;
} Conf_glwin; } Conf_glwin;
static struct static struct {
{
char active; char active;
} Mode_glwin; } Mode_glwin;
typedef struct typedef struct {
{
EObj *eo; EObj *eo;
char grabbing; char grabbing;
EWin *ewin; EWin *ewin;

9
src/groups.c
View File

@ -41,14 +41,12 @@
static Ecore_List *group_list = NULL; static Ecore_List *group_list = NULL;
static struct static struct {
{
GroupConfig dflt; GroupConfig dflt;
char swapmove; char swapmove;
} Conf_groups; } Conf_groups;
static struct static struct {
{
Group *current; Group *current;
} Mode_groups; } Mode_groups;
@ -741,8 +739,7 @@ ChooseGroupDialog(EWin * ewin, const char *message, char group_select,
DialogShowSimple(&DlgGroupChoose, (void *)message); DialogShowSimple(&DlgGroupChoose, (void *)message);
} }
typedef struct typedef struct {
{
EWin *ewin; EWin *ewin;
GroupConfig cfg; /* Dialog data for current group */ GroupConfig cfg; /* Dialog data for current group */
GroupConfig *cfgs; /* Work copy of ewin group cfgs */ GroupConfig *cfgs; /* Work copy of ewin group cfgs */

9
src/groups.h
View File

@ -40,8 +40,7 @@
#define GROUP_ACTION_SET_WINDOW_BORDER 8 #define GROUP_ACTION_SET_WINDOW_BORDER 8
#define GROUP_ACTION_RAISE_LOWER 9 #define GROUP_ACTION_RAISE_LOWER 9
typedef struct _groupconfig typedef struct _groupconfig {
{
char iconify; char iconify;
char kill; char kill;
char mirror; char mirror;
@ -50,11 +49,9 @@ typedef struct _groupconfig
char set_border; char set_border;
char shade; char shade;
char stick; char stick;
} } GroupConfig;
GroupConfig;
struct _group struct _group {
{
int index; int index;
EWin **members; EWin **members;
int num_members; int num_members;

9
src/hints.c
View File

@ -353,10 +353,8 @@ HintsSetRootInfo(Win win, Pixmap pmap, unsigned int color)
1); 1);
} }
typedef union typedef union {
{ struct {
struct
{
unsigned version:8; unsigned version:8;
unsigned rsvd:22; unsigned rsvd:22;
unsigned docked:1; unsigned docked:1;
@ -567,8 +565,7 @@ EHintsSetInfoOnAll(void)
* Selections. * Selections.
*/ */
struct _selection struct _selection {
{
Atom atom; Atom atom;
Time time; Time time;
Win win; Win win;

6
src/hiwin.c
View File

@ -33,8 +33,7 @@
#define DEBUG_HIWIN 0 #define DEBUG_HIWIN 0
struct _hiwin struct _hiwin {
{
EObj o; EObj o;
EWin *ewin; EWin *ewin;
int zoom; int zoom;
@ -46,8 +45,7 @@ struct _hiwin
EImage *im; EImage *im;
}; };
typedef struct typedef struct {
{
void (*init) (Hiwin * phi); void (*init) (Hiwin * phi);
void (*draw) (Hiwin * phi); void (*draw) (Hiwin * phi);
void (*fini) (Hiwin * phi, int shown); void (*fini) (Hiwin * phi, int shown);

24
src/iclass.c
View File

@ -35,26 +35,21 @@
#define ENABLE_DESTROY 0 /* Broken */ #define ENABLE_DESTROY 0 /* Broken */
#if ENABLE_COLOR_MODIFIERS #if ENABLE_COLOR_MODIFIERS
typedef struct typedef struct {
{
int num; int num;
unsigned char *px; unsigned char *px;
unsigned char *py; unsigned char *py;
unsigned char map[256]; unsigned char map[256];
} } ModCurve;
ModCurve;
typedef struct typedef struct {
{
char *name; char *name;
ModCurve red, green, blue; ModCurve red, green, blue;
unsigned int ref_count; unsigned int ref_count;
} } ColorModifierClass;
ColorModifierClass;
#endif #endif
struct _imagestate struct _imagestate {
{
char *im_file; char *im_file;
char *real_file; char *real_file;
char got_colors; char got_colors;
@ -70,17 +65,14 @@ struct _imagestate
#endif #endif
}; };
typedef struct typedef struct {
{
ImageState *normal; ImageState *normal;
ImageState *hilited; ImageState *hilited;
ImageState *clicked; ImageState *clicked;
ImageState *disabled; ImageState *disabled;
} } ImageStateArray;
ImageStateArray;
struct _imageclass struct _imageclass {
{
char *name; char *name;
ImageStateArray norm, active, sticky, sticky_active; ImageStateArray norm, active, sticky, sticky_active;
EImageBorder padding; EImageBorder padding;

3
src/icons.h
View File

@ -26,8 +26,7 @@
#include "eimage.h" #include "eimage.h"
typedef enum typedef enum {
{
EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_APP,
EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_IMG,
EWIN_ICON_TYPE_SNAP, EWIN_ICON_TYPE_SNAP,

3
src/ipc.c
View File

@ -1236,8 +1236,7 @@ IPC_Warp(const char *params)
} }
#if ENABLE_IPC_INSERT_KEYS #if ENABLE_IPC_INSERT_KEYS
struct _keyset struct _keyset {
{
const char *sym; const char *sym;
int state; int state;
const char *ch; const char *ch;

6
src/ipc.h
View File

@ -27,8 +27,7 @@
#include "etypes.h" #include "etypes.h"
#include "util.h" #include "util.h"
typedef struct typedef struct {
{
void (*func) (const char *line); void (*func) (const char *line);
const char *name; const char *name;
const char *nick; const char *nick;
@ -36,8 +35,7 @@ typedef struct
const char *extended_help_text; const char *extended_help_text;
} IpcItem; } IpcItem;
typedef struct typedef struct {
{
int num; int num;
const IpcItem *lst; const IpcItem *lst;
} IpcItemList; } IpcItemList;

6
src/lang.c
View File

@ -272,16 +272,14 @@ EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
* Setup * Setup
*/ */
static struct static struct {
{
char *internal; char *internal;
char *exported; char *exported;
} Conf_locale = } Conf_locale =
{ {
NULL, NULL}; NULL, NULL};
static struct static struct {
{
char init; char init;
char *env_language; char *env_language;
char *env_lc_all; char *env_lc_all;

3
src/magwin.c
View File

@ -43,8 +43,7 @@
#define USE_ANIMATOR 1 #define USE_ANIMATOR 1
/* Magnifier window */ /* Magnifier window */
typedef struct typedef struct {
{
EWin *ewin; EWin *ewin;
const char *title; const char *title;
int cx, cy; /* Center */ int cx, cy; /* Center */

3
src/main.c
View File

@ -65,8 +65,7 @@ static void RunInitPrograms(void);
static int eoptind = 0; static int eoptind = 0;
const char *eoptarg = NULL; const char *eoptarg = NULL;
typedef struct typedef struct {
{
char sopt; char sopt;
char arg; char arg;
const char *lopt; const char *lopt;

15
src/menus.c
View File

@ -48,8 +48,7 @@
#define MENU_UNLOAD_CHECK_IMTERVAL 300 /* Seconds */ #define MENU_UNLOAD_CHECK_IMTERVAL 300 /* Seconds */
static struct static struct {
{
Menu *first; Menu *first;
Menu *active; Menu *active;
EWin *context_ewin; EWin *context_ewin;
@ -57,8 +56,7 @@ static struct
char just_shown; char just_shown;
} Mode_menus; } Mode_menus;
struct _menustyle struct _menustyle {
{
char *name; char *name;
TextClass *tclass; TextClass *tclass;
ImageClass *bg_iclass; ImageClass *bg_iclass;
@ -72,8 +70,7 @@ struct _menustyle
unsigned int ref_count; unsigned int ref_count;
}; };
struct _menuitem struct _menuitem {
{
Menu *menu; Menu *menu;
ImageClass *icon_iclass; ImageClass *icon_iclass;
char *text; char *text;
@ -91,8 +88,7 @@ struct _menuitem
short text_y; short text_y;
}; };
struct _menu struct _menu {
{
EWin *ewin; EWin *ewin;
Win win; Win win;
PmapMask pmm; PmapMask pmm;
@ -1494,8 +1490,7 @@ MenusHandleMotion(void)
} }
#endif #endif
struct _mdata struct _mdata {
{
Menu *m; Menu *m;
MenuItem *mi; MenuItem *mi;
}; };

3
src/moveresize.c
View File

@ -34,8 +34,7 @@
#include "timers.h" #include "timers.h"
#include "xwin.h" #include "xwin.h"
static struct static struct {
{
EWin *ewin; EWin *ewin;
int mode; int mode;
int start_x, start_y; int start_x, start_y;

12
src/mwm.c
View File

@ -59,15 +59,13 @@
static Atom _MOTIF_WM_HINTS = 0; static Atom _MOTIF_WM_HINTS = 0;
/* Motif window hints */ /* Motif window hints */
typedef struct typedef struct {
{
long flags; long flags;
long functions; long functions;
long decorations; long decorations;
long inputMode; long inputMode;
long status; long status;
} } MWMHints;
MWMHints;
void void
MWM_GetHints(EWin * ewin, Atom atom_change) MWM_GetHints(EWin * ewin, Atom atom_change)
@ -180,12 +178,10 @@ void
MWM_SetInfo(void) MWM_SetInfo(void)
{ {
Atom a1; Atom a1;
struct struct {
{
long flags; long flags;
Window win; Window win;
} } mwminfo;
mwminfo;
a1 = XInternAtom(disp, "_MOTIF_WM_INFO", False); a1 = XInternAtom(disp, "_MOTIF_WM_INFO", False);
mwminfo.flags = 2; mwminfo.flags = 2;

15
src/pager.c
View File

@ -63,8 +63,7 @@
#define EwinGetVX2(ew) (ew->vx + EoGetW(ew)) #define EwinGetVX2(ew) (ew->vx + EoGetW(ew))
#define EwinGetVY2(ew) (ew->vy + EoGetH(ew)) #define EwinGetVY2(ew) (ew->vy + EoGetH(ew))
static struct static struct {
{
char enable; char enable;
char zoom; char zoom;
char title; char title;
@ -76,16 +75,14 @@ static struct
int menu_button; int menu_button;
} Conf_pagers; } Conf_pagers;
static struct static struct {
{
int zoom; int zoom;
Idler *idler; Idler *idler;
char update_pending; char update_pending;
char timer_pending; char timer_pending;
} Mode_pagers; } Mode_pagers;
typedef struct typedef struct {
{
EWin *ewin; EWin *ewin;
Win win; Win win;
int w, h; int w, h;
@ -749,8 +746,7 @@ PagerShow(Pager * p)
EwinShow(ewin); EwinShow(ewin);
} }
typedef struct typedef struct {
{
Desk *dsk; Desk *dsk;
void (*func) (Pager * p, void *prm); void (*func) (Pager * p, void *prm);
void *prm; void *prm;
@ -778,8 +774,7 @@ PagersForeach(Desk * dsk, void (*func) (Pager * p, void *prm), void *prm)
ecore_list_for_each(pager_list, _PagersForeachFunc, &data); ecore_list_for_each(pager_list, _PagersForeachFunc, &data);
} }
typedef struct typedef struct {
{
int why; int why;
int x1, y1, x2, y2; int x1, y1, x2, y2;
} pager_update_data; } pager_update_data;

3
src/piximg.h
View File

@ -25,8 +25,7 @@
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
typedef struct _PixImg typedef struct _PixImg {
{
XImage *xim; XImage *xim;
XShmSegmentInfo *shminfo; XShmSegmentInfo *shminfo;
Pixmap pmap; Pixmap pmap;

3
src/progress.c
View File

@ -27,8 +27,7 @@
#include "tclass.h" #include "tclass.h"
#include "xwin.h" #include "xwin.h"
struct _progressbar struct _progressbar {
{
EObj *win; EObj *win;
EObj *n_win; EObj *n_win;
EObj *p_win; EObj *p_win;

3
src/screen.c
View File

@ -30,8 +30,7 @@
#include <X11/extensions/Xinerama.h> #include <X11/extensions/Xinerama.h>
#endif #endif
typedef struct typedef struct {
{
int type; int type;
int head; int head;
int x, y; int x, y;

6
src/slideout.c
View File

@ -39,8 +39,7 @@
ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | \ ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | \
PointerMotionMask) PointerMotionMask)
typedef struct typedef struct {
{
EObj o; EObj o;
char *name; char *name;
char direction; char direction;
@ -54,8 +53,7 @@ static void SlideoutCalcSize(Slideout * s);
static Ecore_List *slideout_list = NULL; static Ecore_List *slideout_list = NULL;
static struct static struct {
{
Slideout *active; Slideout *active;
} Mode_slideouts = } Mode_slideouts =
{ {

12
src/snaps.c
View File

@ -35,8 +35,7 @@
#include "timers.h" #include "timers.h"
#include "xwin.h" #include "xwin.h"
struct _snapshot struct _snapshot {
{
char *name; char *name;
char *win_title; char *win_title;
char *win_name; char *win_name;
@ -550,12 +549,10 @@ SnapshotEwinRemove(EWin * ewin)
/* /*
* Snapshot dialogs * Snapshot dialogs
*/ */
typedef struct typedef struct {
{
Window client; Window client;
struct struct {
{
char title; char title;
char name; char name;
char clss; char clss;
@ -946,8 +943,7 @@ SnapshotEwinDialog(const EWin * ewin)
* _another_ global var, or a wrapper struct to pass data to the * _another_ global var, or a wrapper struct to pass data to the
* callback funcs besides the dialog itself -- this is much easier */ * callback funcs besides the dialog itself -- this is much easier */
typedef struct _remwinlist typedef struct _remwinlist {
{
Snapshot *snap; Snapshot *snap;
char remove; char remove;
} RememberWinList; } RememberWinList;

6
src/sound.c
View File

@ -29,8 +29,7 @@
#include "settings.h" #include "settings.h"
#include "sound.h" #include "sound.h"
typedef struct typedef struct {
{
char *name; char *name;
char *file; char *file;
Sample *sample; Sample *sample;
@ -38,8 +37,7 @@ typedef struct
#define SC_NAME(sc) ((sc) ? (sc)->name : "(none)") #define SC_NAME(sc) ((sc) ? (sc)->name : "(none)")
static struct static struct {
{
char enable; char enable;
char *theme; char *theme;
} Conf_sound; } Conf_sound;

6
src/sound.h
View File

@ -25,8 +25,7 @@
#include "config.h" #include "config.h"
typedef struct typedef struct {
{
unsigned int channels; unsigned int channels;
unsigned int bit_per_sample; unsigned int bit_per_sample;
unsigned int rate; unsigned int rate;
@ -36,8 +35,7 @@ typedef struct
typedef struct _sample Sample; typedef struct _sample Sample;
typedef struct typedef struct {
{
int (*Init) (void); int (*Init) (void);
void (*Exit) (void); void (*Exit) (void);
Sample *(*SampleLoad) (const char *file); Sample *(*SampleLoad) (const char *file);

3
src/sound_esd.c
View File

@ -30,8 +30,7 @@
#define Estrdup strdup #define Estrdup strdup
#endif #endif
struct _sample struct _sample {
{
SoundSampleData ssd; SoundSampleData ssd;
int id; int id;
}; };

3
src/sound_pa.c
View File

@ -42,8 +42,7 @@
#define D4printf(fmt...) #define D4printf(fmt...)
#endif #endif
struct _sample struct _sample {
{
SoundSampleData ssd; SoundSampleData ssd;
char *name; char *name;
unsigned int written; unsigned int written;

3
src/stacking.c
View File

@ -32,8 +32,7 @@
typedef struct _eobjlist EobjList; typedef struct _eobjlist EobjList;
struct _eobjlist struct _eobjlist {
{
const char *name; const char *name;
int nalloc; int nalloc;
int nwins; int nwins;

3
src/systray.c
View File

@ -31,8 +31,7 @@
#define DEBUG_SYSTRAY 0 #define DEBUG_SYSTRAY 0
/* Systray object info */ /* Systray object info */
typedef struct typedef struct {
{
Win win; Win win;
char mapped; char mapped;
} SWin; } SWin;

18
src/tclass.h
View File

@ -48,8 +48,7 @@
#define FONT_TYPE_PANGO_XFT 5 /* Pango-Xft */ #define FONT_TYPE_PANGO_XFT 5 /* Pango-Xft */
#endif #endif
typedef struct typedef struct {
{
int (*Load) (TextState * ts, const char *name); int (*Load) (TextState * ts, const char *name);
void (*Destroy) (TextState * ts); void (*Destroy) (TextState * ts);
void (*TextSize) (TextState * ts, const char *text, int len, void (*TextSize) (TextState * ts, const char *text, int len,
@ -64,13 +63,11 @@ typedef struct
void (*FdcSetColor) (TextState * ts, EColor * xc); void (*FdcSetColor) (TextState * ts, EColor * xc);
} FontOps; } FontOps;
struct _textstate struct _textstate {
{
char *fontname; char *fontname;
char type; char type;
char need_utf8; char need_utf8;
struct struct {
{
char mode; char mode;
char orientation; char orientation;
char effect; char effect;
@ -81,17 +78,14 @@ struct _textstate
const FontOps *ops; const FontOps *ops;
}; };
struct _textclass struct _textclass {
{
char *name; char *name;
struct struct {
{
TextState *normal; TextState *normal;
TextState *hilited; TextState *hilited;
TextState *clicked; TextState *clicked;
TextState *disabled; TextState *disabled;
} } norm , active, sticky, sticky_active;
norm , active, sticky, sticky_active;
int justification; int justification;
unsigned int ref_count; unsigned int ref_count;
}; };

9
src/text.c
View File

@ -401,8 +401,7 @@ TextstateTextFitMB(TextState * ts, char **ptext, int *pw, int textwidth_limit)
*/ */
extern const FontOps FontOpsXfs; extern const FontOps FontOpsXfs;
typedef struct typedef struct {
{
XFontSet font; XFontSet font;
int ascent; int ascent;
Win win; Win win;
@ -519,8 +518,7 @@ const FontOps FontOpsXfs = {
*/ */
extern const FontOps FontOpsXfont; extern const FontOps FontOpsXfont;
typedef struct typedef struct {
{
XFontStruct *font; XFontStruct *font;
Win win; Win win;
Drawable draw; Drawable draw;
@ -649,8 +647,7 @@ TsTextDraw(TextState * ts, int x, int y, const char *text, int len)
ts->ops->TextDraw(ts, x, y, text, len); ts->ops->TextDraw(ts, x, y, text, len);
} }
typedef struct typedef struct {
{
const char *type; const char *type;
const FontOps *ops; const FontOps *ops;
char checked; char checked;

3
src/text_pango.c
View File

@ -37,8 +37,7 @@ static PangoContext *_pango_ctx = NULL;
/* Beware! The layout of FontCtxPangoXft must match FontCtxXft /* Beware! The layout of FontCtxPangoXft must match FontCtxXft
* in order to reuse the _xft_Fdc... functions. */ * in order to reuse the _xft_Fdc... functions. */
typedef struct typedef struct {
{
PangoFontDescription *font; PangoFontDescription *font;
Win win; Win win;
Drawable draw; Drawable draw;

3
src/text_xft.c
View File

@ -33,8 +33,7 @@
*/ */
__EXPORT__ extern const FontOps FontOps_xft; __EXPORT__ extern const FontOps FontOps_xft;
typedef struct typedef struct {
{
XftFont *font; XftFont *font;
Win win; Win win;
Drawable draw; Drawable draw;

9
src/timers.c
View File

@ -27,8 +27,7 @@
#include <sys/time.h> #include <sys/time.h>
typedef struct _qentry Qentry; typedef struct _qentry Qentry;
struct _qentry struct _qentry {
{
char *name; char *name;
double at_time; double at_time;
void (*func) (int val, void *data); void (*func) (int val, void *data);
@ -179,8 +178,7 @@ static Ecore_List *idler_list = NULL;
typedef void (IdlerFunc) (void *data); typedef void (IdlerFunc) (void *data);
struct _idler struct _idler {
{
int order; int order;
IdlerFunc *func; IdlerFunc *func;
void *data; void *data;
@ -239,8 +237,7 @@ static Ecore_List *animator_list = NULL;
typedef int (AnimatorFunc) (void *data); typedef int (AnimatorFunc) (void *data);
struct _animator struct _animator {
{
char *name; char *name;
AnimatorFunc *func; AnimatorFunc *func;
void *data; void *data;

9
src/tooltips.c
View File

@ -37,23 +37,20 @@
static Ecore_List *tt_list = NULL; static Ecore_List *tt_list = NULL;
static struct static struct {
{
char enable; char enable;
char showroottooltip; char showroottooltip;
int delay; /* milliseconds */ int delay; /* milliseconds */
} Conf_tooltips; } Conf_tooltips;
static struct static struct {
{
int inhibit; int inhibit;
char root_motion_mask_set; char root_motion_mask_set;
CB_GetAclass *ac_func; CB_GetAclass *ac_func;
void *ac_data; void *ac_data;
} Mode_tooltips; } Mode_tooltips;
struct _tooltip struct _tooltip {
{
const char *name; const char *name;
ImageClass *iclass[5]; ImageClass *iclass[5];
TextClass *tclass; TextClass *tclass;

3
src/ttfont.c
View File

@ -102,8 +102,7 @@ EFont_draw_string(EImage * im, EFont * f, int x, int y,
imlib_text_draw(x, y - imlib_get_font_ascent(), text); imlib_text_draw(x, y - imlib_get_font_ascent(), text);
} }
typedef struct typedef struct {
{
EFont *font; EFont *font;
EImage *im; EImage *im;
int r, g, b; int r, g, b;

6
src/warp.c
View File

@ -45,15 +45,13 @@
#include "xwin.h" #include "xwin.h"
#include <X11/keysym.h> #include <X11/keysym.h>
typedef struct typedef struct {
{
EWin *ewin; EWin *ewin;
Win win; Win win;
char *txt; char *txt;
} WarplistItem; } WarplistItem;
typedef struct typedef struct {
{
EObj o; EObj o;
TextClass *tc; TextClass *tc;
ImageClass *ic; ImageClass *ic;

6
src/windowmatch.c
View File

@ -33,8 +33,7 @@
typedef struct _windowmatch WindowMatch; typedef struct _windowmatch WindowMatch;
struct _windowmatch struct _windowmatch {
{
char *name; char *name;
/* Match criteria */ /* Match criteria */
char match; char match;
@ -573,8 +572,7 @@ WindowMatchEobjTest(const WindowMatch * wm, const EObj * eo)
} }
#endif #endif
typedef struct typedef struct {
{
int type; int type;
const EWin *ewin; const EWin *ewin;
} wmatch_type_data; } wmatch_type_data;

15
src/xwin.h
View File

@ -58,20 +58,17 @@ typedef void (EventCallbackFunc) (Win win, XEvent * ev, void *prm);
#define EXPOSE_WIN 1 #define EXPOSE_WIN 1
#if EXPOSE_WIN || DECLARE_WIN #if EXPOSE_WIN || DECLARE_WIN
typedef struct typedef struct {
{
EventCallbackFunc *func; EventCallbackFunc *func;
void *prm; void *prm;
} EventCallbackItem; } EventCallbackItem;
typedef struct typedef struct {
{
int num; int num;
EventCallbackItem *lst; EventCallbackItem *lst;
} EventCallbackList; } EventCallbackList;
struct _xwin struct _xwin {
{
struct _xwin *next; struct _xwin *next;
struct _xwin *prev; struct _xwin *prev;
EventCallbackList cbl; EventCallbackList cbl;
@ -219,8 +216,7 @@ Pixmap EWindowGetShapePixmap(Win win);
Bool EQueryPointer(Win win, int *px, int *py, Bool EQueryPointer(Win win, int *px, int *py,
Window * pchild, unsigned int *pmask); Window * pchild, unsigned int *pmask);
typedef struct typedef struct {
{
unsigned long pixel; unsigned long pixel;
unsigned char alpha, red, green, blue; unsigned char alpha, red, green, blue;
} EColor; } EColor;
@ -257,8 +253,7 @@ GC EXCreateGC(Drawable draw, unsigned long mask,
XGCValues * val); XGCValues * val);
int EXFreeGC(GC gc); int EXFreeGC(GC gc);
typedef struct typedef struct {
{
char type; char type;
Pixmap pmap; Pixmap pmap;
Pixmap mask; Pixmap mask;