From 8388b82d62f724bf4c82c38b993f8aa2c5feb811 Mon Sep 17 00:00:00 2001 From: Mandrake Date: Thu, 6 Jan 2000 08:13:30 +0000 Subject: [PATCH] Thu Jan 6 12:23:56 PST 2000 (Mandrake) updated copyrights to say 2000. muahahaha. SVN revision: 1864 --- src/ChangeLog | 7 + src/E.h | 1924 ++++++++++++++++++++++----------------------- src/actions.c | 113 ++- src/alert.c | 4 +- src/areas.c | 36 +- src/arrange.c | 10 +- src/arrange.h | 12 +- src/atoms.c | 3 +- src/borders.c | 24 +- src/buttons.c | 4 +- src/clone.c | 2 +- src/cmclass.c | 2 +- src/comms.c | 18 +- src/conf.h | 2 +- src/config.c | 119 ++- src/containers.c | 2 +- src/coords.c | 2 +- src/cursors.c | 2 +- src/desktops.c | 12 +- src/dialog.c | 61 +- src/dock.c | 2 +- src/draw.c | 14 +- src/events.c | 8 +- src/evhandlers.c | 65 +- src/file.c | 8 +- src/finders.c | 2 +- src/focus.c | 10 +- src/fx.c | 101 ++- src/globals.c | 2 +- src/gnome.c | 17 +- src/grabs.c | 2 +- src/groups.c | 10 +- src/handlers.c | 48 +- src/icccm.c | 2 +- src/iclass.c | 2 +- src/iconify.c | 28 +- src/init.c | 2 +- src/ipc.c | 829 +++++++++---------- src/kde.c | 12 +- src/lists.c | 2 +- src/main.c | 4 +- src/memory.c | 43 +- src/menus.c | 23 +- src/misc.c | 45 +- src/modules.c | 10 +- src/mwm.c | 24 +- src/network.c | 15 +- src/pager.c | 32 +- src/progress.c | 2 +- src/regex.c | 2 +- src/scursor.c | 5 +- src/session.c | 52 +- src/settings.c | 92 +-- src/setup.c | 31 +- src/size.c | 14 +- src/slideout.c | 2 +- src/snaps.c | 9 +- src/snprintf.c | 5 +- src/sound.c | 5 +- src/startup.c | 10 +- src/sticky.c | 2 +- src/stripjoints.c | 2 +- src/strips.c | 2 +- src/tclass.c | 2 +- src/text.c | 10 +- src/theme.c | 11 +- src/timers.c | 2 +- src/tooltips.c | 206 ++--- src/ttfont.c | 18 +- src/update.c | 5 +- src/update.h | 2 +- src/warp.c | 2 +- src/windowmatch.c | 4 +- src/x.c | 17 +- src/zoom.c | 2 +- 75 files changed, 2049 insertions(+), 2188 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2bb6bcc8..7b0d0242 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4141,3 +4141,10 @@ Tue Jan 4 23:58:44 CET 2000 * Corrected a couple of spelling errors in the code. * Added localization of a few messages in the E.h file. + +------------------------------------------------------------------------------- + +Thu Jan 6 12:23:56 PST 2000 +(Mandrake) + +updated copyrights to say 2000. muahahaha. diff --git a/src/E.h b/src/E.h index f741e60b..09fb42d2 100644 --- a/src/E.h +++ b/src/E.h @@ -2,7 +2,7 @@ /* Enlightenment - The Window Manager that dares to do what others don't */ /*****************************************************************************/ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -226,7 +226,7 @@ int Evsnprintf(char *str, size_t count, const char *fmt, va_list args); #ifdef HAVE_STDARGS -int Esnprintf(char *str, size_t count, const char *fmt,...); +int Esnprintf(char *str, size_t count, const char *fmt, ...); #else int Esnprintf(va_alist); @@ -530,863 +530,863 @@ typedef struct _iconbox Iconbox; typedef struct _group Group; typedef struct _icondef - { - char *title_match; - char *name_match; - char *class_match; - char *icon_file; - } +{ + char *title_match; + char *name_match; + char *class_match; + char *icon_file; +} Icondef; typedef struct _exid - { - Window parent; - Window win; - int x, y, w, h; - char mapped; - int num_rect; - int ord; - XRectangle *rects; - int depth; - Pixmap bgpmap; - int bgcol; - } +{ + Window parent; + Window win; + int x, y, w, h; + char mapped; + int num_rect; + int ord; + XRectangle *rects; + int depth; + Pixmap bgpmap; + int bgcol; +} EXID; typedef struct _actiontype - { - void *params; - struct _actiontype *Next; - int Type; - } +{ + void *params; + struct _actiontype *Next; + int Type; +} ActionType; typedef struct _list - { - char *name; - int id; - void *item; +{ + char *name; + int id; + void *item; - struct _list *next; - } + struct _list *next; +} List; typedef struct _client - { - char *name; - Window win; - char *msg; - char *clientname; - char *version; - char *author; - char *email; - char *web; - char *address; - char *info; - Pixmap pmap; - } +{ + char *name; + Window win; + char *msg; + char *clientname; + char *version; + char *author; + char *email; + char *web; + char *address; + char *info; + Pixmap pmap; +} Client; typedef struct _root - { - Window win; - Visual *vis; - int depth; - Colormap cmap; - int scr; - int w, h; - Window focuswin; - } +{ + Window win; + Visual *vis; + int depth; + Colormap cmap; + int scr; + int w, h; + Window focuswin; +} Root; typedef struct _modcurve - { - int num; - unsigned char *px; - unsigned char *py; - unsigned char map[256]; - } +{ + int num; + unsigned char *px; + unsigned char *py; + unsigned char map[256]; +} ModCurve; typedef struct _colormodifierclass - { - char *name; - ModCurve red, green, blue; - unsigned int ref_count; - } +{ + char *name; + ModCurve red, green, blue; + unsigned int ref_count; +} ColorModifierClass; typedef struct _imagestate - { - char *im_file; - char *real_file; - char unloadable; - ImlibImage *im; - ImlibColor *transp; - ImlibBorder *border; - int pixmapfillstyle; - ImlibColor bg, hi, lo, hihi, lolo; - int bevelstyle; - ColorModifierClass *colmod; - } +{ + char *im_file; + char *real_file; + char unloadable; + ImlibImage *im; + ImlibColor *transp; + ImlibBorder *border; + int pixmapfillstyle; + ImlibColor bg, hi, lo, hihi, lolo; + int bevelstyle; + ColorModifierClass *colmod; +} ImageState; typedef struct _ImageStateArray - { - ImageState *normal; - ImageState *hilited; - ImageState *clicked; - ImageState *disabled; - } +{ + ImageState *normal; + ImageState *hilited; + ImageState *clicked; + ImageState *disabled; +} ImageStateArray; typedef struct _imageclass - { - char *name; - char external; - ImageStateArray norm, active, sticky, sticky_active; - ImlibBorder padding; - ColorModifierClass *colmod; - unsigned int ref_count; - } +{ + char *name; + char external; + ImageStateArray norm, active, sticky, sticky_active; + ImlibBorder padding; + ColorModifierClass *colmod; + unsigned int ref_count; +} ImageClass; typedef struct _efont - { - TT_Engine engine; - TT_Face face; - TT_Instance instance; - TT_Face_Properties properties; - int num_glyph; - TT_Glyph *glyphs; - TT_Raster_Map **glyphs_cached; - int max_descent; - int max_ascent; - } +{ + TT_Engine engine; + TT_Face face; + TT_Instance instance; + TT_Face_Properties properties; + int num_glyph; + TT_Glyph *glyphs; + TT_Raster_Map **glyphs_cached; + int max_descent; + int max_ascent; +} Efont; typedef struct _textstate - { - char *fontname; - FnlibStyle style; - FnlibFont *font; - ImlibColor fg_col; - ImlibColor bg_col; - int effect; - Efont *efont; - XFontStruct *xfont; - XFontSet xfontset; - int xfontset_ascent; - } +{ + char *fontname; + FnlibStyle style; + FnlibFont *font; + ImlibColor fg_col; + ImlibColor bg_col; + int effect; + Efont *efont; + XFontStruct *xfont; + XFontSet xfontset; + int xfontset_ascent; +} TextState; typedef struct _textclass - { - char *name; - struct - { - TextState *normal; - TextState *hilited; - TextState *clicked; - TextState *disabled; - } - norm , active, sticky, sticky_active; - int justification; - unsigned int ref_count; - } +{ + char *name; + struct + { + TextState *normal; + TextState *hilited; + TextState *clicked; + TextState *disabled; + } + norm , active, sticky, sticky_active; + int justification; + unsigned int ref_count; +} TextClass; typedef struct _action - { - char event; - char anymodifier; - int modifiers; - char anybutton; - int button; - char anykey; - KeyCode key; - char *key_str; - char *tooltipstring; - ActionType *action; - } +{ + char event; + char anymodifier; + int modifiers; + char anybutton; + int button; + char anykey; + KeyCode key; + char *key_str; + char *tooltipstring; + ActionType *action; +} Action; typedef struct _actionclass - { - char *name; - int num; - Action **list; - char *tooltipstring; - unsigned int ref_count; - } +{ + char *name; + int num; + Action **list; + char *tooltipstring; + unsigned int ref_count; +} ActionClass; typedef struct _constraints - { - int min, max; - } +{ + int min, max; +} Constraints; typedef struct _winpoint - { - int originbox; - struct - { - int percent; - int absolute; - } - x , y; - } +{ + int originbox; + struct + { + int percent; + int absolute; + } + x , y; +} WinPoint; typedef struct _geometry - { - Constraints width, height; - WinPoint topleft, bottomright; - } +{ + Constraints width, height; + WinPoint topleft, bottomright; +} Geometry; typedef struct _ecursor - { - char *name; - ImlibColor fg, bg; - char *file; - Cursor cursor; - unsigned int ref_count; - char inroot; - } +{ + char *name; + ImlibColor fg, bg; + char *file; + Cursor cursor; + unsigned int ref_count; + char inroot; +} ECursor; typedef struct _winpart - { - Geometry geom; - ImageClass *iclass; - ActionClass *aclass; - TextClass *tclass; - ECursor *ec; - char ontop; - int flags; - char keep_for_shade; - } +{ + Geometry geom; + ImageClass *iclass; + ActionClass *aclass; + TextClass *tclass; + ECursor *ec; + char ontop; + int flags; + char keep_for_shade; +} WinPart; typedef struct _border - { - char *name; - char *group_border_name; - ImlibBorder border; - int num_winparts; - WinPart *part; - char changes_shape; - char shadedir; - unsigned int ref_count; - } +{ + char *name; + char *group_border_name; + ImlibBorder border; + int num_winparts; + WinPart *part; + char changes_shape; + char shadedir; + unsigned int ref_count; +} Border; typedef struct _ewinbit - { - Window win; - int x, y, w, h; - int cx, cy, cw, ch; - int state; - char expose; - char no_expose; - char left; - } +{ + Window win; + int x, y, w, h; + int cx, cy, cw, ch; + int state; + char expose; + char no_expose; + char left; +} EWinBit; typedef struct _winclient - { - Window win; - char *title; - int x, y, w, h, bw; - Colormap cmap; - Window icon_win; - Pixmap icon_pmap; - Pixmap icon_mask; - char start_iconified; - Window group; - Window client_leader; - char need_input; - char transient; - Window transient_for; - char *class; - char *name; - char *role; - char *command; - char *machine; - char *icon_name; - char is_group_leader; - char no_resize_h; - char no_resize_v; - char shaped; - Constraints width, height; - int base_w, base_h; - int w_inc, h_inc; - int grav; - double aspect_min, aspect_max; - char already_placed; - char mwm_decor_border; - char mwm_decor_resizeh; - char mwm_decor_title; - char mwm_decor_menu; - char mwm_decor_minimize; - char mwm_decor_maximize; - char mwm_func_resize; - char mwm_func_move; - char mwm_func_minimize; - char mwm_func_maximize; - char mwm_func_close; - unsigned int app_state; - } +{ + Window win; + char *title; + int x, y, w, h, bw; + Colormap cmap; + Window icon_win; + Pixmap icon_pmap; + Pixmap icon_mask; + char start_iconified; + Window group; + Window client_leader; + char need_input; + char transient; + Window transient_for; + char *class; + char *name; + char *role; + char *command; + char *machine; + char *icon_name; + char is_group_leader; + char no_resize_h; + char no_resize_v; + char shaped; + Constraints width, height; + int base_w, base_h; + int w_inc, h_inc; + int grav; + double aspect_min, aspect_max; + char already_placed; + char mwm_decor_border; + char mwm_decor_resizeh; + char mwm_decor_title; + char mwm_decor_menu; + char mwm_decor_minimize; + char mwm_decor_maximize; + char mwm_func_resize; + char mwm_func_move; + char mwm_func_minimize; + char mwm_func_maximize; + char mwm_func_close; + unsigned int app_state; +} WinClient; typedef struct _ewin - { - Window win; - int x, y, w, h, reqx, reqy; - int lx, ly, lw, lh; - char toggle; - Window win_container; - WinClient client; - Border *border; - Border *previous_border; - char border_new; - EWinBit *bits; - int flags; - int desktop; - Group **groups; - int num_groups; - int docked; - char sticky; - char visible; - char iconified; - char shaded; - char active; - int layer; - char never_use_area; - Window parent; - char floating; - char shapedone; - char fixedpos; - int expanded_x; - int expanded_y; - int expanded_width; - int expanded_height; - char ignorearrange; - char skiptask; - char skipfocus; - char skipwinlist; - char focusclick; - char internal; - Menu *menu; - Window shownmenu; - Dialog *dialog; - Pager *pager; - Iconbox *ibox; - int area_x; - int area_y; - char *session_id; - int has_transients; - int mini_w, mini_h; - Pixmap mini_pmap, mini_mask; - Snapshot *snap; - int icon_pmap_w, icon_pmap_h; - Pixmap icon_pmap, icon_mask; - char kde_hint; - } +{ + Window win; + int x, y, w, h, reqx, reqy; + int lx, ly, lw, lh; + char toggle; + Window win_container; + WinClient client; + Border *border; + Border *previous_border; + char border_new; + EWinBit *bits; + int flags; + int desktop; + Group **groups; + int num_groups; + int docked; + char sticky; + char visible; + char iconified; + char shaded; + char active; + int layer; + char never_use_area; + Window parent; + char floating; + char shapedone; + char fixedpos; + int expanded_x; + int expanded_y; + int expanded_width; + int expanded_height; + char ignorearrange; + char skiptask; + char skipfocus; + char skipwinlist; + char focusclick; + char internal; + Menu *menu; + Window shownmenu; + Dialog *dialog; + Pager *pager; + Iconbox *ibox; + int area_x; + int area_y; + char *session_id; + int has_transients; + int mini_w, mini_h; + Pixmap mini_pmap, mini_mask; + Snapshot *snap; + int icon_pmap_w, icon_pmap_h; + Pixmap icon_pmap, icon_mask; + char kde_hint; +} EWin; typedef struct _groupconfig - { - char iconify; - char kill; - char move; - char raise; - char set_border; - char stick; - char shade; - char mirror; - } +{ + char iconify; + char kill; + char move; + char raise; + char set_border; + char stick; + char shade; + char mirror; +} GroupConfig; struct _group - { - int index; - EWin **members; - int num_members; - GroupConfig cfg; - }; +{ + int index; + EWin **members; + int num_members; + GroupConfig cfg; +}; typedef struct _awaiticlass - { - Window client_win; - int ewin_bit; - ImageClass *iclass; - } +{ + Window client_win; + int ewin_bit; + ImageClass *iclass; +} AwaitIclass; typedef struct _bgeometry - { - Constraints width, height; - int xorigin, yorigin; - int xabs, xrel; - int yabs, yrel; - int xsizerel, xsizeabs; - int ysizerel, ysizeabs; - char size_from_image; - } +{ + Constraints width, height; + int xorigin, yorigin; + int xabs, xrel; + int yabs, yrel; + int xsizerel, xsizeabs; + int ysizerel, ysizeabs; + char size_from_image; +} BGeometry; typedef struct _strip Strip; typedef struct _stripjoint Stripjoint; typedef struct _button - { - char *name; - BGeometry geom; - ImageClass *iclass; - ActionClass *aclass; - TextClass *tclass; - char *label; - char ontop; - int flags; - char sticky; - int desktop; - char visible; - char internal; - char default_show; - char used; +{ + char *name; + BGeometry geom; + ImageClass *iclass; + ActionClass *aclass; + TextClass *tclass; + char *label; + char ontop; + int flags; + char sticky; + int desktop; + char visible; + char internal; + char default_show; + char used; - Window win; - int x, y, w, h; - int cx, cy, cw, ch; - int state; - char expose; - Window inside_win; - Window event_win; - char destroy_inside_win; - char left; - unsigned int ref_count; - } + Window win; + int x, y, w, h; + int cx, cy, cw, ch; + int state; + char expose; + Window inside_win; + Window event_win; + char destroy_inside_win; + char left; + unsigned int ref_count; +} Button; typedef struct _buttoncontainer - { - char *name; - ImageClass *iclass; +{ + char *name; + ImageClass *iclass; - Window win; - int w, h; - int state; - char expose; - char orientation; - Button **ButtonList; - int numofbuttonsinlist; - } + Window win; + int w, h; + int state; + char expose; + char orientation; + Button **ButtonList; + int numofbuttonsinlist; +} Container; struct _strip - { - char *name; - int xabs, yabs; - int xrel, yrel; - char ontop; - char sticky; - int desktop; - char orientation; - char out; - int justification; - int spacing; +{ + char *name; + int xabs, yabs; + int xrel, yrel; + char ontop; + char sticky; + int desktop; + char orientation; + char out; + int justification; + int spacing; - char *anchor_name; - char *bg_name; - Button *anchor; - Button *bg; + char *anchor_name; + char *bg_name; + Button *anchor; + Button *bg; - int num_buttons; - Button *button; + int num_buttons; + Button *button; - Window win; - int x, y, w, h; - int cx, cy, cw, ch; - }; + Window win; + int x, y, w, h; + int cx, cy, cw, ch; +}; typedef struct _background - { - char *name; - Pixmap pmap; - time_t last_viewed; - struct _bg - { - ImlibColor solid; - char *file; - char *real_file; - ImlibImage *im; - char tile; - char keep_aspect; - int xjust, yjust; - int xperc, yperc; - } - bg; - struct _top - { - char *file; - char *real_file; - ImlibImage *im; - char keep_aspect; - int xjust, yjust; - int xperc, yperc; - } - top; - ColorModifierClass *cmclass; - char keepim; - unsigned int ref_count; - } +{ + char *name; + Pixmap pmap; + time_t last_viewed; + struct _bg + { + ImlibColor solid; + char *file; + char *real_file; + ImlibImage *im; + char tile; + char keep_aspect; + int xjust, yjust; + int xperc, yperc; + } + bg; + struct _top + { + char *file; + char *real_file; + ImlibImage *im; + char keep_aspect; + int xjust, yjust; + int xperc, yperc; + } + top; + ColorModifierClass *cmclass; + char keepim; + unsigned int ref_count; +} Background; typedef struct _desk - { - char viewable; - Window win; - int x, y; - Background *bg; - int num; - EWin **list; - Button *tag; - int current_area_x; - int current_area_y; - } +{ + char viewable; + Window win; + int x, y; + Background *bg; + int num; + EWin **list; + Button *tag; + int current_area_x; + int current_area_y; +} Desk; typedef struct _desktops - { - int current; - Desk desk[ENLIGHTENMENT_CONF_NUM_DESKTOPS]; - int dragdir; - int dragbar_width; - int dragbar_ordering; - int dragbar_length; - char slidein; - int slidespeed; - char hiqualitybg; - } +{ + int current; + Desk desk[ENLIGHTENMENT_CONF_NUM_DESKTOPS]; + int dragdir; + int dragbar_width; + int dragbar_ordering; + int dragbar_length; + char slidein; + int slidespeed; + char hiqualitybg; +} Desktops; typedef struct _sample - { - char *file; - int rate; - int format; - int samples; - unsigned char *data; - int id; - } +{ + char *file; + int rate; + int format; + int samples; + unsigned char *data; + int id; +} Sample; typedef struct _soundclass - { - char *name; - char *file; - Sample *sample; - unsigned int ref_count; - } +{ + char *name; + char *file; + Sample *sample; + unsigned int ref_count; +} SoundClass; typedef struct _windowmatch - { - char *name; - char *win_title; - char *win_name; - char *win_class; - Constraints width; - Constraints height; - signed char transient; - signed char no_resize_h; - signed char no_resize_v; - signed char shaped; - Border *border; - ImageClass *icon; - int desk; - char make_sticky; - } +{ + char *name; + char *win_title; + char *win_name; + char *win_class; + Constraints width; + Constraints height; + signed char transient; + signed char no_resize_h; + signed char no_resize_v; + signed char shaped; + Border *border; + ImageClass *icon; + int desk; + char make_sticky; +} WindowMatch; typedef struct - { - char *name; - char direction; - int num_buttons; - Button **button; - int w, h; - Window win; - Window from_win; - unsigned int ref_count; - } +{ + char *name; + char direction; + int num_buttons; + Button **button; + int w, h; + Window win; + Window from_win; + unsigned int ref_count; +} Slideout; typedef struct _emode - { - int mode; - int deskmode; - char place; - char flipp; - char startup; - char xselect; - int next_move_x_plus; - int next_move_y_plus; - EWin *ewin; - Button *button; - int resize_detail; - int win_x, win_y, win_w, win_h; - int start_x, start_y; - char noewin; - char have_place_grab; - int focusmode; - char dockdirmode; - char primaryicondir; - char click_focus_grabbed; - EWin *focuswin; - EWin *realfocuswin; - EWin *mouse_over_win; - EWin *context_ewin; - int px, py, x, y; - char firstlast; - int movemode; - int resizemode; - int slidemode; - char cleanupslide; - char mapslide; - int slidespeedmap; - int slidespeedcleanup; - char animate_shading; - int shadespeed; - char doingslide; - int server_grabbed; - int desktop_bg_timeout; - int deskdrag; - char sound; - int button_move_resistance; - char button_move_pending; - Colormap current_cmap; - char autosave; - char memory_paranoia; - char destroy; - char adestroy; - Slideout *slideout; - Window context_win; - char tooltips; - double tiptime; - char autoraise; - double autoraisetime; - int dockstartx; - int dockstarty; - char save_under; - char cur_menu_mode; - int cur_menu_depth; - Menu *cur_menu[256]; - char menuslide; - char menusonscreen; - char numdesktops; - char transientsfollowleader; - char switchfortransientmap; - char showicons; - char snap; - int edge_snap_dist; - int screen_snap_dist; - Window menu_cover_win; - char all_new_windows_get_focus; - char new_transients_get_focus; - char new_transients_get_focus_if_group_focused; - char manual_placement; - char raise_on_next_focus; - char raise_after_next_focus; - char display_warp; - char warp_on_next_focus; - char warp_after_next_focus; - int edge_flip_resistance; - EWin *moveresize_pending_ewin; - char borderpartpress; - char windowdestroy; - int context_w; - int context_h; - char autoupgrade; - char activenetwork; - int motddate; - char motd; - char alreadytestingnetwork; - char show_pagers; - Pager *context_pager; - char pager_hiq; - char pager_snap; - char user_bg; - char pager_zoom; - char pager_title; - char constrained; - int pager_scanspeed; - TextClass *icon_textclass; - int icon_mode; - char nogroup; - GroupConfig group_config; - Window kde_dock; - int kde_support; - int kde_x1; - int kde_x2; - int kde_y1; - int kde_y2; - char clickalways; - char keybinds_changed; - char firsttime; - char showroottooltip; - int pager_sel_button; - int pager_win_button; - int pager_menu_button; - } +{ + int mode; + int deskmode; + char place; + char flipp; + char startup; + char xselect; + int next_move_x_plus; + int next_move_y_plus; + EWin *ewin; + Button *button; + int resize_detail; + int win_x, win_y, win_w, win_h; + int start_x, start_y; + char noewin; + char have_place_grab; + int focusmode; + char dockdirmode; + char primaryicondir; + char click_focus_grabbed; + EWin *focuswin; + EWin *realfocuswin; + EWin *mouse_over_win; + EWin *context_ewin; + int px, py, x, y; + char firstlast; + int movemode; + int resizemode; + int slidemode; + char cleanupslide; + char mapslide; + int slidespeedmap; + int slidespeedcleanup; + char animate_shading; + int shadespeed; + char doingslide; + int server_grabbed; + int desktop_bg_timeout; + int deskdrag; + char sound; + int button_move_resistance; + char button_move_pending; + Colormap current_cmap; + char autosave; + char memory_paranoia; + char destroy; + char adestroy; + Slideout *slideout; + Window context_win; + char tooltips; + double tiptime; + char autoraise; + double autoraisetime; + int dockstartx; + int dockstarty; + char save_under; + char cur_menu_mode; + int cur_menu_depth; + Menu *cur_menu[256]; + char menuslide; + char menusonscreen; + char numdesktops; + char transientsfollowleader; + char switchfortransientmap; + char showicons; + char snap; + int edge_snap_dist; + int screen_snap_dist; + Window menu_cover_win; + char all_new_windows_get_focus; + char new_transients_get_focus; + char new_transients_get_focus_if_group_focused; + char manual_placement; + char raise_on_next_focus; + char raise_after_next_focus; + char display_warp; + char warp_on_next_focus; + char warp_after_next_focus; + int edge_flip_resistance; + EWin *moveresize_pending_ewin; + char borderpartpress; + char windowdestroy; + int context_w; + int context_h; + char autoupgrade; + char activenetwork; + int motddate; + char motd; + char alreadytestingnetwork; + char show_pagers; + Pager *context_pager; + char pager_hiq; + char pager_snap; + char user_bg; + char pager_zoom; + char pager_title; + char constrained; + int pager_scanspeed; + TextClass *icon_textclass; + int icon_mode; + char nogroup; + GroupConfig group_config; + Window kde_dock; + int kde_support; + int kde_x1; + int kde_x2; + int kde_y1; + int kde_y2; + char clickalways; + char keybinds_changed; + char firsttime; + char showroottooltip; + int pager_sel_button; + int pager_win_button; + int pager_menu_button; +} EMode; typedef struct _handlestruct - { - void (*func) (XEvent * ev); - } +{ + void (*func) (XEvent * ev); +} HandleStruct; typedef struct _IPCstruct - { - void (*func) (char *params, Client * c); - char *commandname; - char *help_text; - char *extended_help_text; - } +{ + void (*func) (char *params, Client * c); + char *commandname; + char *help_text; + char *extended_help_text; +} IPCStruct; typedef struct _tooltip - { - char *name; +{ + char *name; - ImageClass *iclass; - ImageClass *s_iclass[4]; - TextClass *tclass; - int dist; - Window win; - Window iwin; - Window s_win[4]; - char visible; - ImageClass *tooltippic; - unsigned int ref_count; - } + ImageClass *iclass; + ImageClass *s_iclass[4]; + TextClass *tclass; + int dist; + Window win; + Window iwin; + Window s_win[4]; + char visible; + ImageClass *tooltippic; + unsigned int ref_count; +} ToolTip; typedef struct _qentry - { - char *name; - double in_time; - void (*func) (int val, void *data); - struct _qentry *next; - int runtime_val; - void *runtime_data; - char just_added; - } +{ + char *name; + double in_time; + void (*func) (int val, void *data); + struct _qentry *next; + int runtime_val; + void *runtime_data; + char just_added; +} Qentry; typedef struct _menustyle - { - char *name; - TextClass *tclass; - ImageClass *bg_iclass; - ImageClass *item_iclass; - ImageClass *sub_iclass; - char use_item_bg; - char iconpos; - int maxx; - int maxy; - char *border_name; - unsigned int ref_count; - } +{ + char *name; + TextClass *tclass; + ImageClass *bg_iclass; + ImageClass *item_iclass; + ImageClass *sub_iclass; + char use_item_bg; + char iconpos; + int maxx; + int maxy; + char *border_name; + unsigned int ref_count; +} MenuStyle; typedef struct _menuitem - { - ImageClass *icon_iclass; - char *text; - short act_id; - void *params; - Menu *child; - char state; - Pixmap pmap[3]; - Pixmap mask[3]; - Window win; - Window icon_win; - short icon_w; - short icon_h; - short text_w; - short text_h; - short text_x; - short text_y; - } +{ + ImageClass *icon_iclass; + char *text; + short act_id; + void *params; + Menu *child; + char state; + Pixmap pmap[3]; + Pixmap mask[3]; + Window win; + Window icon_win; + short icon_w; + short icon_h; + short text_w; + short text_h; + short text_x; + short text_y; +} MenuItem; struct _menu - { - char *name; - char *title; - MenuStyle *style; - int num; - MenuItem **items; - Window win; - Pixmap pmap; - Pixmap mask; - char stuck; - Menu *parent; - MenuItem *sel_item; - time_t last_change; - void *data; - Menu *ref_menu; - unsigned int ref_count; - }; +{ + char *name; + char *title; + MenuStyle *style; + int num; + MenuItem **items; + Window win; + Pixmap pmap; + Pixmap mask; + char stuck; + Menu *parent; + MenuItem *sel_item; + time_t last_change; + void *data; + Menu *ref_menu; + unsigned int ref_count; +}; typedef struct _progressbar - { - char *name; - int value; - int x; - int y; - int w; - int h; - Window win; - Window n_win; - Window p_win; - ImageClass *ic, *inc, *ipc; - TextClass *tc, *tnc; - } +{ + char *name; + int value; + int x; + int y; + int w; + int h; + Window win; + Window n_win; + Window p_win; + ImageClass *ic, *inc, *ipc; + TextClass *tc, *tnc; +} Progressbar; struct _snapshot - { - char *name; - char *win_title; - char *win_name; - char *win_class; - char *border_name; - char use_desktop; - int desktop; - int area_x, area_y; - char use_wh; - int w, h; - char use_xy; - int x, y; - char use_layer; - int layer; - char use_sticky; - char sticky; - char *iclass_name; - char use_shade; - char shade; - char use_cmd; - char *cmd; - int *groups; - int num_groups; - int used; - }; +{ + char *name; + char *win_title; + char *win_name; + char *win_class; + char *border_name; + char use_desktop; + int desktop; + int area_x, area_y; + char use_wh; + int w, h; + char use_xy; + int x, y; + char use_layer; + int layer; + char use_sticky; + char sticky; + char *iclass_name; + char use_shade; + char shade; + char use_cmd; + char *cmd; + int *groups; + int num_groups; + int used; +}; typedef struct _ditembutton DItemButton; typedef struct _ditemcheckbutton DItemCheckButton; @@ -1400,99 +1400,99 @@ typedef struct _ditemarea DItemArea; typedef struct _ditem DItem; struct _ditemslider - { - char horizontal; +{ + char horizontal; - char numeric; - char numeric_side; + char numeric; + char numeric_side; - int upper; - int lower; - int unit; - int jump; - int val; - int *val_ptr; + int upper; + int lower; + int unit; + int jump; + int val; + int *val_ptr; - int min_length; + int min_length; - int base_orig_w, base_orig_h; - int knob_orig_w, knob_orig_h; - int border_orig_w, border_orig_h; + int base_orig_w, base_orig_h; + int knob_orig_w, knob_orig_h; + int border_orig_w, border_orig_h; - int base_x, base_y, base_w, base_h; - int knob_x, knob_y, knob_w, knob_h; - int border_x, border_y, border_w, border_h; - int numeric_x, numeric_y, numeric_w, numeric_h; + int base_x, base_y, base_w, base_h; + int knob_x, knob_y, knob_w, knob_h; + int border_x, border_y, border_w, border_h; + int numeric_x, numeric_y, numeric_w, numeric_h; - ImageClass *ic_base; - ImageClass *ic_knob; - ImageClass *ic_border; + ImageClass *ic_base; + ImageClass *ic_knob; + ImageClass *ic_border; - char in_drag; - int wanted_val; + char in_drag; + int wanted_val; - Window base_win; - Window knob_win; - Window border_win; - }; + Window base_win; + Window knob_win; + Window border_win; +}; struct _ditemarea - { - Window area_win; - int w, h; - void (*event_func) (int val, void *data); - }; +{ + Window area_win; + int w, h; + void (*event_func) (int val, void *data); +}; struct _ditembutton - { - char *text; - }; +{ + char *text; +}; struct _ditemcheckbutton - { - char *text; - Window check_win; - int check_orig_w, check_orig_h; - char onoff; - char *onoff_ptr; - }; +{ + char *text; + Window check_win; + int check_orig_w, check_orig_h; + char onoff; + char *onoff_ptr; +}; struct _ditemtext - { - char *text; - }; +{ + char *text; +}; struct _ditemimage - { - char *image; - }; +{ + char *image; +}; struct _ditemseparator - { - char horizontal; - }; +{ + char horizontal; +}; struct _ditemtable - { - int num_columns; - char border; - char homogenous_h; - char homogenous_v; - int num_items; - DItem **items; - }; +{ + int num_columns; + char border; + char homogenous_h; + char homogenous_v; + int num_items; + DItem **items; +}; struct _ditemradiobutton - { - char *text; - Window radio_win; - int radio_orig_w, radio_orig_h; - char onoff; - int val; - int *val_ptr; - DItem *next; - DItem *first; - }; +{ + char *text; + Window radio_win; + int radio_orig_w, radio_orig_h; + char onoff; + int val; + int *val_ptr; + DItem *next; + DItem *first; +}; #define DITEM_NONE 0 #define DITEM_BUTTON 1 @@ -1506,211 +1506,211 @@ struct _ditemradiobutton #define DITEM_AREA 9 struct _ditem - { - int type; - void (*func) (int val, void *data); - int val; - void *data; - ImageClass *iclass; - TextClass *tclass; - ImlibBorder padding; - char fill_h; - char fill_v; - int align_h; - int align_v; - int row_span; - int col_span; +{ + int type; + void (*func) (int val, void *data); + int val; + void *data; + ImageClass *iclass; + TextClass *tclass; + ImlibBorder padding; + char fill_h; + char fill_v; + int align_h; + int align_v; + int row_span; + int col_span; - int x, y, w, h; - char hilited; - char clicked; - Window win; - union - { - DItemButton button; - DItemCheckButton check_button; - DItemText text; - DItemTable table; - DItemImage image; - DItemSeparator separator; - DItemRadioButton radio_button; - DItemSlider slider; - DItemArea area; - } - item; - }; + int x, y, w, h; + char hilited; + char clicked; + Window win; + union + { + DItemButton button; + DItemCheckButton check_button; + DItemText text; + DItemTable table; + DItemImage image; + DItemSeparator separator; + DItemRadioButton radio_button; + DItemSlider slider; + DItemArea area; + } + item; +}; typedef struct _dbutton - { - char *text; - void (*func) (int val, void *data); - Window win; - int x, y, w, h; - char hilited; - char clicked; - char close; - TextClass *tclass; - ImageClass *iclass; - } +{ + char *text; + void (*func) (int val, void *data); + Window win; + int x, y, w, h; + char hilited; + char clicked; + char close; + TextClass *tclass; + ImageClass *iclass; +} DButton; typedef struct _Dkeybind - { - KeyCode key; - int val; - void *data; - void (*func) (int val, void *data); - } +{ + KeyCode key; + int val; + void *data; + void (*func) (int val, void *data); +} DKeyBind; struct _dialog - { - char *name; - char *title; - char *text; - int num_buttons; - Window win; - DButton **button; - TextClass *tclass; - ImageClass *iclass; - int w, h; - DItem *item; - void (*exit_func) (int val, void *data); - int exit_val; - void *exit_data; - int num_bindings; - DKeyBind *keybindings; - }; +{ + char *name; + char *title; + char *text; + int num_buttons; + Window win; + DButton **button; + TextClass *tclass; + ImageClass *iclass; + int w, h; + DItem *item; + void (*exit_func) (int val, void *data); + int exit_val; + void *exit_data; + int num_bindings; + DKeyBind *keybindings; +}; typedef struct _PixImg - { - XImage *xim; - XShmSegmentInfo *shminfo; - Pixmap pmap; - GC gc; - } +{ + XImage *xim; + XShmSegmentInfo *shminfo; + Pixmap pmap; + GC gc; +} PixImg; typedef struct _Clone - { - char *name; - Window win; - EWin *ewin; - } +{ + char *name; + Window win; + EWin *ewin; +} Clone; struct _iconbox - { - /* user settings */ - char *name; - char orientation; - char animate; - char scrollbar_side; - char arrow_side; - char shownames; - char nobg; - int iconsize; - int icon_mode; +{ + /* user settings */ + char *name; + char orientation; + char animate; + char scrollbar_side; + char arrow_side; + char shownames; + char nobg; + int iconsize; + int icon_mode; - char auto_resize; - char draw_icon_base; - char scrollbar_hide; - char cover_hide; - int auto_resize_anchor; + char auto_resize; + char draw_icon_base; + char scrollbar_hide; + char cover_hide; + int auto_resize_anchor; - /* internally set stuff */ - int w, h; - int pos; - int max; - char arrow1_hilited; - char arrow1_clicked; - char arrow2_hilited; - char arrow2_clicked; - char icon_clicked; - char scrollbar_hilited; - char scrollbar_clicked; - char scrollbox_clicked; + /* internally set stuff */ + int w, h; + int pos; + int max; + char arrow1_hilited; + char arrow1_clicked; + char arrow2_hilited; + char arrow2_clicked; + char icon_clicked; + char scrollbar_hilited; + char scrollbar_clicked; + char scrollbox_clicked; - Pixmap pmap; + Pixmap pmap; - Window win; - Window cover_win; - Window icon_win; - Window scroll_win; - Window arrow1_win; - Window arrow2_win; - Window scrollbar_win; - Window scrollbarknob_win; - EWin *ewin; + Window win; + Window cover_win; + Window icon_win; + Window scroll_win; + Window arrow1_win; + Window arrow2_win; + Window scrollbar_win; + Window scrollbarknob_win; + EWin *ewin; - int num_icons; - EWin **icons; + int num_icons; + EWin **icons; - /* these are theme-settable parameters */ - int scroll_thickness; - int arrow_thickness; - int bar_thickness; - int knob_length; + /* these are theme-settable parameters */ + int scroll_thickness; + int arrow_thickness; + int bar_thickness; + int knob_length; - }; +}; struct _pager - { - char *name; - Window win; - Pixmap pmap; - Pixmap bgpmap; - int desktop; - int w, h; - int dw, dh; - char visible; - int update_phase; - EWin *ewin; - char *border_name; - Window sel_win; - char hi_visible; - Window hi_win; - EWin *hi_ewin; - }; +{ + char *name; + Window win; + Pixmap pmap; + Pixmap bgpmap; + int desktop; + int w, h; + int dw, dh; + char visible; + int update_phase; + EWin *ewin; + char *border_name; + Window sel_win; + char hi_visible; + Window hi_win; + EWin *hi_ewin; +}; typedef struct _drawqueue - { - Window win; - ImageClass *iclass; - int w, h, active, sticky, state, expose; - TextClass *tclass; - char *text; - char shape_propagate; - Pager *pager; - Pager *redraw_pager; - char newbg; - Dialog *d; - DItem *di; - int x, y; - } +{ + Window win; + ImageClass *iclass; + int w, h, active, sticky, state, expose; + TextClass *tclass; + char *text; + char shape_propagate; + Pager *pager; + Pager *redraw_pager; + char newbg; + Dialog *d; + DItem *di; + int x, y; +} DrawQueue; /* some kde hint enums here */ typedef enum - { - StickyFlag = (1 << 0), - MaximizedFlag = (1 << 1), - IconifiedFlag = (1 << 2), - AllFlags = 7 - } +{ + StickyFlag = (1 << 0), + MaximizedFlag = (1 << 1), + IconifiedFlag = (1 << 2), + AllFlags = 7 +} KStates; typedef enum - { - AddWindow, - RemoveWindow, - FocusWindow, - RaiseWindow, - LowerWindow, - ChangedClient, - IconChange - } +{ + AddWindow, + RemoveWindow, + FocusWindow, + RaiseWindow, + LowerWindow, + ChangedClient, + IconChange +} KMessage; /* function prototypes */ @@ -1908,10 +1908,10 @@ Border *MatchEwinBorder(EWin * ewin, WindowMatch * b); ImageClass *MatchEwinIcon(EWin * ewin, WindowMatch * b); int MatchEwinDesktop(EWin * ewin, WindowMatch * b); void *MatchEwinByFunction(EWin * ewin, - void * (*FunctionToTest) (EWin *, - WindowMatch + void *(*FunctionToTest) (EWin *, + WindowMatch - *)); + *)); void RemoveWindowMatch(WindowMatch * wm); /* borders.c functions */ @@ -1954,7 +1954,7 @@ void ImageStatePopulate(ImageState * is); void ImageStateRealize(ImageState * is); void IclassPopulate(ImageClass * iclass); void IclassApply(ImageClass * iclass, Window win, int w, int h, - int active, int sticky, int state, char expose); + int active, int sticky, int state, char expose); void IclassApplyCopy(ImageClass * iclass, Window win, int w, int h, int active, int sticky, int state, Pixmap * pret, Pixmap * mret); @@ -2356,7 +2356,7 @@ int matchregexp(char *rx, char *s); double GetTime(void); void DoIn(char *name, double in_time, - void (*func) (int val, void *data), + void (*func) (int val, void *data), int runtime_val, void *runtime_data); Qentry *GetHeadTimerQueue(void); @@ -2666,7 +2666,7 @@ __Erealloc(x, y, "", 0) char *duplicate(char *s); -void Alert(char *fmt,...); +void Alert(char *fmt, ...); void InitStringList(void); void AssignIgnoreFunction(int (*FunctionToAssign) (void *), @@ -2763,11 +2763,11 @@ void SetDefaultTheme(char *theme); char SanitiseThemeDir(char *dir); void Quicksort(void **a, int l, int r, - int (*CompareFunc) (void *d1, void *d2)); + int (*CompareFunc) (void *d1, void *d2)); Dialog *CreateDialog(char *name); void DialogBindKey(Dialog * d, char *key, - void (*func) (int val, void *data), + void (*func) (int val, void *data), int val, void *data); void FreeDButton(DButton * db); @@ -2775,7 +2775,7 @@ void FreeDialog(Dialog * d); void DialogSetText(Dialog * d, char *text); void DialogSetTitle(Dialog * d, char *title); void DialogAddButton(Dialog * d, char *text, - void (*func) (int val, void *data), + void (*func) (int val, void *data), char close); void DialogDrawButton(Dialog * d, int bnum); @@ -2785,15 +2785,15 @@ void DialogDrawArea(Dialog * d, int x, int y, int w, int h); void DialogRedraw(Dialog * d); void ShowDialog(Dialog * d); void DialogClose(Dialog * d); -void DialogSetParamText(Dialog * d, char *fmt,...); -void DialogAlert(char *fmt,...); -void DialogAlertOK(char *fmt,...); +void DialogSetParamText(Dialog * d, char *fmt, ...); +void DialogAlert(char *fmt, ...); +void DialogAlertOK(char *fmt, ...); void DialogRestart(int val, void *data); void DialogQuit(int val, void *data); DItem *DialogInitItem(Dialog * d); DItem *DialogAddItem(DItem * dii, int type); void DialogItemSetCallback(DItem * di, - void (*func) (int val, void *data), + void (*func) (int val, void *data), int val, char *data); void DialogItemSetClass(DItem * di, ImageClass * iclass, TextClass * tclass); @@ -2824,7 +2824,7 @@ DItem *DialogItemFindWindow(DItem * di, Window win); void DialogItemSetRowSpan(DItem * di, int row_span); void DialogItemSetColSpan(DItem * di, int col_span); void DialogSetExitFunction(Dialog * d, - void (*func) (int val, void *data), + void (*func) (int val, void *data), int val, void *data); void DialogItemRadioButtonSetText(DItem * di, char *text); void DialogItemRadioButtonSetFirst(DItem * di, DItem * first); @@ -2844,9 +2844,9 @@ void DialogItemAreaSetSize(DItem * di, int w, int h); void DialogItemAreaGetSize(DItem * di, int *w, int *h); Window DialogItemAreaGetWindow(DItem * di); void DialogItemAreaSetEventFunc(DItem * di, - void (*func) (int val, + void (*func) (int val, - void *data)); + void *data)); Window SC_GetDestWin(void); void SC_PassEvent(XEvent * ev); diff --git a/src/actions.c b/src/actions.c index c78f9e3b..2c536ee7 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -664,17 +664,17 @@ runApp(char *exe, char *params) ("There was an error running the program:\n" "%s\n" "This program could not be executed.\n" - "This is because the file does not exist.\n"), - (char *)exe); + "This is because the file does not exist.\n"), +(char *)exe); /* relative path */ else DialogAlertOK(_ ("There was an error running the program:\n" "%s\n" "This program could not be executed.\n" - "This is most probably because this program " + "This is most probably because this program " "is not in the\n" - "path for your shell which is %s. I suggest " + "path for your shell which is %s. I suggest " "you read " "the manual\n" "page for that shell and read up how to " "change or add " "to your\n" @@ -689,26 +689,26 @@ runApp(char *exe, char *params) /* can execute it */ if (canexec((char *)path)) DialogAlertOK(_ - ("There was an error running the program:\n" - "%s\n" - "This program could not be executed.\n" - "I am unsure as to why you could not " - "do this. " "The file exists,\n" - "is a file, and you are allowed to " - "execute it. I " "suggest you look\n" - "into this.\n"), (char *)path); + ("There was an error running the program:\n" + "%s\n" + "This program could not be executed.\n" + "I am unsure as to why you could not " + "do this. " "The file exists,\n" + "is a file, and you are allowed to " + "execute it. I " "suggest you look\n" + "into this.\n"), (char *)path); /* not executable file */ else DialogAlertOK(_ - ("There was an error running the program:\n" - "%s\n" - "This program could not be executed.\n" - "This is because the file exists, is a" - " file, but " "you are unable\n" - "to execute it because you do not " - "have execute " - "access to this file.\n"), - (char *)path); + ("There was an error running the program:\n" + "%s\n" + "This program could not be executed.\n" + "This is because the file exists, is a" + " file, but " "you are unable\n" + "to execute it because you do not " + "have execute " + "access to this file.\n"), +(char *)path); } /* it's not a file */ else @@ -716,19 +716,19 @@ runApp(char *exe, char *params) /* its a dir */ if (isdir((char *)path)) DialogAlertOK(_ - ("There was an error running the program:\n" - "%s\n" - "This program could not be executed.\n" - "This is because the file is in fact " - "a directory.\n"), (char *)path); + ("There was an error running the program:\n" + "%s\n" + "This program could not be executed.\n" + "This is because the file is in fact " + "a directory.\n"), (char *)path); /* its not a file or a dir */ else DialogAlertOK(_ - ("There was an error running the program:\n" - "%s\n" - "This program could not be executed.\n" - "This is because the file is not a " - "regular file.\n"), (char *)path); + ("There was an error running the program:\n" + "%s\n" + "This program could not be executed.\n" + "This is because the file is not a " + "regular file.\n"), (char *)path); } if (path) Efree(path); @@ -1181,11 +1181,11 @@ doMoveEnd(void *params) if (gwins[i]->floating) MoveEwinToDesktopAt(gwins[i], d, gwins[i]->x - (desks.desk[d].x - - desks.desk[gwins[i]-> - desktop].x), + desks. + desk[gwins[i]->desktop].x), gwins[i]->y - (desks.desk[d].y - - desks.desk[gwins[i]-> - desktop].y)); + desks. + desk[gwins[i]->desktop].y)); else MoveEwinToDesktopAt(gwins[i], d, gwins[i]->x, gwins[i]->y); gwins[i]->floating = 0; @@ -1371,11 +1371,11 @@ doCleanup(void *params) floating[j++].h = ((EWin *) lst[i])->h; } else if ( - ( - (((EWin *) lst[i])->desktop == desks.current) || - (((EWin *) lst[i])->sticky)) && - (((EWin *) lst[i])->layer != 4) && - (((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu)) + ( + (((EWin *) lst[i])->desktop == desks.current) || + (((EWin *) lst[i])->sticky)) && +(((EWin *) lst[i])->layer != 4) && +(((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu)) { fixed = Erealloc(fixed, sizeof(RectBox) * (k + 1)); fixed[k].data = lst[i]; @@ -2333,7 +2333,7 @@ doHideShowButton(void *params) if (matchregexp(ss, lst[i]->name)) { if ((strcmp(lst[i]->name, - "_DESKTOP_DESKRAY_DRAG_CONTROL") && + "_DESKTOP_DESKRAY_DRAG_CONTROL") && (!lst[i]->used))) { if (!(lst[i]->visible)) @@ -2363,7 +2363,7 @@ doHideShowButton(void *params) if (!matchregexp(ss, lst[i]->name)) { if ((strcmp(lst[i]->name, - "_DESKTOP_DESKRAY_DRAG_CONTROL") && + "_DESKTOP_DESKRAY_DRAG_CONTROL") && (!lst[i]->used))) { if (!(lst[i]->visible)) @@ -3328,7 +3328,7 @@ doConfigure(void *params) { ChooseGroupDialog(ewin, _ - (" Pick the group the window will belong to: \n"), + (" Pick the group the window will belong to: \n"), GROUP_SELECT_ALL_EXCEPT_EWIN, ACTION_ADD_TO_GROUP); } @@ -3347,8 +3347,7 @@ struct _keyset int doInsertKeys(void *params) { - const struct _keyset ks[] = - { + const struct _keyset ks[] = { {"a", 0, "a"}, {"b", 0, "b"}, {"c", 0, "c"}, @@ -3573,8 +3572,8 @@ doRaiseLower(void *params) { if (desks.desk[ewin->desktop].list[i]->layer == ewin->layer && (desks.desk[ewin->desktop].list[i] == ewin || - !FindEwinInList(desks.desk[ewin->desktop].list[i], gwins, - num))) + !FindEwinInList(desks.desk[ewin->desktop].list[i], gwins, + num))) { if (desks.desk[ewin->desktop].list[i] != ewin) raise = 1; @@ -3680,10 +3679,10 @@ doAddToGroup(void *params) ChooseGroupDialog(ewin, _ ("\n There's no current group at the moment. \n" - " The current group is the last one you created, \n" - " and it exists until you create a new one or break \n" + " The current group is the last one you created, \n" + " and it exists until you create a new one or break \n" " the latest one. \n\n" - " Pick another group that the window will belong to here: \n\n"), + " Pick another group that the window will belong to here: \n\n"), GROUP_SELECT_ALL_EXCEPT_EWIN, ACTION_ADD_TO_GROUP); EDBUG_RETURN(0); } @@ -3766,20 +3765,20 @@ doZoom(void *params) { fprintf(f, _ - ("You have been warned about the dangers of Zoom mode\n")); + ("You have been warned about the dangers of Zoom mode\n")); fclose(f); } DIALOG_OK(_("Warning !!!"), _ ("This feature is heavily reliant on a feature of your\n" - "X Server called the Vid Mode Extension. This feature exists\n" - "in XFree86 Servers, but is not a heavily used part of the\n" + "X Server called the Vid Mode Extension. This feature exists\n" + "in XFree86 Servers, but is not a heavily used part of the\n" "Server and thus isn't tested much.\n" "\n" - "It is possible your X Server does not deal well with being\n" + "It is possible your X Server does not deal well with being\n" "asked to switch modes quickly and it may hang, glitch,\n" "display artefacts or perhaps simply refuse to work.\n" "\n" - "This is a warning and will only be displayed this one time.\n" - "If your Server does not behave well then you will probably\n" + "This is a warning and will only be displayed this one time.\n" + "If your Server does not behave well then you will probably\n" "have to avoid using this feature.\n")); EDBUG_RETURN(0); } diff --git a/src/alert.c b/src/alert.c index bd43e837..48fe9b7d 100644 --- a/src/alert.c +++ b/src/alert.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -42,7 +42,7 @@ int debug_level; char *call_stack[1024]; void -Alert(char *fmt,...) +Alert(char *fmt, ...) { char text[10240]; va_list ap; diff --git a/src/areas.c b/src/areas.c index b16fa90c..b68057e4 100644 --- a/src/areas.c +++ b/src/areas.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -171,9 +171,9 @@ SlideWindowsBy(Window * win, int num, int dx, int dy, int speed) int dsec, dusec; double tm; struct _xy - { - int x, y; - } + { + int x, y; + } *xy; EDBUG(5, "SlideWindowsBy"); @@ -337,13 +337,13 @@ SetCurrentArea(int ax, int ay) lst[i]->x - (root.w * (ax - - desks.desk[desks.current]. - current_area_x)), + desks.desk[desks. + current].current_area_x)), lst[i]->y - (root.h * (ay - - desks.desk[desks.current]. - current_area_y))); + desks.desk[desks. + current].current_area_y))); if (setflip) mode.flipp = 0; lst[i]->area_x = a1; @@ -374,13 +374,13 @@ SetCurrentArea(int ax, int ay) x - (root.w * (ax - - desks.desk[desks.current]. - current_area_x)), + desks.desk[desks. + current].current_area_x)), y - (root.h * (ay - - desks.desk[desks.current]. - current_area_y))); + desks.desk[desks. + current].current_area_y))); } } /* if we're not moving it... move it across */ @@ -399,13 +399,13 @@ SetCurrentArea(int ax, int ay) lst[i]->x - (root.w * (ax - - desks.desk[desks.current]. - current_area_x)), + desks.desk[desks. + current].current_area_x)), lst[i]->y - (root.h * (ay - - desks.desk[desks.current]. - current_area_y))); + desks.desk[desks. + current].current_area_y))); if (setflip) mode.flipp = 0; lst[i]->area_x = a1; @@ -449,12 +449,12 @@ SetCurrentArea(int ax, int ay) if (mode.movemode == 5) DrawEwinShape(lst[i], mode.movemode, x, y, - lst[i]->client.w, lst[i]->client.h, + lst[i]->client.w, lst[i]->client.h, 4); else DrawEwinShape(lst[i], mode.movemode, x, y, - lst[i]->client.w, lst[i]->client.h, + lst[i]->client.w, lst[i]->client.h, 0); if (mode.flipp) { diff --git a/src/arrange.c b/src/arrange.c index 55f5ce21..a73f2131 100644 --- a/src/arrange.c +++ b/src/arrange.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -628,7 +628,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) if (((ewin->desktop == lst[i]->desktop) || (lst[i]->sticky)) && (!(lst[i]->floating)) && - (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) + (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) { if (IN_BELOW (ewin->x + dx, lst[i]->x + lst[i]->w - 1, @@ -661,7 +661,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) if (((ewin->desktop == lst[i]->desktop) || (lst[i]->sticky)) && (!(lst[i]->floating)) && - (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) + (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) { if (IN_ABOVE(ewin->x + ewin->w + dx - 1, lst[i]->x, mode.edge_snap_dist) && @@ -692,7 +692,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) if (((ewin->desktop == lst[i]->desktop) || (lst[i]->sticky)) && (!(lst[i]->floating)) && - (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) + (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) { if (IN_BELOW (ewin->y + dy, lst[i]->y + lst[i]->h - 1, @@ -725,7 +725,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) if (((ewin->desktop == lst[i]->desktop) || (lst[i]->sticky)) && (!(lst[i]->floating)) && - (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) + (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) { if (IN_ABOVE(ewin->y + ewin->h + dy - 1, lst[i]->y, mode.edge_snap_dist) && diff --git a/src/arrange.h b/src/arrange.h index 0f026186..f2eb5d08 100644 --- a/src/arrange.h +++ b/src/arrange.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -29,11 +29,11 @@ #define ARRANGE_BY_POSITION 2 typedef struct _rectbox - { - void *data; - int x, y, w, h; - int p; - } +{ + void *data; + int x, y, w, h; + int p; +} RectBox; void ArrangeRects(RectBox * fixed, int fixed_count, diff --git a/src/atoms.c b/src/atoms.c index 5f5ca941..c69343ac 100644 --- a/src/atoms.c +++ b/src/atoms.c @@ -1,6 +1,5 @@ - /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/borders.c b/src/borders.c index 61521703..faad47c4 100644 --- a/src/borders.c +++ b/src/borders.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -269,7 +269,7 @@ SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx, int *ty, int num_wins, int speed) { int k, spd, *x = NULL, *y = NULL, min, tmpx, tmpy, tmpw, - tmph, i; + tmph, i; struct timeval timev1, timev2; int dsec, dusec; double tm; @@ -1171,12 +1171,12 @@ CalcEwinWinpart(EWin * ewin, int i) if (bottomright == -1) { ox = - ((ewin-> - border->part[i].geom.bottomright.x.percent * ewin->w) >> 10) + + ((ewin->border-> + part[i].geom.bottomright.x.percent * ewin->w) >> 10) + ewin->border->part[i].geom.bottomright.x.absolute; oy = - ((ewin-> - border->part[i].geom.bottomright.y.percent * ewin->h) >> 10) + + ((ewin->border-> + part[i].geom.bottomright.y.percent * ewin->h) >> 10) + ewin->border->part[i].geom.bottomright.y.absolute; } else if (bottomright >= 0) @@ -2586,11 +2586,12 @@ MinShadeSize(EWin * ewin, int *mw, int *mh) leftborderwidth = ewin->border->border.left - ewin->bits[i].x; if ((ewin->bits[i].x + ewin->bits[i].w) - - (ewin->w - ewin->border->border.right) > rightborderwidth) + (ewin->w - ewin->border->border.right) > rightborderwidth) rightborderwidth = (ewin->bits[i].x + ewin->bits[i].w) - (ewin->w - - ewin->border-> - border.right); + ewin-> + border->border. + right); } } ewin->w = rightborderwidth + leftborderwidth; @@ -2616,8 +2617,9 @@ MinShadeSize(EWin * ewin, int *mw, int *mh) bottomborderwidth) bottomborderwidth = (ewin->bits[i].y + ewin->bits[i].h) - (ewin->h - - ewin->border-> - border.bottom); + ewin-> + border->border. + bottom); } } ewin->h = bottomborderwidth + topborderwidth; diff --git a/src/buttons.c b/src/buttons.c index 11cd4f89..94e5380b 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -92,7 +92,7 @@ CreateButton(char *name, ImageClass * iclass, ActionClass * aclass, ECreateWindow(desks.desk[desk % ENLIGHTENMENT_CONF_NUM_DESKTOPS].win, -100, -100, 50, 50, 0); XSelectInput(disp, b->win, - ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | + ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask); b->x = -1; diff --git a/src/clone.c b/src/clone.c index 021eb105..20e25c83 100644 --- a/src/clone.c +++ b/src/clone.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/cmclass.c b/src/cmclass.c index 21896e31..c1fb48fc 100644 --- a/src/cmclass.c +++ b/src/cmclass.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/comms.c b/src/comms.c index 844d9f54..43fb122b 100644 --- a/src/comms.c +++ b/src/comms.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -382,8 +382,7 @@ void HandleComms(XEvent * ev) { Client *c; - char *s, w[FILEPATH_LEN_MAX], w2[FILEPATH_LEN_MAX], *s1, - *s2; + char *s, w[FILEPATH_LEN_MAX], w2[FILEPATH_LEN_MAX], *s1, *s2; char sunknown[] = "UNKNOWN"; int unknown; @@ -1097,7 +1096,8 @@ HandleComms(XEvent * ev) char *name = NULL, *bgf = NULL, *topf = NULL; int updated = 0, tile, keep_aspect, tkeep_aspect; int xjust, yjust, xperc, yperc, txjust, tyjust, txperc, - typerc; + + typerc; sscanf(s, "%1000s %1000s", tmp, w); bg = @@ -1521,9 +1521,9 @@ HandleComms(XEvent * ev) Button *b; while ( - (b = - RemoveItem("_DESKTOP_DRAG_CONTROL", 0, LIST_FINDBY_NAME, - LIST_TYPE_BUTTON))) + (b = + RemoveItem("_DESKTOP_DRAG_CONTROL", 0, LIST_FINDBY_NAME, + LIST_TYPE_BUTTON))) DestroyButton(b); InitDesktopControls(); ShowDesktopControls(); @@ -1833,7 +1833,7 @@ HandleComms(XEvent * ev) "MWM_MINIMIZE: %5i\n" "MWM_MAXIMIZE: %5i\n" "APP_STATE: %5i\n", ewin->client.win, - ewin->win, ewin->x, ewin->y, ewin->w, ewin->h, none, + ewin->win, ewin->x, ewin->y, ewin->w, ewin->h, none, 0, 0, 0, 0, ewin->desktop, ewin->num_groups, ewin->docked, ewin->sticky, ewin->visible, ewin->iconified, ewin->shaded, ewin->active, @@ -1927,7 +1927,7 @@ HandleComms(XEvent * ev) { char buf[FILEPATH_LEN_MAX], *ret = NULL, none[] = - "-NONE-"; + "-NONE-"; EWin **lst; int i, num; diff --git a/src/conf.h b/src/conf.h index 9b8ac83f..e61b62ab 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/config.c b/src/config.c index 03aae527..1f11a185 100644 --- a/src/config.c +++ b/src/config.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -245,8 +245,7 @@ Config_Text(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); i1 = CONFIG_INVALID; } } @@ -438,8 +437,7 @@ Config_Text(FILE * ConfigFile) default: Alert(_("Warning: unable to determine what to do with\n" "the following text in the middle of current Text" - " definition:\n" - "%s\nWill ignore and continue...\n"), s); + " definition:\n" "%s\nWill ignore and continue...\n"), s); } } @@ -480,8 +478,7 @@ Config_Slideout(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); i1 = CONFIG_INVALID; } } @@ -517,8 +514,7 @@ Config_Slideout(FILE * ConfigFile) default: Alert(_("Warning: unable to determine what to do with\n" "the following text in the middle of current Text " - "definition:\n" - "%s\nWill ignore and continue...\n"), s); + "definition:\n" "%s\nWill ignore and continue...\n"), s); } } @@ -562,8 +558,7 @@ Config_Control(FILE * ConfigFile) if (fields != 2) { RecoverUserConfig(); - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); i1 = CONFIG_INVALID; } } @@ -796,8 +791,7 @@ Config_Control(FILE * ConfigFile) RecoverUserConfig(); Alert(_("Warning: unable to determine what to do with\n" "the following text in the middle of current Control " - "definition:\n" - "%s\nWill ignore and continue...\n"), s); + "definition:\n" "%s\nWill ignore and continue...\n"), s); } } RecoverUserConfig(); @@ -834,8 +828,7 @@ Config_MenuStyle(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } switch (i1) @@ -952,8 +945,7 @@ Config_Menu(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); i1 = CONFIG_INVALID; } } @@ -1170,7 +1162,7 @@ BorderPartLoad(FILE * ConfigFile, char type, Border * b) int flags = FLAG_BUTTON; char isregion = 0, keepshade = 1; int wmin = 0, wmax = 0, hmin = 0, hmax = 0, torigin = 0, - txp = 0, txa = 0, typ = 0, tya = 0, borigin = 0; + txp = 0, txa = 0, typ = 0, tya = 0, borigin = 0; int bxp = 0, bxa = 0, byp = 0, bya = 0; int fields; @@ -1194,8 +1186,7 @@ BorderPartLoad(FILE * ConfigFile, char type, Border * b) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); i1 = CONFIG_INVALID; } } @@ -1323,8 +1314,7 @@ Config_Border(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); i1 = CONFIG_INVALID; } } @@ -1400,7 +1390,8 @@ Config_Button(FILE * ConfigFile) int flags = 0, minw = 1, maxw = 99999, minh = 1; int maxh = 99999, xo = 0, yo = 0, xa = 0; int xr = 0, ya = 0, yr = 0, xsr = 0, xsa = 0, ysr = 0, - ysa = 0; + + ysa = 0; char simg = 0; int desk = 0; char sticky = 0; @@ -1431,8 +1422,7 @@ Config_Button(FILE * ConfigFile) if (fields != 2) { RecoverUserConfig(); - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); i1 = CONFIG_INVALID; } } @@ -1443,7 +1433,7 @@ Config_Button(FILE * ConfigFile) { bt = CreateButton(name, ic, ac, tc, label, ontop, flags, minw, maxw, minh, maxh, xo, yo, xa, xr, ya, - yr, xsr, xsa, ysr, ysa, simg, desk, sticky); + yr, xsr, xsa, ysr, ysa, simg, desk, sticky); bt->default_show = show; bt->internal = internal; AddItem(bt, bt->name, 0, LIST_TYPE_BUTTON); @@ -1647,8 +1637,7 @@ Config_Desktop(FILE * ConfigFile) if (fields != 2) { RecoverUserConfig(); - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); ii1 = CONFIG_INVALID; } } @@ -1893,8 +1882,7 @@ Config_ECursor(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } switch (ii1) @@ -1963,8 +1951,7 @@ Config_Iconbox(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } switch (i1) @@ -2061,8 +2048,7 @@ Config_ActionClass(FILE * ConfigFile) if (fields != 2) { RecoverUserConfig(); - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } switch (i1) @@ -2243,7 +2229,7 @@ Config_ActionClass(FILE * ConfigFile) { action_tooltipstring = Erealloc(action_tooltipstring, (strlen(action_tooltipstring) - + strlen(atword(s, 2)) + 2)); + + strlen(atword(s, 2)) + 2)); action_tooltipstring = strcat(action_tooltipstring, "\n"); action_tooltipstring = strcat(action_tooltipstring, atword(s, 2)); @@ -2281,7 +2267,7 @@ Config_ActionClass(FILE * ConfigFile) RecoverUserConfig(); Alert(_ ("Warning: Configuration appears to have ended before we were\n" - "Done loading an Action Class block. Outcome is likely not good.\n")); + "Done loading an Action Class block. Outcome is likely not good.\n")); } void @@ -2316,8 +2302,7 @@ Config_ImageClass(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } switch (i1) @@ -2535,8 +2520,7 @@ Config_ColorModifier(FILE * ConfigFile) if (fields != 2) { RecoverUserConfig(); - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } switch (i1) @@ -2797,8 +2781,7 @@ Config_ToolTip(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } switch (i1) @@ -3068,8 +3051,7 @@ Config_WindowMatch(FILE * ConfigFile) { if (fields != 2) { - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } switch (i1) @@ -3147,7 +3129,7 @@ Config_WindowMatch(FILE * ConfigFile) } } Alert(_("Warning: Configuration appears to have ended before we were\n" - "Done loading an WindowMatch block. Outcome is likely not good.\n")); + "Done loading an WindowMatch block. Outcome is likely not good.\n")); } int @@ -3199,9 +3181,8 @@ OpenConfigFileForReading(char *path, char preprocess) "Enlightenment is looking for epp here:\n" "%s\n" "This is a FATAL ERROR.\n" - "This is probably due to either the program not existing or\n" - "it not being able to be executed by you.\n"), - epp_path); + "This is probably due to either the program not existing or\n" + "it not being able to be executed by you.\n"), epp_path); doExit(_("error")); } else @@ -3296,7 +3277,8 @@ LoadConfigFile(char *f) { FILE *ConfigFile; char s[FILEPATH_LEN_MAX], s2[FILEPATH_LEN_MAX], *file, - *ppfile; + + *ppfile; int i; char notheme = 0; @@ -3392,8 +3374,7 @@ LoadOpenConfigFile(FILE * ConfigFile) if (fields != 2) { RecoverUserConfig(); - Alert(_("CONFIG: missing required data in \"%s\"\n"), - s); + Alert(_("CONFIG: missing required data in \"%s\"\n"), s); } } if (i2 == CONFIG_OPEN) @@ -3427,7 +3408,7 @@ LoadOpenConfigFile(FILE * ConfigFile) "Enlightenment's\n" "it may be that you haven't upgraded " "Enlightenment for\n" - "a while and this theme takes advantages of new\n" + "a while and this theme takes advantages of new\n" "features in Enlightenment in new versions.\n"), e_cfg_ver, min_e_cfg_ver); RESET_ALERT; @@ -3449,8 +3430,8 @@ LoadOpenConfigFile(FILE * ConfigFile) "be compatible.\n" "\n" "If you just upgraded to a new version of E\n" - "Restarting with Defaults will remove your current\n" - "user preferences and start cleanly with system\n" + "Restarting with Defaults will remove your current\n" + "user preferences and start cleanly with system\n" "defaults. You can then modify your " "configuration to\n" "your liking again safely.\n"), @@ -3598,7 +3579,8 @@ FindFile(char *file) #ifndef __EMX__ if (locale) { - Esnprintf(s, sizeof(s), "%s/config/%s.%s", ENLIGHTENMENT_ROOT, file, locale); + Esnprintf(s, sizeof(s), "%s/config/%s.%s", ENLIGHTENMENT_ROOT, file, + locale); if (isfile(s)) EDBUG_RETURN(duplicate(s)); } @@ -3663,7 +3645,8 @@ FindNoThemeFile(char *file) #ifndef __EMX__ if (locale) { - Esnprintf(s, sizeof(s), "%s/config/%s.%s", ENLIGHTENMENT_ROOT, file, locale); + Esnprintf(s, sizeof(s), "%s/config/%s.%s", ENLIGHTENMENT_ROOT, file, + locale); if (isfile(s)) EDBUG_RETURN(duplicate(s)); } @@ -3738,7 +3721,7 @@ LoadEConfig(char *themelocation) "permissions or lack of disk space. It also could be that the\n" "config directory has been inadvertently deleted since\n" "installation.\n" - "This is a serious problem and should be rectified immediately\n" + "This is a serious problem and should be rectified immediately\n" "Please contact your system administrator or package " "maintainer.\n" "If you are the administrator of your own system please\n" @@ -3752,8 +3735,7 @@ LoadEConfig(char *themelocation) { Progressbar *p = NULL; int i; - char *config_files[] = - { + char *config_files[] = { "init.cfg", "control.cfg", "textclasses.cfg", @@ -3787,9 +3769,7 @@ LoadEConfig(char *themelocation) CreateStartupDisplay(1); if ((i > 0) && (!p) && (!init_win_ext)) { - p = - CreateProgressbar(_("Enlightenment Starting..."), 400, - 16); + p = CreateProgressbar(_("Enlightenment Starting..."), 400, 16); if (p) ShowProgressbar(p); } @@ -4218,15 +4198,14 @@ RecoverUserConfig(void) { ASSIGN_ALERT(_("Recover system config?"), _("Yes, Attempt recovery"), - _("Restart and try again"), - _("Quit and give up")); + _("Restart and try again"), _("Quit and give up")); Alert(_ - ("Enlightenment has encountered parsing errors in your autosaved\n" - "configuration.\n" "\n" - "This may be due to filing system errors, Minor bugs or" - " unforeseen\n" "system shutdowns.\n" "\n" - "Do you wish Enlightenment to recover its original system\n" - "configuration and try again?\n")); + ("Enlightenment has encountered parsing errors in your autosaved\n" + "configuration.\n" "\n" + "This may be due to filing system errors, Minor bugs or" + " unforeseen\n" "system shutdowns.\n" "\n" + "Do you wish Enlightenment to recover its original system\n" + "configuration and try again?\n")); RESET_ALERT; mode.autosave = 0; MapUnmap(1); diff --git a/src/containers.c b/src/containers.c index c3314773..6ee8c271 100644 --- a/src/containers.c +++ b/src/containers.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/coords.c b/src/coords.c index b71375e0..1370f748 100644 --- a/src/coords.c +++ b/src/coords.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/cursors.c b/src/cursors.c index 6ae29cd2..8dfa6e56 100644 --- a/src/cursors.c +++ b/src/cursors.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/desktops.c b/src/desktops.c index 0d0503a8..ba57ad7c 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -28,10 +28,10 @@ GetUniqueBGString(Background * bg) char s[256]; const char *chmap = #ifndef __EMX__ - "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"; + "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"; #else - "0123456789abcdefghijklmnopqrstuvwxyz-_"; + "0123456789abcdefghijklmnopqrstuvwxyz-_"; /* cyrillic symbols from 866 page correctly handled instead of eng. capitals */ #endif @@ -1310,17 +1310,17 @@ InitDesktopControls() else if (desks.dragdir == 2) { b = CreateButton("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac, - NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, + NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, 99999, 0, 0, desks.desk[i].x, 0, desks.desk[i].y, 0, 0, 0, 0, 0, 1, 0, 1); } else { b = CreateButton("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac, - NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, + NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, 99999, 0, 0, desks.desk[i].x, 0, desks.desk[i].y + root.h - - desks.dragbar_width, 0, 0, 0, 0, 0, 1, 0, 1); + desks.dragbar_width, 0, 0, 0, 0, 0, 1, 0, 1); } AddItem(b, b->name, 2, LIST_TYPE_BUTTON); desks.desk[i].tag = b; diff --git a/src/dialog.c b/src/dialog.c index 4c3b0d05..e7f677b3 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -280,7 +280,7 @@ DialogQuit(int val, void *data) } void -DialogAlert(char *fmt,...) +DialogAlert(char *fmt, ...) { char text[10240]; va_list ap; @@ -293,7 +293,7 @@ DialogAlert(char *fmt,...) } void -DialogAlertOK(char *fmt,...) +DialogAlertOK(char *fmt, ...) { char text[10240]; va_list ap; @@ -307,7 +307,7 @@ DialogAlertOK(char *fmt,...) } void -DialogSetParamText(Dialog * d, char *fmt,...) +DialogSetParamText(Dialog * d, char *fmt, ...) { char text[10240]; va_list ap; @@ -1081,15 +1081,15 @@ DialogRealizeItem(Dialog * d, DItem * di) ImlibImage *im; im = - ELoadImage(di->item.slider.ic_border->norm.normal-> - im_file); + ELoadImage(di->item.slider.ic_border->norm. + normal->im_file); if (im) { di->item.slider.border_orig_w = im->rgb_width; di->item.slider.border_orig_h = im->rgb_height; Imlib_destroy_image(id, im); di->item.slider.border_win = ECreateWindow(d->win, -20, - -20, 2, 2, 0); + -20, 2, 2, 0); EMapWindow(disp, di->item.slider.border_win); } } @@ -1237,7 +1237,7 @@ DialogRealizeItem(Dialog * d, DItem * di) if ((cols > 0) && (rows > 0)) { int i, *col_size, *row_size = NULL, r = 0, - c = 0, x = 0, y = 0; + c = 0, x = 0, y = 0; col_size = Emalloc(sizeof(int) * cols); row_size = Erealloc(row_size, sizeof(int)); @@ -1353,26 +1353,28 @@ DialogRealizeItem(Dialog * d, DItem * di) dii->w, dii->h); if (dii->type == DITEM_CHECKBUTTON) EMoveResizeWindow(disp, - dii->item.check_button.check_win, + dii->item.check_button.check_win, dii->x, dii->y + ((dii->h - - dii->item.check_button. - check_orig_h) / 2), - dii->item.check_button. - check_orig_w, - dii->item.check_button. - check_orig_h); + dii->item. + check_button.check_orig_h) / + 2), + dii->item. + check_button.check_orig_w, + dii->item. + check_button.check_orig_h); if (dii->type == DITEM_RADIOBUTTON) EMoveResizeWindow(disp, - dii->item.radio_button.radio_win, + dii->item.radio_button.radio_win, dii->x, dii->y + ((dii->h - - dii->item.radio_button. - radio_orig_h) / 2), - dii->item.radio_button. - radio_orig_w, - dii->item.radio_button. - radio_orig_h); + dii->item. + radio_button.radio_orig_h) / + 2), + dii->item. + radio_button.radio_orig_w, + dii->item. + radio_button.radio_orig_h); if (dii->type == DITEM_AREA) { dii->item.area.w = dii->w - @@ -1412,7 +1414,7 @@ DialogRealizeItem(Dialog * d, DItem * di) dii->item.slider.base_h); if (dii->item.slider.border_win) EMoveResizeWindow(disp, - dii->item.slider.border_win, + dii->item.slider.border_win, dii->x + dii->item.slider.border_x, dii->y + @@ -1426,7 +1428,7 @@ DialogRealizeItem(Dialog * d, DItem * di) dii->y + dii->item.slider.numeric_y, dii->item.slider.numeric_w, - dii->item.slider.numeric_h); + dii->item.slider.numeric_h); } } x += sw; @@ -1638,11 +1640,11 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h) if (di->item.check_button.onoff) IclassApply(di->iclass, di->item.check_button.check_win, di->item.check_button.check_orig_w, - di->item.check_button.check_orig_h, 1, 0, state, 0); + di->item.check_button.check_orig_h, 1, 0, state, 0); else IclassApply(di->iclass, di->item.check_button.check_win, di->item.check_button.check_orig_w, - di->item.check_button.check_orig_h, 0, 0, state, 0); + di->item.check_button.check_orig_h, 0, 0, state, 0); XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False); TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, di->item.check_button.text, @@ -1679,11 +1681,11 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h) if (di->item.radio_button.onoff) IclassApply(di->iclass, di->item.radio_button.radio_win, di->item.radio_button.radio_orig_w, - di->item.radio_button.radio_orig_h, 1, 0, state, 0); + di->item.radio_button.radio_orig_h, 1, 0, state, 0); else IclassApply(di->iclass, di->item.radio_button.radio_win, di->item.radio_button.radio_orig_w, - di->item.radio_button.radio_orig_w, 0, 0, state, 0); + di->item.radio_button.radio_orig_w, 0, 0, state, 0); XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False); TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, di->item.radio_button.text, @@ -1882,8 +1884,7 @@ DialogItemAreaSetSize(DItem * di, int w, int h) di->item.area.h = h; } -Window -DialogItemAreaGetWindow(DItem * di) +Window DialogItemAreaGetWindow(DItem * di) { return di->item.area.area_win; } diff --git a/src/dock.c b/src/dock.c index 90903332..2501f239 100644 --- a/src/dock.c +++ b/src/dock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/draw.c b/src/draw.c index ba219963..22be4cc3 100644 --- a/src/draw.c +++ b/src/draw.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -98,7 +98,7 @@ HandleDrawQueue() for (i = 0; i < num; i++) { if ((lst[i]->d == dq->d) && (dq->d->item) && - /*(dq->d->item == dq->di) && */ (lst[i]->di == dq->di)) + /*(dq->d->item == dq->di) && */ (lst[i]->di == dq->di)) { if (dq->x < lst[i]->x) { @@ -200,7 +200,7 @@ HandleDrawQueue() else if (lst[i]->iclass) { IclassApply(lst[i]->iclass, lst[i]->win, lst[i]->w, lst[i]->h, - lst[i]->active, lst[i]->sticky, lst[i]->state, 0); + lst[i]->active, lst[i]->sticky, lst[i]->state, 0); /* printf("I %x\n", lst[i]->win); */ } else if (lst[i]->pager) @@ -582,7 +582,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, int y, 13))) + (p1 & p2 & ((0x1 << 11) | (0x1 << 5) | (0x1) | - (0x1 << 27) | (0x1 << 21) | (0x1 << 16))); + (0x1 << 27) | (0x1 << 21) | (0x1 << 16))); } } else @@ -604,7 +604,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, int y, 13))) + (p1 & p2 & ((0x1 << 11) | (0x1 << 5) | (0x1) | - (0x1 << 27) | (0x1 << 21) | (0x1 << 16))); + (0x1 << 27) | (0x1 << 21) | (0x1 << 16))); } { unsigned short *pptr1, *pptr2, *pptr3; @@ -663,7 +663,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, int y, 13))) + (p1 & p2 & ((0x1 << 10) | (0x1 << 5) | (0x1) | - (0x1 << 26) | (0x1 << 20) | (0x1 << 16))); + (0x1 << 26) | (0x1 << 20) | (0x1 << 16))); } } else @@ -685,7 +685,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, int y, 13))) + (p1 & p2 & ((0x1 << 10) | (0x1 << 5) | (0x1) | - (0x1 << 26) | (0x1 << 20) | (0x1 << 16))); + (0x1 << 26) | (0x1 << 20) | (0x1 << 16))); } { unsigned short *pptr1, *pptr2, *pptr3; diff --git a/src/events.c b/src/events.c index 15ca1312..7290e616 100644 --- a/src/events.c +++ b/src/events.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -29,8 +29,7 @@ char throw_move_events_away = 0; void DeskAccountTimeout(int val, void *data); -HandleStruct HArray[] = -{ +HandleStruct HArray[] = { {DefaultFunc}, {DefaultFunc}, {HKeyPress}, @@ -347,8 +346,7 @@ WaitEvent() /* XEvent ev; */ fd_set fdset; struct timeval tval; - static struct timeval tval_last = - {0, 0}; + static struct timeval tval_last = { 0, 0 }; double time1, time2; Qentry *qe; int count, pcount; diff --git a/src/evhandlers.c b/src/evhandlers.c index d2c826c5..537779e5 100644 --- a/src/evhandlers.c +++ b/src/evhandlers.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -43,11 +43,11 @@ static ToolTip *ttip = NULL; struct _mdata - { - Menu *m; - MenuItem *mi; - EWin *ewin; - }; +{ + Menu *m; + MenuItem *mi; + EWin *ewin; +}; static void ToolTipTimeout(int val, void *data); static void SubmenuShowTimeout(int val, void *dat); @@ -480,7 +480,7 @@ HandleMotion(XEvent * ev) if ((ndx != dx) && (((gwins[i]->x == 0) && (!(IN_RANGE - (gwins[i]->reqx, gwins[i]->x, screen_snap_dist)))) + (gwins[i]->reqx, gwins[i]->x, screen_snap_dist)))) || ((gwins[i]->x == (root.w - gwins[i]->w)) && (!(IN_RANGE @@ -494,8 +494,7 @@ HandleMotion(XEvent * ev) (gwins [i]->reqx, gwins[i]->x, - mode. - edge_snap_dist))))))) + mode.edge_snap_dist))))))) { jumpx = 1; ndx = gwins[i]->reqx - gwins[i]->x + dx; @@ -504,7 +503,7 @@ HandleMotion(XEvent * ev) if ((ndy != dy) && (((gwins[i]->y == 0) && (!(IN_RANGE - (gwins[i]->reqy, gwins[i]->y, screen_snap_dist)))) + (gwins[i]->reqy, gwins[i]->y, screen_snap_dist)))) || ((gwins[i]->y == (root.h - gwins[i]->h)) && (!(IN_RANGE @@ -518,8 +517,7 @@ HandleMotion(XEvent * ev) (gwins [i]->reqy, gwins[i]->y, - mode. - edge_snap_dist))))))) + mode.edge_snap_dist))))))) { jumpy = 1; ndy = gwins[i]->reqy - gwins[i]->y + dy; @@ -982,8 +980,8 @@ HandleMotion(XEvent * ev) { di->item.slider.wanted_val += dy; di->item.slider.val = di->item.slider.lower + - ((((di-> - item.slider.base_h - di->item.slider.knob_h - + ((((di->item. + slider.base_h - di->item.slider.knob_h - di->item.slider.wanted_val) * (di->item.slider.upper - di->item.slider.lower)) / @@ -1920,8 +1918,7 @@ HandleMouseDown(XEvent * ev) if ((ewin) && (!ewin->pager)) { Window dw; - int wx, wy, ww, wh, ax, ay, cx, cy, - px, py; + int wx, wy, ww, wh, ax, ay, cx, cy, px, py; PagerHideHi(p); pwin_px = ewin->x; @@ -2394,15 +2391,15 @@ HandleMouseUp(XEvent * ev) ((ew->desktop == desks.current) || (ew->sticky))) { if ( - (ev->xbutton.x_root >= - (ew->x + ew->border->border.left)) - && (ev->xbutton.x_root < - (ew->x + ew->w - ew->border->border.right)) - && (ev->xbutton.y_root >= - (ew->y + ew->border->border.top)) - && (ev->xbutton.y_root < - (ew->y + ew->h - - ew->border->border.bottom))) + (ev->xbutton.x_root >= + (ew->x + ew->border->border.left)) + && (ev->xbutton.x_root < + (ew->x + ew->w - ew->border->border.right)) + && (ev->xbutton.y_root >= + (ew->y + ew->border->border.top)) + && (ev->xbutton.y_root < + (ew->y + ew->h - + ew->border->border.bottom))) { ewin = ew; i = desks.desk[desks.current].num; @@ -2413,8 +2410,7 @@ HandleMouseUp(XEvent * ev) if ((ewin) && (ewin->pager)) { Pager *pp; - int w, h, x, y, ax, ay, cx, cy, px, - py; + int w, h, x, y, ax, ay, cx, cy, px, py; int wx, wy, base_x = 0, base_y = 0; Window dw; @@ -2501,20 +2497,21 @@ HandleMouseUp(XEvent * ev) if (ewin->ibox) { if (ewin->ibox->animate) - IB_Animate(1, gwins[i], ewin->ibox->ewin); + IB_Animate(1, gwins[i], + ewin->ibox->ewin); UpdateAppIcon(gwins[i], ewin->ibox->icon_mode); } HideEwin(gwins[i]); MoveEwin(gwins[i], gwin_px[i] + ((desks.desk - [gwins[i]->desktop]. - current_area_x) - + [gwins[i]-> + desktop].current_area_x) - p->hi_ewin->area_x) * root.w, gwin_py[i] + - ((desks. - desk[gwins[i]->desktop]. - current_area_y) - + ((desks.desk + [gwins[i]-> + desktop].current_area_y) - p->hi_ewin->area_y) * root.h); if (was_shaded != gwins[i]->shaded) InstantShadeEwin(gwins[i]); @@ -2526,7 +2523,7 @@ HandleMouseUp(XEvent * ev) else { int ndesk, nx, ny, base_x = 0, base_y = - 0, ax, ay; + 0, ax, ay; ndesk = desks.current; nx = (int)ev->xbutton.x_root - diff --git a/src/file.c b/src/file.c index 5d8f3c17..4db0deae 100644 --- a/src/file.c +++ b/src/file.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -54,8 +54,7 @@ Etmp(char *s) n_calls = (unsigned long)time(NULL) + (unsigned long)getpid(); Esnprintf(s, 1024, "%s/TMP_%Xl", UserEDir(), n_calls); n_calls++; - EDBUG_RETURN_ -} +EDBUG_RETURN_} void md(char *s) @@ -263,8 +262,7 @@ cp(char *s, char *ss) EDBUG_RETURN_; } -time_t -moddate(char *s) +time_t moddate(char *s) { struct stat st; diff --git a/src/finders.c b/src/finders.c index ebb3d5e3..62317c8a 100644 --- a/src/finders.c +++ b/src/finders.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/focus.c b/src/focus.c index 4ad88707..ffa17f5f 100644 --- a/src/focus.c +++ b/src/focus.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -75,8 +75,8 @@ GetNextFocusEwin(void) if (((ewin->sticky) || (ewin->desktop == desks.current)) && ((ewin->area_x == ax) && (ewin->area_y == ay)) && (!ewin->skipfocus) && (!ewin->shaded) && - (!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) && - * (ewin->client.mwm_decor_border) */ + (!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) && + * (ewin->client.mwm_decor_border) */ ) { num++; @@ -146,8 +146,8 @@ GetPrevFocusEwin(void) if (((ewin->sticky) || (ewin->desktop == desks.current)) && ((ewin->area_x == ax) && (ewin->area_y == ay)) && (!ewin->skipfocus) && (!ewin->shaded) && - (!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) && - * (ewin->client.mwm_decor_border) */ + (!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) && + * (ewin->client.mwm_decor_border) */ ) { num++; diff --git a/src/fx.c b/src/fx.c index f8ce7ccc..8df637b6 100644 --- a/src/fx.c +++ b/src/fx.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -27,15 +27,15 @@ #endif typedef struct _fxhandler - { - char *name; - void (*init_func) (char *name); - void (*desk_func) (void); - void (*quit_func) (void); - void (*pause_func) (void); - char in_use; - char paused; - } +{ + char *name; + void (*init_func) (char *name); + void (*desk_func) (void); + void (*quit_func) (void); + void (*pause_func) (void); + char in_use; + char paused; +} FXHandler; void FX_Ripple_Init(char *name); @@ -56,13 +56,12 @@ void FX_ImageSpinner_Quit(void); void FX_ImageSpinner_Pause(void); static int num_fx_handlers = 4; -static FXHandler fx_handlers[] = -{ +static FXHandler fx_handlers[] = { {"ripples", FX_Ripple_Init, FX_Ripple_Desk, FX_Ripple_Quit, FX_Ripple_Pause, 0, 0}, {"raindrops", - FX_Raindrops_Init, FX_Raindrops_Desk, FX_Raindrops_Quit, FX_Raindrops_Pause, + FX_Raindrops_Init, FX_Raindrops_Desk, FX_Raindrops_Quit, FX_Raindrops_Pause, 0, 0}, {"waves", FX_Waves_Init, FX_Waves_Desk, FX_Waves_Quit, FX_Waves_Pause, @@ -255,12 +254,12 @@ FX_ripple_timeout(int val, void *data) _("\n" "You have just started the Ripples Effect.\n" "\n" - "If you look closely on your desktop background, and if it\n" - "doesn't have a solid colour (i.e. has a background texture or\n" - "image), you will see a pool of water at the bottom of your\n" - "screen that reflects everything above it and \"ripples\".\n" + "If you look closely on your desktop background, and if it\n" + "doesn't have a solid colour (i.e. has a background texture or\n" + "image), you will see a pool of water at the bottom of your\n" + "screen that reflects everything above it and \"ripples\".\n" "\n" - "To disable this effect just select this option again to toggle\n" + "To disable this effect just select this option again to toggle\n" "it off.\n")); before = 1; } @@ -358,11 +357,11 @@ static PixImg *fx_raindrops_draw = NULL; void FX_raindrops_timeout(int val, void *data); typedef struct _drop_context - { - int x, y; - int count; - PixImg *buf; - } +{ + int x, y; + int count; + PixImg *buf; +} DropContext; static DropContext fx_raindrops[4]; @@ -386,37 +385,35 @@ FX_raindrops_timeout(int val, void *data) { DIALOG_OK(_("Unable to display raindrops"), _("\n" - "Enlightenment is unable to display raindrops on this\n" - "display because Shared memory is not available on this\n" + "Enlightenment is unable to display raindrops on this\n" + "display because Shared memory is not available on this\n" "X-Server.\n" "\n" - "This may be due to Enlightenment being a remote client\n" - "running over the network, a MIT-SHM incapable X-server,\n" + "This may be due to Enlightenment being a remote client\n" + "running over the network, a MIT-SHM incapable X-server,\n" "having run out of SHM ID's on the system or Shared\n" "Memory support being turned off in Imlib\n" "\n" - "You may correct this by either running `imlib_config'\n" - "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" - "and editing it, enabling shared memory.\n" - "\n")); + "You may correct this by either running `imlib_config'\n" + "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" + "and editing it, enabling shared memory.\n" "\n")); return; } if (!id->x.shmp) { DIALOG_OK(_("Unable to display raindrops"), _("\n" - "Enlightenment is unable to display raindrops on this\n" - "display because shared pixmaps are not available on this\n" + "Enlightenment is unable to display raindrops on this\n" + "display because shared pixmaps are not available on this\n" "X-Server.\n" "\n" - "This may be due to either the X-Server not implementing\n" - "shared pixmaps, or shared pixmaps being disabled in\n" + "This may be due to either the X-Server not implementing\n" + "shared pixmaps, or shared pixmaps being disabled in\n" "Imlib's configuration.\n" "\n" - "You may correct this by either running `imlib_config'\n" - "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" - "and editing it, enabling shared pixmaps.\n" - "\n")); + "You may correct this by either running `imlib_config'\n" + "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" + "and editing it, enabling shared pixmaps.\n" "\n")); return; } if (!before) @@ -424,12 +421,12 @@ FX_raindrops_timeout(int val, void *data) _("\n" "You have just started the Raindrops Effect.\n" "\n" - "If you look closely on your desktop background, and if it\n" - "doesn't have a solid colour (i.e. has a background texture or\n" - "image), you will see \"raindrops\" hit the background and\n" - "make little splashes. This Effect can be VERY CPU intensive.\n" + "If you look closely on your desktop background, and if it\n" + "doesn't have a solid colour (i.e. has a background texture or\n" + "image), you will see \"raindrops\" hit the background and\n" + "make little splashes. This Effect can be VERY CPU intensive.\n" "\n" - "To disable this effect just select this option again to toggle\n" + "To disable this effect just select this option again to toggle\n" "it off.\n")); before = 1; if (first) @@ -515,7 +512,7 @@ FX_raindrops_timeout(int val, void *data) fx_raindrops[j].y + fx_raindrop_size)) || ((fx_raindrops - [i].x + fx_raindrop_size >= fx_raindrops[j].x) + [i].x + fx_raindrop_size >= fx_raindrops[j].x) && (fx_raindrops[i].x + fx_raindrop_size < fx_raindrops[j].x + fx_raindrop_size) && (fx_raindrops[i].y >= fx_raindrops[j].y) @@ -530,7 +527,7 @@ FX_raindrops_timeout(int val, void *data) fx_raindrops[j].y + fx_raindrop_size)) || ((fx_raindrops - [i].x + fx_raindrop_size >= fx_raindrops[j].x) + [i].x + fx_raindrop_size >= fx_raindrops[j].x) && (fx_raindrops[i].x + fx_raindrop_size < fx_raindrops[j].x + fx_raindrop_size) && (fx_raindrops[i].y + fx_raindrop_size >= @@ -719,12 +716,12 @@ FX_Wave_timeout(int val, void *data) _("\n" "You have just started the Waves Effect.\n" "\n" - "If you look closely on your desktop background, and if it\n" - "doesn't have a solid colour (i.e. has a background texture or\n" - "image), you will see a pool of water at the bottom of your\n" - "screen that reflects everything above it and \"waves\".\n" + "If you look closely on your desktop background, and if it\n" + "doesn't have a solid colour (i.e. has a background texture or\n" + "image), you will see a pool of water at the bottom of your\n" + "screen that reflects everything above it and \"waves\".\n" "\n" - "To disable this effect just select this option again to toggle\n" + "To disable this effect just select this option again to toggle\n" "it off.\n")); before = 1; } @@ -885,7 +882,7 @@ FX_imagespinner_timeout(int val, void *data) _("\n" "You have just started the imagespinners Effect.\n" "\n" - "To disable this effect just select this option again to toggle\n" + "To disable this effect just select this option again to toggle\n" "it off.\n")); before = 1; } diff --git a/src/globals.c b/src/globals.c index d09e1a06..4a13dcde 100644 --- a/src/globals.c +++ b/src/globals.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/gnome.c b/src/gnome.c index 78a5acd9..ca526249 100644 --- a/src/gnome.c +++ b/src/gnome.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -128,12 +128,12 @@ /* Preferences for behavior for app */ /* ONLY the client sets this */ -#define WIN_HINTS_SKIP_FOCUS (1<<0) /* "alt-tab" skips this win */ -#define WIN_HINTS_SKIP_WINLIST (1<<1) /* not in win list */ -#define WIN_HINTS_SKIP_TASKBAR (1<<2) /* not on taskbar */ -#define WIN_HINTS_GROUP_TRANSIENT (1<<3) /* ??????? */ -#define WIN_HINTS_FOCUS_ON_CLICK (1<<4) /* app only accepts focus when clicked */ -#define WIN_HINTS_DO_NOT_COVER (1<<5) /* attempt to not cover this window */ +#define WIN_HINTS_SKIP_FOCUS (1<<0) /* "alt-tab" skips this win */ +#define WIN_HINTS_SKIP_WINLIST (1<<1) /* not in win list */ +#define WIN_HINTS_SKIP_TASKBAR (1<<2) /* not on taskbar */ +#define WIN_HINTS_GROUP_TRANSIENT (1<<3) /* ??????? */ +#define WIN_HINTS_FOCUS_ON_CLICK (1<<4) /* app only accepts focus when clicked */ +#define WIN_HINTS_DO_NOT_COVER (1<<5) /* attempt to not cover this window */ #define XA_WIN_HINTS "_WIN_HINTS" /* WIN_HINTS = CARD32 */ @@ -720,8 +720,7 @@ GNOME_SetWMNameVer(void) void GNOME_DelHints(EWin * ewin) { - static Atom atom_get[7] = - {0, 0, 0, 0, 0, 0, 0}; + static Atom atom_get[7] = { 0, 0, 0, 0, 0, 0, 0 }; EDBUG(6, "GNOME_DelHints"); if (!atom_get[0]) diff --git a/src/grabs.c b/src/grabs.c index 14b22b9a..1446e19a 100644 --- a/src/grabs.c +++ b/src/grabs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/groups.c b/src/groups.c index a9b3bfe4..ccdb0e14 100644 --- a/src/groups.c +++ b/src/groups.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -253,7 +253,7 @@ RemoveEwinFromGroup(EWin * ewin, Group * g) root.h) y = root.h - ewin->border->border.top - 1; else if ((ewin->y + ewin->h - - ewin->border->border.bottom - 1) < 0) + ewin->border->border.bottom - 1) < 0) y = 0 - ewin->h + ewin->border->border.bottom + 1; @@ -602,9 +602,9 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action) { DIALOG_OK(_("Window Group Error"), _ - ("\n This window currently does not belong to any groups. \n" - " You can only destroy groups or remove windows from groups \n" - " through a window that actually belongs to at least one group.\n\n")); + ("\n This window currently does not belong to any groups. \n" + " You can only destroy groups or remove windows from groups \n" + " through a window that actually belongs to at least one group.\n\n")); return; } if ((num_groups == 0) && (group_select == GROUP_SELECT_ALL_EXCEPT_EWIN)) diff --git a/src/handlers.c b/src/handlers.c index 6679cf8b..d9e43d80 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -59,10 +59,10 @@ HandleSigIll(int num) DialogAlert(_("Enlightenment performed an Illegal Instruction.\n" "\n" "This most likely is due to you having installed an run a\n" - "binary of Enlightenment that was compiled for a make or model\n" - "of CPU not 100%% identical or compatible with yours. Please\n" + "binary of Enlightenment that was compiled for a make or model\n" + "of CPU not 100%% identical or compatible with yours. Please\n" "either obtain the correct package for your system, or\n" - "re-compile Enlightenment and possibly any support libraries\n" + "re-compile Enlightenment and possibly any support libraries\n" "that you got in binary format to run Enlightenment.\n")); doExit("error"); EDBUG_RETURN_; @@ -86,13 +86,13 @@ HandleSigFpe(int num) UngrabX(); DialogAlert(_("Enlightenment caused a Floating Point Exception.\n" "\n" - "This means that Enlightenment or support library routines it calls\n" - "have performed an illegal mathematical operation (most likely\n" - "dividing a number by zero). This is most likely a bug. It is\n" - "recommended to restart now. If you wish to help fix this please\n" + "This means that Enlightenment or support library routines it calls\n" + "have performed an illegal mathematical operation (most likely\n" + "dividing a number by zero). This is most likely a bug. It is\n" + "recommended to restart now. If you wish to help fix this please\n" "compile Enlightenment with debugging symbols in and run\n" - "Enlightenment under gdb so you can backtrace for where it died and\n" - "send in a useful bug report with backtrace information and variable\n" + "Enlightenment under gdb so you can backtrace for where it died and\n" + "send in a useful bug report with backtrace information and variable\n" "dumps etc.\n")); doExit("error"); EDBUG_RETURN_; @@ -111,12 +111,12 @@ HandleSigSegv(int num) UngrabX(); DialogAlert(_("Enlightenment caused Segment Violation (Segfault)\n" "\n" - "This means that Enlightenment or support library routines it calls\n" - "have accessed areas of your system's memory that they are not\n" - "allowed access to. This is most likely a bug. It is recommended to\n" + "This means that Enlightenment or support library routines it calls\n" + "have accessed areas of your system's memory that they are not\n" + "allowed access to. This is most likely a bug. It is recommended to\n" "restart now. If you wish to help fix this please compile\n" - "Enlightenment with debugging symbols in and run Enlightenment\n" - "under gdb so you can backtrace for where it died and send in a\n" + "Enlightenment with debugging symbols in and run Enlightenment\n" + "under gdb so you can backtrace for where it died and send in a\n" "useful bug report with backtrace information and variable\n" "dumps etc.\n")); abort(); @@ -195,7 +195,7 @@ HandleSigBus(int num) UngrabX(); DialogAlert(_("Enlightenment caused Bus Error.\n" "\n" - "It is suggested you check your hardware and OS installation.\n" + "It is suggested you check your hardware and OS installation.\n" "It is highly unusual to cause Bus Errors on operational\n" "hardware.\n")); EDBUG_RETURN_; @@ -213,15 +213,14 @@ EHandleXError(Display * d, XErrorEvent * ev) if ((!no_overwrite) && (mode.xselect)) { ASSIGN_ALERT(_("Another Window Manager is already running"), - _("OK (edit file)"), - "", _("Cancel (do NOT edit)")); + _("OK (edit file)"), "", _("Cancel (do NOT edit)")); Alert(_("Another Window Manager is already running.\n" "\n" - "You will have to quit your current Window Manager first before\n" + "You will have to quit your current Window Manager first before\n" "you can successfully run Enlightenment.\n" "\n" - "If you haven't edited your user start-up files, Enlightenment\n" - "can do that now for you, so when you log in again after\n" + "If you haven't edited your user start-up files, Enlightenment\n" + "can do that now for you, so when you log in again after\n" "quitting your current window manager, you will have\n" "Enlightenment running.\n" "\n" @@ -230,14 +229,13 @@ EHandleXError(Display * d, XErrorEvent * ev) "\n" "WARNING WARNING WARNING WARNING!\n" "\n" - "It is possible that this MAY not properly edit your files.\n")); + "It is possible that this MAY not properly edit your files.\n")); ASSIGN_ALERT(_("Are you sure?"), - _("YES (edit file)"), - "", _("NO (do not edit)")); + _("YES (edit file)"), "", _("NO (do not edit)")); Alert(_ ("Are you absolutely sure you want to have Enlightenment\n" "edit your start-up files for you?\n" "\n" - "If your start-up files are highly customised this may not\n" + "If your start-up files are highly customised this may not\n" "work.\n" "\n" "Are you ABSOLUTELY sure?\n")); RESET_ALERT; AddE(); diff --git a/src/icccm.c b/src/icccm.c index 958130a3..0613dbd9 100644 --- a/src/icccm.c +++ b/src/icccm.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/iclass.c b/src/iclass.c index 16e0fa53..4d76de49 100644 --- a/src/iclass.c +++ b/src/iclass.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/iconify.c b/src/iconify.c index fae4a732..c044da9a 100644 --- a/src/iconify.c +++ b/src/iconify.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -32,7 +32,7 @@ IB_Animate(char iconify, EWin * from, EWin * to) { double t1, t2, t, i, spd, ii; int x, y, x1, y1, x2, y2, x3, y3, x4, y4, w, h, fx, fy, - fw, fh, dx, dy, dw, dh; + fw, fh, dx, dy, dw, dh; GC gc; XGCValues gcv; @@ -2118,9 +2118,9 @@ RedrawIconbox(Iconbox * ib) EMoveResizeWindow(disp, ib->icon_win, 0, 0, ib->w - ib->scroll_thickness, ib->h); if ( - (ic = - FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, - LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) + (ic = + FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, + LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) { EMoveResizeWindow(disp, ib->cover_win, 0, 0, ib->w - ib->scroll_thickness, ib->h); @@ -2140,9 +2140,9 @@ RedrawIconbox(Iconbox * ib) ib->scroll_thickness, 0, ib->w - ib->scroll_thickness, ib->h); if ( - (ic = - FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, - LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) + (ic = + FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, + LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) { EMoveResizeWindow(disp, ib->cover_win, ib->scroll_thickness, 0, @@ -2250,9 +2250,9 @@ RedrawIconbox(Iconbox * ib) EMoveResizeWindow(disp, ib->icon_win, 0, 0, ib->w, ib->h - ib->scroll_thickness); if ( - (ic = - FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, - LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) + (ic = + FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, + LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) { EMoveResizeWindow(disp, ib->cover_win, 0, 0, ib->w, ib->h - ib->scroll_thickness); @@ -2272,9 +2272,9 @@ RedrawIconbox(Iconbox * ib) 0, ib->scroll_thickness, ib->w, ib->h - ib->scroll_thickness); if ( - (ic = - FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, - LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) + (ic = + FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, + LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) { EMoveResizeWindow(disp, ib->cover_win, 0, ib->scroll_thickness, diff --git a/src/init.c b/src/init.c index 38e25037..9b515614 100644 --- a/src/init.c +++ b/src/init.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to diff --git a/src/ipc.c b/src/ipc.c index aae9011e..a25f8f18 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999 Carsten Haitzler, Geoff Harrison and various contributors + * Copyright (C) 2000 Carsten Haitzler, Geoff Harrison and various contributors * * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -116,486 +116,429 @@ void IPC_Group(char *params, Client * c); * --Mandrake */ -IPCStruct IPCArray[] = -{ +IPCStruct IPCArray[] = { { - IPC_Help, - "help", - "gives you this help screen", - "Additional parameters will retrieve help on many topics - " - "\"help \".\nuse \"help all\" for a list of commands." - }, + IPC_Help, + "help", + "gives you this help screen", + "Additional parameters will retrieve help on many topics - " + "\"help \".\nuse \"help all\" for a list of commands."}, { - IPC_Version, - "version", - "displays the current version of Enlightenment running", - NULL - }, + IPC_Version, + "version", + "displays the current version of Enlightenment running", + NULL}, { - IPC_Nop, - "nop", - "IPC No-operation - returns nop", - NULL - }, + IPC_Nop, + "nop", + "IPC No-operation - returns nop", + NULL}, { - IPC_Copyright, - "copyright", - "displays copyright information for Enlightenment", - NULL - }, + IPC_Copyright, + "copyright", + "displays copyright information for Enlightenment", + NULL}, { - IPC_AutoSave, - "autosave", - "toggle the Automatic Saving Feature", - "Use \"autosave ?\" to list the current status\n" - "use \"autosave on\" or \"autosave off\" to toggle the status" - }, + IPC_AutoSave, + "autosave", + "toggle the Automatic Saving Feature", + "Use \"autosave ?\" to list the current status\n" + "use \"autosave on\" or \"autosave off\" to toggle the status"}, { - IPC_DefaultTheme, - "default_theme", - "toggle the default theme", - "Use \"default_theme ?\" to get the current default theme\n" - "use \"default_theme /path/to/theme\"\n" - "you can retrieve a list of available themes from the " - "\"list_themes\" command" - }, + IPC_DefaultTheme, + "default_theme", + "toggle the default theme", + "Use \"default_theme ?\" to get the current default theme\n" + "use \"default_theme /path/to/theme\"\n" + "you can retrieve a list of available themes from the " + "\"list_themes\" command"}, { - IPC_Restart, - "restart", - "Restart Enlightenment", - NULL - }, + IPC_Restart, + "restart", + "Restart Enlightenment", + NULL}, { - IPC_RestartWM, - "restart_wm", - "Restart another window manager", - "Use \"restart_wm \" to start another window manager.\n" - "Example: \"restart_wm fvwm\"" - }, + IPC_RestartWM, + "restart_wm", + "Restart another window manager", + "Use \"restart_wm \" to start another window manager.\n" + "Example: \"restart_wm fvwm\""}, { - IPC_RestartTheme, - "restart_theme", - "Restart with another theme", - "Use \"restart_theme \" to restart enlightenment " - "with another theme\nExample: \"restart_theme icE\"" - }, + IPC_RestartTheme, + "restart_theme", + "Restart with another theme", + "Use \"restart_theme \" to restart enlightenment " + "with another theme\nExample: \"restart_theme icE\""}, { - IPC_Exit, - "exit", - "Exit Enlightenment", - NULL - }, + IPC_Exit, + "exit", + "Exit Enlightenment", + NULL}, { - IPC_ForceSave, - "save_config", - "Force Enlightenment to save settings now", - NULL - }, + IPC_ForceSave, + "save_config", + "Force Enlightenment to save settings now", + NULL}, { - IPC_SMFile, - "sm_file", - "Change the default prefix used for session saves", - "Average users are encouraged not to touch this setting.\n" - "Use \"sm_file ?\" to retrieve the current session management " - "file prefix\nUse \"sm_file /path/to/prefix/filenameprefix\" " - "to change." - }, + IPC_SMFile, + "sm_file", + "Change the default prefix used for session saves", + "Average users are encouraged not to touch this setting.\n" + "Use \"sm_file ?\" to retrieve the current session management " + "file prefix\nUse \"sm_file /path/to/prefix/filenameprefix\" " + "to change."}, { - IPC_ListThemes, - "list_themes", - "List currently available themes", - NULL - }, + IPC_ListThemes, + "list_themes", + "List currently available themes", + NULL}, { - IPC_GotoDesktop, - "goto_desktop", - "Change currently active destkop", - "Use \"goto_desktop num\" to go to a specific desktop.\n" - "Use \"goto_desktop next\" and \"goto_desktop prev\" to go to " - "the next and\n previous desktop\n" - "Use \"goto_desktop ?\" to find out what desktop you are " - "currently on" - }, + IPC_GotoDesktop, + "goto_desktop", + "Change currently active destkop", + "Use \"goto_desktop num\" to go to a specific desktop.\n" + "Use \"goto_desktop next\" and \"goto_desktop prev\" to go to " + "the next and\n previous desktop\n" + "Use \"goto_desktop ?\" to find out what desktop you are " "currently on"}, { - IPC_GotoArea, - "goto_area", - "Change currently active area", - "Use \"goto_area \" to go to a specific desktop.\n" - "Use \"goto_desktop next \" and \"goto_desktop " - "prev \" to go to the next and\n " - "previous areas\nUse \"goto_area ?\" to find out what area " - "you are currently on" - }, + IPC_GotoArea, + "goto_area", + "Change currently active area", + "Use \"goto_area \" to go to a specific desktop.\n" + "Use \"goto_desktop next \" and \"goto_desktop " + "prev \" to go to the next and\n " + "previous areas\nUse \"goto_area ?\" to find out what area " + "you are currently on"}, { - IPC_ShowIcons, - "show_icons", - "Toggle the display of icons on the desktop", - "Use \"show_icons on\" and \"show_icons off\" to change this setting\n" - "Use \"show_icons ?\" to retrieve the current setting" - }, + IPC_ShowIcons, + "show_icons", + "Toggle the display of icons on the desktop", + "Use \"show_icons on\" and \"show_icons off\" to change this setting\n" + "Use \"show_icons ?\" to retrieve the current setting"}, { - IPC_FocusMode, - "focus_mode", - "Change the current focus mode setting", - "Use \"focus_mode \" to change the focus mode.\n" - "Use \"focus_mode ?\" to retrieve the current setting\n" - "Focus Types:\n" - "click: This is the traditional click-to-focus mode.\n" - "clicknograb: This is a similar focus mode, but without the " - "grabbing of the click\n " - "(you cannot click anywhere in a window to focus it)\n" - "pointer: The focus will follow the mouse pointer\n" - "sloppy: in sloppy-focus, the focus follows the mouse, " - "but when over\n " - "the desktop background the last window does not lose the focus" - }, + IPC_FocusMode, + "focus_mode", + "Change the current focus mode setting", + "Use \"focus_mode \" to change the focus mode.\n" + "Use \"focus_mode ?\" to retrieve the current setting\n" + "Focus Types:\n" + "click: This is the traditional click-to-focus mode.\n" + "clicknograb: This is a similar focus mode, but without the " + "grabbing of the click\n " + "(you cannot click anywhere in a window to focus it)\n" + "pointer: The focus will follow the mouse pointer\n" + "sloppy: in sloppy-focus, the focus follows the mouse, " + "but when over\n " + "the desktop background the last window does not lose the focus"}, { - IPC_AdvancedFocus, - "advanced_focus", - "Toggle Advanced Focus Settings", - "use \"advanced_focus