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

Thu Apr 6 01:17:06 CEST 2000 

(Saur)

Ran the default indent from ecvs on all files to get rid of differences
caused by it (should hopefully give smaller diffs in the future).
Removed all duplicated * * in comments (generated by indent sometimes).


SVN revision: 2431
This commit is contained in:
Peter Kjellerstedt 2000-04-05 23:22:56 +00:00
parent 9e29fd0da5
commit 7f0b9c37d3
75 changed files with 2129 additions and 2082 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -4562,3 +4562,12 @@ Mon Apr 3 16:46:07 PDT 2000
(Mandrake)
more fixes for xinerama-aware menus.
-------------------------------------------------------------------------------
Thu Apr 6 01:17:06 CEST 2000
(Saur)
Ran the default indent from ecvs on all files to get rid of differences
caused by it (should hopefully give smaller diffs in the future).
Removed all duplicated * * in comments (generated by indent sometimes).

300
src/E.h
View File

@ -3,19 +3,19 @@
/*****************************************************************************/
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -230,7 +230,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);
@ -539,16 +539,16 @@ typedef struct _iconbox Iconbox;
typedef struct _group Group;
typedef struct _icondef
{
{
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;
@ -559,29 +559,29 @@ typedef struct _exid
int depth;
Pixmap bgpmap;
int bgcol;
}
}
EXID;
typedef struct _actiontype
{
{
void *params;
struct _actiontype *Next;
int Type;
}
}
ActionType;
typedef struct _list
{
{
char *name;
int id;
void *item;
struct _list *next;
}
}
List;
typedef struct _client
{
{
char *name;
Window win;
char *msg;
@ -593,11 +593,11 @@ typedef struct _client
char *address;
char *info;
Pixmap pmap;
}
}
Client;
typedef struct _root
{
{
Window win;
Visual *vis;
int depth;
@ -605,28 +605,28 @@ typedef struct _root
int scr;
int w, h;
Window focuswin;
}
}
Root;
typedef struct _modcurve
{
{
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;
}
}
ColorModifierClass;
typedef struct _imagestate
{
{
char *im_file;
char *real_file;
char unloadable;
@ -637,31 +637,31 @@ typedef struct _imagestate
ImlibColor bg, hi, lo, hihi, lolo;
int bevelstyle;
ColorModifierClass *colmod;
}
}
ImageState;
typedef struct _ImageStateArray
{
{
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;
}
}
ImageClass;
typedef struct _efont
{
{
TT_Engine engine;
TT_Face face;
TT_Instance instance;
@ -671,11 +671,11 @@ typedef struct _efont
TT_Raster_Map **glyphs_cached;
int max_descent;
int max_ascent;
}
}
Efont;
typedef struct _textstate
{
{
char *fontname;
FnlibStyle style;
FnlibFont *font;
@ -686,11 +686,11 @@ typedef struct _textstate
XFontStruct *xfont;
XFontSet xfontset;
int xfontset_ascent;
}
}
TextState;
typedef struct _textclass
{
{
char *name;
struct
{
@ -702,11 +702,11 @@ typedef struct _textclass
norm , active, sticky, sticky_active;
int justification;
unsigned int ref_count;
}
}
TextClass;
typedef struct _action
{
{
char event;
char anymodifier;
int modifiers;
@ -717,27 +717,27 @@ typedef struct _action
char *key_str;
char *tooltipstring;
ActionType *action;
}
}
Action;
typedef struct _actionclass
{
{
char *name;
int num;
Action **list;
char *tooltipstring;
unsigned int ref_count;
}
}
ActionClass;
typedef struct _constraints
{
{
int min, max;
}
}
Constraints;
typedef struct _winpoint
{
{
int originbox;
struct
{
@ -745,29 +745,29 @@ typedef struct _winpoint
int absolute;
}
x , y;
}
}
WinPoint;
typedef struct _geometry
{
{
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;
}
}
ECursor;
typedef struct _winpart
{
{
Geometry geom;
ImageClass *iclass;
ActionClass *aclass;
@ -776,11 +776,11 @@ typedef struct _winpart
signed char ontop;
int flags;
char keep_for_shade;
}
}
WinPart;
typedef struct _border
{
{
char *name;
char *group_border_name;
ImlibBorder border;
@ -789,11 +789,11 @@ typedef struct _border
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;
@ -801,11 +801,11 @@ typedef struct _ewinbit
char expose;
char no_expose;
char left;
}
}
EWinBit;
typedef struct _winclient
{
{
Window win;
char *title;
int x, y, w, h, bw;
@ -847,11 +847,11 @@ typedef struct _winclient
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;
@ -904,11 +904,11 @@ typedef struct _ewin
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;
@ -917,27 +917,27 @@ typedef struct _groupconfig
char stick;
char shade;
char mirror;
}
}
GroupConfig;
struct _group
{
{
int index;
EWin **members;
int num_members;
GroupConfig cfg;
};
};
typedef struct _awaiticlass
{
{
Window client_win;
int ewin_bit;
ImageClass *iclass;
}
}
AwaitIclass;
typedef struct _bgeometry
{
{
Constraints width, height;
int xorigin, yorigin;
int xabs, xrel;
@ -945,14 +945,14 @@ typedef struct _bgeometry
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;
@ -978,11 +978,11 @@ typedef struct _button
char destroy_inside_win;
char left;
unsigned int ref_count;
}
}
Button;
typedef struct _buttoncontainer
{
{
char *name;
ImageClass *iclass;
@ -993,11 +993,11 @@ typedef struct _buttoncontainer
char orientation;
Button **ButtonList;
int numofbuttonsinlist;
}
}
Container;
struct _strip
{
{
char *name;
int xabs, yabs;
int xrel, yrel;
@ -1020,10 +1020,10 @@ struct _strip
Window win;
int x, y, w, h;
int cx, cy, cw, ch;
};
};
typedef struct _background
{
{
char *name;
Pixmap pmap;
time_t last_viewed;
@ -1052,11 +1052,11 @@ typedef struct _background
ColorModifierClass *cmclass;
char keepim;
unsigned int ref_count;
}
}
Background;
typedef struct _desk
{
{
char viewable;
Window win;
int x, y;
@ -1066,11 +1066,11 @@ typedef struct _desk
Button *tag;
int current_area_x;
int current_area_y;
}
}
Desk;
typedef struct _desktops
{
{
int current;
Desk desk[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
int dragdir;
@ -1080,31 +1080,31 @@ typedef struct _desktops
char slidein;
int slidespeed;
char hiqualitybg;
}
}
Desktops;
typedef struct _sample
{
{
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;
}
}
SoundClass;
typedef struct _windowmatch
{
{
char *name;
char *win_title;
char *win_name;
@ -1119,11 +1119,11 @@ typedef struct _windowmatch
ImageClass *icon;
int desk;
char make_sticky;
}
}
WindowMatch;
typedef struct
{
{
char *name;
char direction;
int num_buttons;
@ -1132,11 +1132,11 @@ typedef struct
Window win;
Window from_win;
unsigned int ref_count;
}
}
Slideout;
typedef struct _emode
{
{
int mode;
int deskmode;
char place;
@ -1257,26 +1257,26 @@ typedef struct _emode
int pager_win_button;
int pager_menu_button;
char area_wraparound;
}
}
EMode;
typedef struct _handlestruct
{
{
void (*func) (XEvent * ev);
}
}
HandleStruct;
typedef struct _IPCstruct
{
{
void (*func) (char *params, Client * c);
char *commandname;
char *help_text;
char *extended_help_text;
}
}
IPCStruct;
typedef struct _tooltip
{
{
char *name;
ImageClass *iclass;
@ -1289,11 +1289,11 @@ typedef struct _tooltip
char visible;
ImageClass *tooltippic;
unsigned int ref_count;
}
}
ToolTip;
typedef struct _qentry
{
{
char *name;
double in_time;
void (*func) (int val, void *data);
@ -1301,11 +1301,11 @@ typedef struct _qentry
int runtime_val;
void *runtime_data;
char just_added;
}
}
Qentry;
typedef struct _menustyle
{
{
char *name;
TextClass *tclass;
ImageClass *bg_iclass;
@ -1317,11 +1317,11 @@ typedef struct _menustyle
int maxy;
char *border_name;
unsigned int ref_count;
}
}
MenuStyle;
typedef struct _menuitem
{
{
ImageClass *icon_iclass;
char *text;
short act_id;
@ -1338,11 +1338,11 @@ typedef struct _menuitem
short text_h;
short text_x;
short text_y;
}
}
MenuItem;
struct _menu
{
{
char *name;
char *title;
MenuStyle *style;
@ -1358,10 +1358,10 @@ struct _menu
void *data;
Menu *ref_menu;
unsigned int ref_count;
};
};
typedef struct _progressbar
{
{
char *name;
int value;
int x;
@ -1373,11 +1373,11 @@ typedef struct _progressbar
Window p_win;
ImageClass *ic, *inc, *ipc;
TextClass *tc, *tnc;
}
}
Progressbar;
struct _snapshot
{
{
char *name;
char *win_title;
char *win_name;
@ -1409,7 +1409,7 @@ struct _snapshot
char skipfocus;
char use_neverfocus;
char neverfocus;
};
};
typedef struct _ditembutton DItemButton;
typedef struct _ditemcheckbutton DItemCheckButton;
@ -1423,7 +1423,7 @@ typedef struct _ditemarea DItemArea;
typedef struct _ditem DItem;
struct _ditemslider
{
{
char horizontal;
char numeric;
@ -1457,56 +1457,56 @@ struct _ditemslider
Window base_win;
Window knob_win;
Window border_win;
};
};
struct _ditemarea
{
{
Window area_win;
int w, h;
void (*event_func) (int val, void *data);
};
};
struct _ditembutton
{
{
char *text;
};
};
struct _ditemcheckbutton
{
{
char *text;
Window check_win;
int check_orig_w, check_orig_h;
char onoff;
char *onoff_ptr;
};
};
struct _ditemtext
{
{
char *text;
};
};
struct _ditemimage
{
{
char *image;
};
};
struct _ditemseparator
{
{
char horizontal;
};
};
struct _ditemtable
{
{
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;
@ -1515,7 +1515,7 @@ struct _ditemradiobutton
int *val_ptr;
DItem *next;
DItem *first;
};
};
#define DITEM_NONE 0
#define DITEM_BUTTON 1
@ -1529,7 +1529,7 @@ struct _ditemradiobutton
#define DITEM_AREA 9
struct _ditem
{
{
int type;
void (*func) (int val, void *data);
int val;
@ -1561,10 +1561,10 @@ struct _ditem
DItemArea area;
}
item;
};
};
typedef struct _dbutton
{
{
char *text;
void (*func) (int val, void *data);
Window win;
@ -1574,20 +1574,20 @@ typedef struct _dbutton
char close;
TextClass *tclass;
ImageClass *iclass;
}
}
DButton;
typedef struct _Dkeybind
{
{
KeyCode key;
int val;
void *data;
void (*func) (int val, void *data);
}
}
DKeyBind;
struct _dialog
{
{
char *name;
char *title;
char *text;
@ -1603,27 +1603,27 @@ struct _dialog
void *exit_data;
int num_bindings;
DKeyBind *keybindings;
};
};
typedef struct _PixImg
{
{
XImage *xim;
XShmSegmentInfo *shminfo;
Pixmap pmap;
GC gc;
}
}
PixImg;
typedef struct _Clone
{
{
char *name;
Window win;
EWin *ewin;
}
}
Clone;
struct _iconbox
{
{
/* user settings */
char *name;
char orientation;
@ -1675,10 +1675,10 @@ struct _iconbox
int bar_thickness;
int knob_length;
};
};
struct _pager
{
{
char *name;
Window win;
Pixmap pmap;
@ -1694,10 +1694,10 @@ struct _pager
char hi_visible;
Window hi_win;
EWin *hi_ewin;
};
};
typedef struct _drawqueue
{
{
Window win;
ImageClass *iclass;
int w, h, active, sticky, state, expose;
@ -1710,22 +1710,22 @@ typedef struct _drawqueue
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
}
}
KStates;
typedef enum
{
{
AddWindow,
RemoveWindow,
FocusWindow,
@ -1733,16 +1733,16 @@ typedef enum
LowerWindow,
ChangedClient,
IconChange
}
}
KMessage;
/* only used for remember list dialog callback funcs (SettingsDialog()
in in settings.c)... snaps are attached to windows, not a global list */
* in in settings.c)... snaps are attached to windows, not a global list */
typedef struct _remwinlist
{
{
EWin *ewin;
char remember;
}
}
RememberWinList;
/* function prototypes */
@ -1942,7 +1942,7 @@ 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 *,
void * (*FunctionToTest) (EWin *,
WindowMatch
*));
@ -2705,7 +2705,7 @@ __Erealloc(x, y, "<unknown>", 0)
char *duplicate(char *s);
void Alert(char *fmt, ...);
void Alert(char *fmt,...);
void InitStringList(void);
void AssignIgnoreFunction(int (*FunctionToAssign) (void *),
@ -2830,9 +2830,9 @@ 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);

17
src/actions.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -665,7 +665,7 @@ runApp(char *exe, char *params)
"%s\n"
"This program could not be executed.\n"
"This is because the file does not exist.\n"),
(char *)exe);
(char *)exe);
/* relative path */
else
DialogAlertOK(_
@ -708,7 +708,7 @@ runApp(char *exe, char *params)
"to execute it because you do not "
"have execute "
"access to this file.\n"),
(char *)path);
(char *)path);
}
/* it's not a file */
else
@ -1374,8 +1374,8 @@ doCleanup(void *params)
(
(((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])->layer != 4) &&
(((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu))
{
fixed = Erealloc(fixed, sizeof(RectBox) * (k + 1));
fixed[k].data = lst[i];
@ -3495,7 +3495,8 @@ struct _keyset
int
doInsertKeys(void *params)
{
const struct _keyset ks[] = {
const struct _keyset ks[] =
{
{"a", 0, "a"},
{"b", 0, "b"},
{"c", 0, "c"},

8
src/alert.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -42,7 +42,7 @@ int debug_level;
char *call_stack[1024];
void
Alert(char *fmt, ...)
Alert(char *fmt,...)
{
char text[10240];
va_list ap;

6
src/areas.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

1
src/arrange.c
View File

@ -670,6 +670,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
#ifdef HAS_XINERAMA
static XineramaScreenInfo *screens = NULL;
#endif
static int num_screens = 0;
int top_bound, bottom_bound, left_bound, right_bound;

10
src/arrange.h
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,11 +29,11 @@
#define ARRANGE_BY_POSITION 2
typedef struct _rectbox
{
{
void *data;
int x, y, w, h;
int p;
}
}
RectBox;
void ArrangeRects(RectBox * fixed, int fixed_count,

6
src/atoms.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

36
src/borders.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -1247,9 +1247,9 @@ CalcEwinWinpart(EWin * ewin, int i)
ewin->bits[bottomright].y;
}
/*
* * calculate height before width, because we may need it in order to
* * determine the font size. But we might do it the other way around for
* * side borders :-)
* calculate height before width, because we may need it in order to
* determine the font size. But we might do it the other way around for
* side borders :-)
*/
h = (oy - y) + 1;
@ -1257,8 +1257,8 @@ CalcEwinWinpart(EWin * ewin, int i)
min = ewin->border->part[i].geom.height.min;
/*
* * If the title bar max size is set to zero, then set the title bar size to
* * just a little bit more than the size of the title text.
* If the title bar max size is set to zero, then set the title bar size to
* just a little bit more than the size of the title text.
*/
if (max == 0 && ewin->border->part[i].flags == FLAG_TITLE)
@ -1268,8 +1268,8 @@ CalcEwinWinpart(EWin * ewin, int i)
TextClass *tclass;
/*
* * calculate width before height, because we need it in order to
* * determine the font size.
* calculate width before height, because we need it in order to
* determine the font size.
*/
w = (ox - x) + 1;
@ -1312,7 +1312,7 @@ CalcEwinWinpart(EWin * ewin, int i)
h = min;
}
/*
* * and now the width.
* and now the width.
*/
w = (ox - x) + 1;
@ -1320,8 +1320,8 @@ CalcEwinWinpart(EWin * ewin, int i)
min = ewin->border->part[i].geom.width.min;
/*
* * If the title bar max size is set to zero, then set the title bar size to
* * just a little bit more than the size of the title text.
* If the title bar max size is set to zero, then set the title bar
* size to just a little bit more than the size of the title text.
*/
if (max == 0 && ewin->border->part[i].flags == FLAG_TITLE)
@ -1474,10 +1474,10 @@ AdoptInternal(Window win, Border * border, int type, void *ptr)
ICCCM_GetGeoms(ewin, 0);
/* if (type == 1)
* * MatchEwinToSnapInfoPager(ewin, (Pager *)ptr);
* * else if (type == 2)
* * MatchEwinToSnapInfoIconbox(ewin, (Iconbox *)ptr);
* * else */
* MatchEwinToSnapInfoPager(ewin, (Pager *)ptr);
* else if (type == 2)
* MatchEwinToSnapInfoIconbox(ewin, (Iconbox *)ptr);
* else */
if (!border)
{
b =
@ -2243,7 +2243,7 @@ RestackEwin(EWin * ewin)
{
for (i = 0; i < wnum; i++)
{
if ( /* ** (lst[i]->sticky) || */ (lst[i]->floating))
if ( /* (lst[i]->sticky) || */ (lst[i]->floating))
{
tot++;
wl = Erealloc(wl, tot * sizeof(Window));

6
src/buttons.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/clone.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/cmclass.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

14
src/comms.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -383,7 +383,8 @@ void
HandleComms(XEvent * ev)
{
Client *c;
char *s, w[FILEPATH_LEN_MAX], w2[FILEPATH_LEN_MAX], *s1, *s2;
char *s, *s1, *s2;
char w[FILEPATH_LEN_MAX], w2[FILEPATH_LEN_MAX];
char sunknown[] = "UNKNOWN";
int unknown;
@ -1097,9 +1098,8 @@ HandleComms(XEvent * ev)
char tmp[1024];
char *name = NULL, *bgf = NULL, *topf = NULL;
int updated = 0, tile, keep_aspect, tkeep_aspect;
int xjust, yjust, xperc, yperc, txjust, tyjust, txperc,
typerc;
int xjust, yjust, xperc, yperc;
int txjust, tyjust, txperc, typerc;
sscanf(s, "%1000s %1000s", tmp, w);
bg =

6
src/conf.h
View File

@ -1,19 +1,19 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

9
src/config.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -3706,7 +3706,8 @@ LoadEConfig(char *themelocation)
{
Progressbar *p = NULL;
int i;
char *config_files[] = {
char *config_files[] =
{
"init.cfg",
"control.cfg",
"textclasses.cfg",

6
src/containers.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/coords.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/cursors.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

12
src/desktops.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -1925,7 +1925,7 @@ StackDesktops()
{
for (i = 0; i < num; i++)
{
if ( /* ** (lst[i]->sticky) || */ (lst[i]->floating))
if ( /* (lst[i]->sticky) || */ (lst[i]->floating))
{
tot++;
wl = Erealloc(wl, tot * sizeof(Window));
@ -2013,7 +2013,7 @@ MoveEwinToDesktop(EWin * ewin, int num)
int pdesk;
EDBUG(3, "MoveEwinToDesktop");
/* ** ewin->sticky = 0; */
/* ewin->sticky = 0; */
ewin->floating = 0;
DesktopRemoveEwin(ewin);
pdesk = ewin->desktop;
@ -2166,7 +2166,7 @@ MoveEwinToDesktopAt(EWin * ewin, int num, int x, int y)
int dx, dy, pdesk;
EDBUG(3, "MoveEwinToDesktopAt");
/* ** ewin->sticky = 0; */
/* ewin->sticky = 0; */
pdesk = ewin->desktop;
ewin->floating = 0;
DesktopRemoveEwin(ewin);

18
src/dialog.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -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;
@ -437,7 +437,8 @@ DialogActivateButton(Window win, int inclick)
if (!d)
return;
if ((d->button[bnum]->hilited) && (d->button[bnum]->clicked) &&
(inclick == 3)) doact = 1;
(inclick == 3))
doact = 1;
if (inclick == 0)
d->button[bnum]->hilited = 1;
if (inclick == 1)
@ -1998,7 +1999,8 @@ 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;
}

6
src/dock.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/draw.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

12
src/events.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,8 @@
char throw_move_events_away = 0;
void DeskAccountTimeout(int val, void *data);
HandleStruct HArray[] = {
HandleStruct HArray[] =
{
{DefaultFunc},
{DefaultFunc},
{HKeyPress},
@ -346,7 +347,8 @@ 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;

27
src/evhandlers.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -43,11 +43,11 @@
static ToolTip *ttip = NULL;
struct _mdata
{
{
Menu *m;
MenuItem *mi;
EWin *ewin;
};
};
static void ToolTipTimeout(int val, void *data);
static void SubmenuShowTimeout(int val, void *dat);
@ -72,10 +72,12 @@ ToolTipTimeout(int val, void *data)
/* In the case of multiple screens, check to make sure
* the root window is still where the mouse is... */
if (False == XQueryPointer(disp, root.win, &rt, &ch, &x, &y, &dum,
&dum, &mask)) EDBUG_RETURN_;
&dum, &mask))
EDBUG_RETURN_;
/* dont pop up tooltip is mouse button down */
if (mask & (Button1Mask | Button2Mask | Button3Mask |
Button4Mask | Button5Mask)) EDBUG_RETURN_;
Button4Mask | Button5Mask))
EDBUG_RETURN_;
win = WindowAtXY(x, y);
ac = FindActionClass(win);
if (!ac)
@ -744,8 +746,8 @@ HandleMotion(XEvent * ev)
if (y < 0)
y = -y;
if ((x > mode.button_move_resistance) ||
(y > mode.button_move_resistance)) mode.button_move_pending =
0;
(y > mode.button_move_resistance))
mode.button_move_pending = 0;
}
if (!mode.button_move_pending)
{
@ -773,6 +775,7 @@ HandleMotion(XEvent * ev)
#ifdef HAS_XINERAMA
static XineramaScreenInfo *screens;
static int num_screens;
#endif
EWin *menus[256];
int fx[256];
@ -2134,7 +2137,8 @@ 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;
int px, py;
PagerHideHi(p);
pwin_px = ewin->x;
@ -2632,7 +2636,8 @@ 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;
int px, py;
int wx, wy, base_x = 0, base_y = 0;
Window dw;

6
src/file.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/finders.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

14
src/focus.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -145,9 +145,11 @@ GetPrevFocusEwin(void)
DetermineEwinArea(ewin);
if (((ewin->sticky) || (ewin->desktop == desks.current)) &&
((ewin->area_x == ax) && (ewin->area_y == ay)) &&
(!ewin->skipfocus) && (!ewin->neverfocus) && (!ewin->shaded) &&
(!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) &&
* * (ewin->client.mwm_decor_border) */
(!ewin->skipfocus) && (!ewin->neverfocus) &&
(!ewin->shaded) && (!ewin->menu) && (!ewin->pager) &&
(!ewin->ibox) && (!ewin->iconified)
/* && (ewin->client.mwm_decor_title) &&
* (ewin->client.mwm_decor_border) */
)
{
num++;

17
src/fx.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -27,7 +27,7 @@
#endif
typedef struct _fxhandler
{
{
char *name;
void (*init_func) (char *name);
void (*desk_func) (void);
@ -35,7 +35,7 @@ typedef struct _fxhandler
void (*pause_func) (void);
char in_use;
char paused;
}
}
FXHandler;
void FX_Ripple_Init(char *name);
@ -56,7 +56,8 @@ 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},
@ -358,11 +359,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;
}
}
DropContext;
static DropContext fx_raindrops[4];

6
src/globals.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

10
src/gnome.c
View File

@ -1,19 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -721,7 +720,8 @@ 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])

6
src/grabs.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/groups.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/handlers.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/icccm.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/iclass.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/iconify.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/init.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

23
src/ipc.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -87,9 +87,7 @@ void IPC_RememberList(char *params, Client * c);
/* Changes By Asmodean_ <naru@caltech.edu> / #E@Efnet
*
* * * * * IPC_ReloadMenus(...) / reload_menus - Reloads menus from menus.cfg
* * * * *
* * * * * */
* IPC_ReloadMenus(...) / reload_menus - Reloads menus from menus.cfg */
void IPC_ReloadMenus(char *params, Client * c);
@ -119,7 +117,8 @@ void IPC_Group(char *params, Client * c);
* --Mandrake
*/
IPCStruct IPCArray[] = {
IPCStruct IPCArray[] =
{
{
IPC_Help,
"help",
@ -3374,10 +3373,12 @@ IPC_FX(char *params, Client * c)
MoveDesktop(i, 0, 0);
while ((b = RemoveItem("_DESKTOP_DRAG_CONTROL",
0, LIST_FINDBY_NAME,
LIST_TYPE_BUTTON))) DestroyButton(b);
LIST_TYPE_BUTTON)))
DestroyButton(b);
while ((b = RemoveItem("_DESKTOP_DESKRAY_DRAG_CONTROL",
0, LIST_FINDBY_NAME,
LIST_TYPE_BUTTON))) DestroyButton(b);
LIST_TYPE_BUTTON)))
DestroyButton(b);
InitDesktopControls();
ShowDesktopControls();
}
@ -5385,8 +5386,8 @@ IPC_RememberList(char *params, Client * c)
Snapshot **lst;
int i, j, num, f;
char buf[FILEPATH_LEN_MAX * 2], /* hope 2x doesn't break anything */
buf2[FILEPATH_LEN_MAX],
fullstr[FILEPATH_LEN_MAX], nstr[] = "null";
buf2[FILEPATH_LEN_MAX], fullstr[FILEPATH_LEN_MAX],
nstr[] = "null";
buf[0] = 0;
buf2[0] = 0;

10
src/kde.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -88,12 +88,12 @@ static Atom KDE_WIN_TITLE = 0;
/* the modules I have to communicate to */
typedef struct KModuleList
{
{
Window win;
struct KModuleList *next;
}
}
KModuleList;
static KModuleList *KModules = NULL;

6
src/lists.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/main.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

16
src/memory.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -71,10 +71,10 @@ end: \
}
static struct _symtab
{
{
void *val;
char *symbol;
}
}
*sym = NULL;
static int sym_count = 0;
@ -275,7 +275,7 @@ __Erealloc(void *ptr, int size, const char *file, int line)
ASSIGN_ALERT(_
("Error in reallocating memory that hasn't been allocated"),
_("Ignore this"), _("Restart Enlightenment"),
_("Quit Enlightenment"));
_("Quit Enlightenment"));
Alert(_
("WARNING!!!!!!\n" "\n"
"Re-allocation for %i bytes (%3.0f kB or %3.1f MB)\n"
@ -283,7 +283,7 @@ _("Quit Enlightenment"));
"memory chunk that has not been allocated or has already been\n"
"freed.\n" "\n" "This is definitely a bug. Please report it.\n"
"\n" "The error occurred at %s, line %d.\n"), size,
(float)size / 1024, (float)size / (1024 * 1024), ptr, file, line);
(float)size / 1024, (float)size / (1024 * 1024), ptr, file, line);
RESET_ALERT;
EDBUG_RETURN(NULL);
}
@ -376,7 +376,7 @@ __Efree(void *ptr, const char *file, int line)
ASSIGN_ALERT(_
("Error in freeing memory that hasn't been allocated"),
_("Ignore this"), _("Restart Enlightenment"),
_("Quit Enlightenment"));
_("Quit Enlightenment"));
Alert(_
("WARNING!!!!!!\n" "\n"
"freeing for pointer %x is attempting to free memory for a\n"

17
src/menus.c
View File

@ -275,7 +275,12 @@ ShowMenu(Menu * m, char noshow)
int x, y, wx = 0, wy = 0; /* wx, wy added to stop menus
*
* * * from appearing offscreen */
* *
* * *
* * * *
* * * * *
* * * * * *
* * * * * * * from appearing offscreen */
unsigned int w, h, mw, mh;
EDBUG(5, "ShowMenu");
@ -1152,9 +1157,10 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
ImlibImage *im2;
ImlibColor icl;
char tile = 1, keep_asp = 0;
int width, height, scalex =
0, scaley = 0;
int scr_asp, im_asp, w2, h2;
int width, height;
int scalex = 0, scaley = 0;
int scr_asp, im_asp;
int w2, h2;
int maxw = 48, maxh = 48;
int justx = 512, justy = 512;
@ -1768,8 +1774,7 @@ CreateMenuFromGnome(char *name, MenuStyle * ms, char *dir)
else if (name_buf[0] &&
!strncmp(s, name_buf, strlen(name_buf)))
iname = duplicate(&(s[strlen(name_buf)]));
else
if (!strncmp(s, "TryExec=", strlen("TryExec=")))
else if (!strncmp(s, "TryExec=", strlen("TryExec=")))
texec = duplicate(&(s[strlen("TryExec=")]));
else if (!strncmp(s, "Exec=", strlen("Exec=")))
exec = duplicate(&(s[strlen("Exec=")]));

15
src/misc.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -38,15 +38,16 @@ BlumFlimFrub(void)
char s[1024];
char *bins[3] =
#ifndef __EMX__
{ "dox", "eesh", "epp" };
{"dox", "eesh", "epp"};
#else
{ "dox.exe", "eesh.exe", "epp.exe" };
{"dox.exe", "eesh.exe", "epp.exe"};
#endif
char *docs[4] =
{ "E-docs/MAIN", "E-docs/Edoc_bg.png", "E-docs/E_logo.png" };
char *thms[1] = { "themes/DEFAULT/epplets/epplets.cfg" };
{"E-docs/MAIN", "E-docs/Edoc_bg.png", "E-docs/E_logo.png"};
char *thms[1] =
{"themes/DEFAULT/epplets/epplets.cfg"};
for (i = 0; i < 3; i++)
{

10
src/modules.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -35,12 +35,12 @@
/* This is the Modules List that we maintain */
typedef struct _ModuleMember
{
{
char *ModuleName;
void *handle;
}
}
ModuleMember;
int ListLength = 0;

10
src/mwm.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -55,13 +55,13 @@
/* Motif window hints */
typedef struct _mwmhints
{
{
CARD32 flags;
CARD32 functions;
CARD32 decorations;
INT32 inputMode;
CARD32 status;
}
}
MWMHints;
void

10
src/network.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -30,11 +30,11 @@
*/
typedef struct conn_data_tag
{
{
int read_sock;
int write_sock;
ghttp_request *req;
}
}
conn_data;
#endif

9
src/pager.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -450,7 +450,8 @@ PagerUpdateTimeout(int val, void *data)
double cur_time, in;
static int calls = 0;
int y, y2, phase, ax, ay, cx, cy, ww, hh, xx, yy;
static int offsets[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
static int offsets[8] =
{0, 4, 2, 6, 1, 5, 3, 7};
p = (Pager *) data;
Esnprintf(s, sizeof(s), "__.%x", p->win);

6
src/progress.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/regex.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/scursor.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

37
src/session.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -140,15 +140,16 @@ static char *userthemepath;
/* The saved window details */
static int num_match = 0;
typedef struct _match
{
{
char *session_id;
char *name;
char *class;
char *role;
char *command;
char used;
int x, y, w, h, desktop, iconified, shaded, sticky, layer;
}
int x, y, w, h;
int desktop, iconified, shaded, sticky, layer;
}
Match;
Match *matches = NULL;
@ -449,9 +450,9 @@ autosave(void)
{
/* char buf[1024];
*
* * * Esnprintf(buf, sizeof(buf) / sizeof(char), "rm %s*", GetSMFile());
* * *
* * * system(buf); */
* Esnprintf(buf, sizeof(buf) / sizeof(char), "rm %s*", GetSMFile());
* system(buf); */
rm(GetGenericSMFile());
}
}
@ -741,14 +742,18 @@ set_save_props(SmcConn smc_conn, int master_flag)
char priority = 10;
char style;
int n = 0;
SmPropValue programVal = { 0, NULL };
SmPropValue userIDVal = { 0, NULL };
SmPropValue discardVal[] = {
SmPropValue programVal =
{0, NULL};
SmPropValue userIDVal =
{0, NULL};
SmPropValue discardVal[] =
{
{0, NULL},
{0, NULL},
{0, NULL}
};
SmPropValue restartVal[] = {
SmPropValue restartVal[] =
{
{0, NULL},
{0, NULL},
{0, NULL},
@ -760,8 +765,10 @@ set_save_props(SmcConn smc_conn, int master_flag)
{0, NULL},
{0, NULL}
};
SmPropValue styleVal = { 0, NULL };
SmPropValue priorityVal = { 0, NULL };
SmPropValue styleVal =
{0, NULL};
SmPropValue priorityVal =
{0, NULL};
SmProp programProp;
SmProp userIDProp;
SmProp discardProp;

14
src/settings.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -4192,9 +4192,9 @@ SettingsDefaultGroupControl(void)
ShowDialog(d);
}
/* lsit of remembered items for the remember dialog -- it's either
_anotyer_ glboal var, or i wrapper struct to pass data to the
callback funcs besides the dialog itself -- this is much easier */
/* list of remembered items for the remember dialog -- it's either
* _another_ global var, or a wrapper struct to pass data to the
* callback funcs besides the dialog itself -- this is much easier */
static RememberWinList **rd_ewin_list;
void CB_ApplyRemember(int val, void *data);
@ -4275,7 +4275,7 @@ SettingsRemember()
table = DialogInitItem(d);
DialogItemTableSetOptions(table, 4, 0, 0, 0);
/* theres a much more efficient way of doing this, but this'll work
/* there's a much more efficient way of doing this, but this will work
* for now */
lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN);
if (rd_ewin_list)

18
src/setup.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -433,7 +433,8 @@ SetupX()
XModifierKeymap *mod;
KeyCode nl, sl;
int i;
int masks[8] = {
int masks[8] =
{
ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask,
Mod4Mask, Mod5Mask
};
@ -464,9 +465,9 @@ SetupX()
XFree(mod);
}
/* Now we're going to set a bunch of default settings in E - in case we
* * don't ever get to load a config file for some odd reason.
* * Also, we'll take this opportunity to initialize all of our
* * important state variables.
* don't ever get to load a config file for some odd reason.
* Also, we'll take this opportunity to initialize all of our
* important state variables.
*/
mode.next_move_x_plus = 0;
@ -751,7 +752,8 @@ SetupEnv()
return;
}
Window MakeExtInitWin(void)
Window
MakeExtInitWin(void)
{
Display *d2;
Window win;

6
src/size.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/slideout.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/snaps.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

9
src/snprintf.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -84,11 +84,12 @@ 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, ...)
Esnprintf(char *str, size_t count, const char *fmt,...)
#else
int
Esnprintf(va_alist)
va_dcl
#endif
{
#ifndef HAVE_STDARGS

6
src/sound.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

12
src/startup.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -31,7 +31,8 @@ AddEToFile(char *file)
char *s1, *s2;
char hase = 0;
char foundwm = 0;
char *wms[] = {
char *wms[] =
{
"wmaker", "afterstep", "fvwm", "fvwm2", "twm", "mwm", "vtwm", "ctwm",
"gwm",
"mlvwm", "kwm", "olwm", "wm2", "wmx", "olvwm", "9wm", "blackbox", "awm",
@ -235,7 +236,8 @@ CreateStartupDisplay(char start)
}
else
{
int k, spd, x, y, xOffset, yOffset, ty, fy, min, speed;
int k, spd, x, y, xOffset, yOffset, ty, fy;
int min, speed;
/* we have this many so that we save on lines o code - eAndroid */
struct timeval timev1, timev2;

6
src/sticky.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/stripjoints.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/strips.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/tclass.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/text.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/theme.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/timers.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

9
src/tooltips.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -140,7 +140,8 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
char pq;
int *heights = NULL;
ImageClass *ic = NULL;
int cols[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
int cols[10] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
EDBUG(5, "ShowToolTip");
if (!tt)

16
src/ttfont.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -25,16 +25,18 @@
typedef struct _efont_color_tab EfontColorTable;
struct _efont_color_tab
{
{
Colormap cmap;
XColor list[256];
unsigned char match[8][8][8];
};
};
/*static EfontColorTable *color_tab = NULL; */
static unsigned char alpha_lut[5] = { 0, 64, 128, 192, 255 };
static unsigned char bounded_palette[9] = { 0, 1, 2, 3, 4, 4, 4, 4, 4 };
static unsigned char alpha_lut[5] =
{0, 64, 128, 192, 255};
static unsigned char bounded_palette[9] =
{0, 1, 2, 3, 4, 4, 4, 4, 4};
static TT_Raster_Map *
create_font_raster(int width, int height)

6
src/update.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/update.h
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/warp.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

8
src/windowmatch.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -143,7 +143,7 @@ MatchEwinDesktop(EWin * ewin, WindowMatch * b)
void *
MatchEwinByFunction(EWin * ewin,
void *(*FunctionToTest) (EWin *, WindowMatch *))
void * (*FunctionToTest) (EWin *, WindowMatch *))
{
WindowMatch **lst;
int i, num;

6
src/x.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
src/zoom.c
View File

@ -1,18 +1,18 @@
/*
* 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
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
*
* The above copyright notice and this permission notice shall be included in
* all copies of the Software, its documentation and marketing & publicity
* materials, and acknowledgment shall be given in the documentation, materials
* and software packages that this Software was used.
* *
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL