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

Thu Mar 23 22:02:20 PST 2000 

(Mandrake)

redoing libXinerama support.  If you use xinerama, try using the "xinerama"
command.  ALSO - you have to make sure you installed libXinerama.a in the
right place as well as Xinerama.h -- still lots more hacking to do (trying to
do a cleaner implementation than my last hack)


SVN revision: 2312
This commit is contained in:
Mandrake 2000-03-24 05:51:51 +00:00
parent d0cf3bbe94
commit 9aa6f39e2c
44 changed files with 890 additions and 732 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -4365,3 +4365,13 @@ Mon Mar 20 21:58:50 GMT 2000
You can now iconify windows with skip_winlists set.
-------------------------------------------------------------------------------
Thu Mar 23 22:02:20 PST 2000
(Mandrake)
redoing libXinerama support. If you use xinerama, try using the "xinerama"
command. ALSO - you have to make sure you installed libXinerama.a in the
right place as well as Xinerama.h -- still lots more hacking to do (trying to
do a cleaner implementation than my last hack)

9
src/E.h
View File

@ -37,6 +37,10 @@
#include <Imlib.h>
#include <Fnlib.h>
#ifdef HAS_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
/* dmalloc debugging */
/*#include <dmalloc.h> */
@ -3081,6 +3085,11 @@ extern char *badtheme;
extern char *badreason;
extern char *e_machine_name;
#ifdef HAS_XINERAMA
extern char xinerama_active;
#endif
/* This turns on E's internal stack tracking system for coarse debugging */
/* and being able to trace E for profiling/optimisation purposes (which */
/* believe it or not I'm actually doing) */

1
src/Makefile.am
View File

@ -102,6 +102,7 @@ LDADD = \
$(XVM_LIBS) \
$(GHTTP_LIBS) \
$(DL_LIBS) \
$(XINERAMA_LIBS) \
-lm
INCLUDES=-I$(top_srcdir) $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(includedir) -I.. -I../intl -I$(top_srcdir)/intl

3
src/actions.c
View File

@ -3487,7 +3487,8 @@ struct _keyset
int
doInsertKeys(void *params)
{
const struct _keyset ks[] = {
const struct _keyset ks[] =
{
{"a", 0, "a"},
{"b", 0, "b"},
{"c", 0, "c"},

3
src/borders.c
View File

@ -1191,7 +1191,6 @@ CalcEwinWinpart(EWin * ewin, int i)
ewin->border->part[i].geom.bottomright.y.absolute +
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
@ -1257,7 +1256,6 @@ CalcEwinWinpart(EWin * ewin, int i)
{
h = min;
}
/*
* * and now the width.
*/
@ -1649,7 +1647,6 @@ FreeEwin(EWin * ewin)
HideMenuMasker();
}
}
if (ewin == mode.focuswin)
FocusToNone();

4
src/comms.c
View File

@ -383,7 +383,8 @@ void
HandleComms(XEvent * ev)
{
Client *c;
char *s, w[FILEPATH_LEN_MAX], w2[FILEPATH_LEN_MAX], *s1, *s2;
char *s, w[FILEPATH_LEN_MAX], w2[FILEPATH_LEN_MAX], *s1,
*s2;
char sunknown[] = "UNKNOWN";
int unknown;
@ -1098,7 +1099,6 @@ HandleComms(XEvent * ev)
char *name = NULL, *bgf = NULL, *topf = NULL;
int updated = 0, tile, keep_aspect, tkeep_aspect;
int xjust, yjust, xperc, yperc, txjust, tyjust, txperc,
typerc;
sscanf(s, "%1000s %1000s", tmp, w);

6
src/dialog.c
View File

@ -1236,7 +1236,8 @@ DialogRealizeItem(Dialog * d, DItem * di)
rows = 1;
if ((cols > 0) && (rows > 0))
{
int i, *col_size, *row_size = NULL, r = 0, c =
int i, *col_size, *row_size = NULL, r = 0,
c =
0, x = 0, y = 0;
col_size = Emalloc(sizeof(int) * cols);
@ -1884,7 +1885,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/events.c
View File

@ -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;

6
src/evhandlers.c
View File

@ -1920,7 +1920,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,
px, py;
PagerHideHi(p);
pwin_px = ewin->x;
@ -2412,7 +2413,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, px,
py;
int wx, wy, base_x = 0, base_y = 0;
Window dw;

3
src/fx.c
View File

@ -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},

5
src/globals.c
View File

@ -68,3 +68,8 @@ char *dstr = NULL;
char *badtheme = NULL;
char *badreason = NULL;
char *e_machine_name = NULL;
#ifdef HAS_XINERAMA
char xinerama_active;
#endif

3
src/gnome.c
View File

@ -720,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])

1
src/icccm.c
View File

@ -912,7 +912,6 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change)
else
ewin->client.icon_name = NULL;
}
ok = 1;
if (atom_change)
{

218
src/ipc.c
View File

@ -81,12 +81,13 @@ void IPC_MemDebug(char *params, Client * c);
void IPC_Remember(char *params, Client * c);
void IPC_CurrentTheme(char *params, Client * c);
void IPC_Nop(char *params, Client * c);
void IPC_Xinerama(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);
@ -116,34 +117,40 @@ void IPC_Group(char *params, Client * c);
* --Mandrake
*/
IPCStruct IPCArray[] = {
IPCStruct IPCArray[] =
{
{
IPC_Help,
"help",
"gives you this help screen",
"Additional parameters will retrieve help on many topics - "
"\"help <command>\".\nuse \"help all\" for a list of commands."},
"\"help <command>\".\nuse \"help all\" for a list of commands."
},
{
IPC_Version,
"version",
"displays the current version of Enlightenment running",
NULL},
NULL
},
{
IPC_Nop,
"nop",
"IPC No-operation - returns nop",
NULL},
NULL
},
{
IPC_Copyright,
"copyright",
"displays copyright information for Enlightenment",
NULL},
NULL
},
{
IPC_AutoSave,
"autosave",
"toggle the Automatic Saving Feature",
"Use \"autosave ?\" to list the current status\n"
"use \"autosave on\" or \"autosave off\" to toggle the status"},
"use \"autosave on\" or \"autosave off\" to toggle the status"
},
{
IPC_DefaultTheme,
"default_theme",
@ -151,34 +158,40 @@ IPCStruct IPCArray[] = {
"Use \"default_theme ?\" to get the current default theme\n"
"use \"default_theme /path/to/theme\"\n"
"you can retrieve a list of available themes from the "
"\"list_themes\" command"},
"\"list_themes\" command"
},
{
IPC_Restart,
"restart",
"Restart Enlightenment",
NULL},
NULL
},
{
IPC_RestartWM,
"restart_wm",
"Restart another window manager",
"Use \"restart_wm <wmname>\" to start another window manager.\n"
"Example: \"restart_wm fvwm\""},
"Example: \"restart_wm fvwm\""
},
{
IPC_RestartTheme,
"restart_theme",
"Restart with another theme",
"Use \"restart_theme <themename>\" to restart enlightenment "
"with another theme\nExample: \"restart_theme icE\""},
"with another theme\nExample: \"restart_theme icE\""
},
{
IPC_Exit,
"exit",
"Exit Enlightenment",
NULL},
NULL
},
{
IPC_ForceSave,
"save_config",
"Force Enlightenment to save settings now",
NULL},
NULL
},
{
IPC_SMFile,
"sm_file",
@ -186,12 +199,14 @@ IPCStruct IPCArray[] = {
"Average users are encouraged not to touch this setting.\n"
"Use \"sm_file ?\" to retrieve the current session management "
"file prefix\nUse \"sm_file /path/to/prefix/filenameprefix\" "
"to change."},
"to change."
},
{
IPC_ListThemes,
"list_themes",
"List currently available themes",
NULL},
NULL
},
{
IPC_GotoDesktop,
"goto_desktop",
@ -199,7 +214,9 @@ IPCStruct IPCArray[] = {
"Use \"goto_desktop num\" to go to a specific desktop.\n"
"Use \"goto_desktop next\" and \"goto_desktop prev\" to go to "
"the next and\n previous desktop\n"
"Use \"goto_desktop ?\" to find out what desktop you are " "currently on"},
"Use \"goto_desktop ?\" to find out what desktop you are "
"currently on"
},
{
IPC_GotoArea,
"goto_area",
@ -208,13 +225,15 @@ IPCStruct IPCArray[] = {
"Use \"goto_desktop next <vert/horiz>\" and \"goto_desktop "
"prev <vert/horiz>\" to go to the next and\n "
"previous areas\nUse \"goto_area ?\" to find out what area "
"you are currently on"},
"you are currently on"
},
{
IPC_ShowIcons,
"show_icons",
"Toggle the display of icons on the desktop",
"Use \"show_icons on\" and \"show_icons off\" to change this setting\n"
"Use \"show_icons ?\" to retrieve the current setting"},
"Use \"show_icons ?\" to retrieve the current setting"
},
{
IPC_FocusMode,
"focus_mode",
@ -229,7 +248,8 @@ IPCStruct IPCArray[] = {
"pointer: The focus will follow the mouse pointer\n"
"sloppy: in sloppy-focus, the focus follows the mouse, "
"but when over\n "
"the desktop background the last window does not lose the focus"},
"the desktop background the last window does not lose the focus"
},
{
IPC_AdvancedFocus,
"advanced_focus",
@ -254,20 +274,24 @@ IPCStruct IPCArray[] = {
" window that created them.\n"
"switch_to_popup_location: switch to where a popup window appears\n"
"focus_list: display and use focus list (requires XKB)\n"
"manual_placement: place all new windows by hand"},
"manual_placement: place all new windows by hand"
},
{
IPC_NumDesks,
"num_desks",
"Change the number of available desktops",
"Use \"num_desks <num>\" to change the available number of desktops.\n"
"Use \"num_desks ?\" to retrieve the current setting"},
"Use \"num_desks ?\" to retrieve the current setting"
},
{
IPC_NumAreas,
"num_areas",
"Change the size of the virtual desktop",
"Use \"num_areas <width> <height>\" to change the size of the "
"virtual desktop.\nExample: \"num_areas 2 2\" makes 2x2 "
"virtual destkops\nUse \"num_areas ?\" to retrieve the " "current setting"},
"virtual destkops\nUse \"num_areas ?\" to retrieve the "
"current setting"
},
{
IPC_WinOps,
"win_op",
@ -293,7 +317,8 @@ IPCStruct IPCArray[] = {
"win_op <windowid> lower\n "
"win_op <windowid> layer <0-100,4=normal>\n "
"<windowid> may be substituted with \"current\" to use the "
"current window"},
"current window"
},
{
IPC_WinList,
"window_list",
@ -302,7 +327,8 @@ IPCStruct IPCArray[] = {
"format - \"window_id : title\"\n"
"you can get an extended list using \"window_list extended\"\n"
"returns the following format:\n\"window_id : title :: "
"desktop : area_x area_y : x_coordinate y_coordinate\""},
"desktop : area_x area_y : x_coordinate y_coordinate\""
},
{
IPC_ButtonShow,
"button_show",
@ -311,13 +337,15 @@ IPCStruct IPCArray[] = {
"<BUTTON_STRING>\"\nexamples: \"button_show buttons all\" "
"(removes all buttons and the dragbar)\n\"button_show\" "
"(removes all buttons)\n \"button_show buttons CONFIG*\" "
"(removes all buttons with CONFIG in the start)"},
"(removes all buttons with CONFIG in the start)"
},
{
IPC_ActiveNetwork,
"active_network",
"Enable or disable networking",
"use \"active_network <on/off>\" to toggle\n"
"use \"active_network ?\" to test status"},
"use \"active_network ?\" to test status"
},
{
IPC_FX,
"fx",
@ -346,7 +374,8 @@ IPCStruct IPCArray[] = {
"a window will\n resist moving against another window\n"
"audio <on/off> (changes state of audio)\n"
"- seconds for tooltips and autoraise can have less than one second\n"
" (i.e. 0.5) or greater (1.3, 3.5, etc)"},
" (i.e. 0.5) or greater (1.3, 3.5, etc)"
},
{
IPC_DockPosition,
"dock",
@ -354,19 +383,22 @@ IPCStruct IPCArray[] = {
"use \"dock direction <up/down/left/right/?>\" to set or "
"test direction\n"
"use \"dock start_pos ?\" to test the starting x y coords\n"
"use \"dock start_pos x y\" to set the starting x y coords"},
"use \"dock start_pos x y\" to set the starting x y coords"
},
{
IPC_MoveMode,
"move_mode",
"Toggle the Window move mode",
"use \"move_mode <opaque/lined/box/shaded/semi-solid/translucent>\" "
"to set\nuse \"move_mode ?\" to get the current mode"},
"to set\nuse \"move_mode ?\" to get the current mode"
},
{
IPC_ResizeMode,
"resize_mode",
"Toggle the Window resize mode",
"use \"resize_mode <opaque/lined/box/shaded/semi-solid>\" "
"to set\nuse \"resize_mode ?\" to get the current mode"},
"to set\nuse \"resize_mode ?\" to get the current mode"
},
{
IPC_Pager,
"pager",
@ -378,7 +410,9 @@ IPCStruct IPCArray[] = {
"use \"pager snap <on/off>\" to toggle snapshotting in the pager\n"
"use \"pager zoom <on/off>\" to toggle zooming in the pager\n"
"use \"pager title <on/off>\" to toggle title display in the pager\n"
"use \"pager scanrate <#>\" to toggle number of line update " "per second"},
"use \"pager scanrate <#>\" to toggle number of line update "
"per second"
},
{
IPC_InternalList,
"internal_list",
@ -386,18 +420,21 @@ IPCStruct IPCArray[] = {
"use \"internal_list <pagers/menus/dialogs/internal_ewin>\"\n"
"to retrieve a list of various internal window types.\n"
"(note that listing internal_ewin doesn't retrieve "
"dialogs currently)\n"},
"dialogs currently)\n"
},
{
IPC_SetFocus,
"set_focus",
"Set/Retrieve focused window",
"use \"set_focus <win_id>\" to focus a new window\n"
"use \"set_focus ?\" to retrieve the currently focused window"},
"use \"set_focus ?\" to retrieve the currently focused window"
},
{
IPC_DialogOK,
"dialog_ok",
"Pop up a dialog box with an OK button",
"use \"dialog_ok <message>\" to pop up a dialog box."},
"use \"dialog_ok <message>\" to pop up a dialog box."
},
{
IPC_ListClassMembers,
"list_class",
@ -406,39 +443,46 @@ IPCStruct IPCArray[] = {
"available classes are:\n"
"sounds\n"
"actions\n"
"backgrounds\n" "borders\n" "text\n" "images\n" "cursors\n" "buttons"},
"backgrounds\n" "borders\n" "text\n" "images\n" "cursors\n" "buttons"
},
{
IPC_PlaySoundClass,
"play_sound",
"Plays a soundclass via E",
"use \"play_sound <soundclass>\" to play a sound.\n"
"use \"list_class sounds\" to get a list of available sounds"},
"use \"list_class sounds\" to get a list of available sounds"
},
{
IPC_SoundClass,
"soundclass",
"Create/Delete soundclasses",
"use \"soundclass create <classname> <filename>\" to create\n"
"use \"soundclass delete <classname>\" to delete"},
"use \"soundclass delete <classname>\" to delete"
},
{
IPC_ImageClass,
"imageclass",
"Create/delete/modify/apply an ImageClass",
"This doesn't do anything yet."},
"This doesn't do anything yet."
},
{
IPC_ActionClass,
"actionclass",
"Create/Delete/Modify an ActionClass",
"This doesn't do anything yet."},
"This doesn't do anything yet."
},
{
IPC_ColorModifierClass,
"colormod",
"Create/Delete/Modify a ColorModifierClass",
"This doesn't do anything yet."},
"This doesn't do anything yet."
},
{
IPC_TextClass,
"textclass",
"Create/Delete/Modify/apply a TextClass",
"This doesn't do anything yet."},
"This doesn't do anything yet."
},
{
IPC_Background,
"background",
@ -447,43 +491,51 @@ IPCStruct IPCArray[] = {
"use \"background <name>\" to delete a background.\n"
"use \"background <name> ?\" to show current values.\n"
"use \"background <name> <type> <value> to create / modify.\n"
"(get available types from \"background <name> ?\"."},
"(get available types from \"background <name> ?\"."
},
{
IPC_Border,
"border",
"Create/Delete/Modify a Border",
"This doesn't do anything yet."},
"This doesn't do anything yet."
},
{
IPC_Cursor,
"cursor",
"Create/Delete/Modify a Cursor",
"This doesn't do anything yet."},
"This doesn't do anything yet."
},
{
IPC_Button,
"button",
"Create/Delete/Modify a Button",
"This doesn't do anything yet."},
"This doesn't do anything yet."
},
{
IPC_GeneralInfo,
"general_info",
"Retrieve some general information",
"use \"general_info <info>\" to retrieve information\n"
"available info is: screen_size"},
"available info is: screen_size"
},
{
IPC_Modules,
"module",
"Load/Unload/List Modules",
NULL},
NULL
},
{
IPC_ReloadMenus,
"reload_menus",
"Reload menus.cfg without restarting (Asmodean_)",
NULL},
NULL
},
{
IPC_GroupInfo,
"group_info",
"Retrieve some info on groups",
"use \"group_info [group_index]\""},
"use \"group_info [group_index]\""
},
{
IPC_GroupOps,
"group_op",
@ -495,7 +547,8 @@ IPCStruct IPCArray[] = {
" group_op <windowid> add [<group_index>]\n"
" group_op <windowid> remove [<group_index>]\n"
" group_op <windowid> break [<group_index>]\n"
" group_op <windowid> showhide\n"},
" group_op <windowid> showhide\n"
},
{
IPC_Group,
"group",
@ -510,12 +563,14 @@ IPCStruct IPCArray[] = {
" group <groupid> set_border <on/off/?>\n"
" group <groupid> stick <on/off/?>\n"
" group <groupid> shade <on/off/?>\n"
" group <groupid> mirror <on/off/?>\n"},
" group <groupid> mirror <on/off/?>\n"
},
{
IPC_KDE,
"kde",
"Turns on and off KDE support",
"use \"kde on\" and \"kde off\" to enable/disable support"},
"use \"kde on\" and \"kde off\" to enable/disable support"
},
{
IPC_MemDebug,
"dump_mem_debug",
@ -523,9 +578,12 @@ IPCStruct IPCArray[] = {
"Use this command to have E dump its current memory debugging table\n"
"to the e.mem.out file. NOTE: please read comments at the top of\n"
"memory.c to see how to enable this. This will let you hunt memory\n"
"leaks, over-allocations of memory, and other memory-related problems\n"
"leaks, over-allocations of memory, and other "
"memory-related problems\n"
"very easily with all pointers allocated stamped with a time, call\n"
"tree that led to that allocation, file and line, and the chunk size.\n"},
"tree that led to that allocation, file and line, "
"and the chunk size.\n"
},
{
IPC_Remember,
"remember",
@ -534,12 +592,20 @@ IPCStruct IPCArray[] = {
" remember <windowid> <parameter>...\n"
" where parameter is one of: all, none, border, desktop, size,\n"
" location, layer, sticky, icon, shade, group, dialog, command\n"
" Multiple parameters may be given."},
" Multiple parameters may be given."
},
{
IPC_CurrentTheme,
"current_theme",
"Returns the name of the currently used theme",
NULL}
NULL
},
{
IPC_Xinerama,
"xinerama",
"return xinerama information about your current system",
NULL
}
};
/* the functions */
@ -551,6 +617,41 @@ IPCStruct IPCArray[] = {
* - Mandrake
*/
void
IPC_Xinerama(char *params, Client * c)
{
params = NULL;
#ifdef HAS_XINERAMA
if (xinerama_active)
{
XineramaScreenInfo *screens;
int num, i;
char stufftosend[4096];
screens = XineramaQueryScreens(disp, &num);
strcpy(stufftosend, "");
for (i = 0; i < num; i++)
{
char s[1024];
sprintf(s, "Head %d\nscreen # %d\nx origin: %d\ny origin: %d\n"
"width: %d\nheight: %d\n\n", i, screens[i].screen_number,
screens[i].x_org, screens[i].y_org, screens[i].width,
screens[i].height);
strcat(stufftosend, s);
}
CommsSend(c, stufftosend);
}
#else
CommsSend(c, "Xinerama is disabled on your system");
#endif
return;
}
void
IPC_Nop(char *params, Client * c)
{
@ -1045,7 +1146,6 @@ IPC_Background(char *params, Client * c)
0, 0, 0, NULL, 0, 0, 0, 0, 0);
AddItem(bg, bg->name, 0, LIST_TYPE_BACKGROUND);
}
if (!bg)
Esnprintf(buf, sizeof(buf),
"Error: could not create background '%s'.",

6
src/menus.c
View File

@ -1101,7 +1101,8 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
char tile = 1, keep_asp = 0;
int width, height, scalex =
0, scaley = 0;
int scr_asp, im_asp, w2, h2;
int scr_asp, im_asp, w2,
h2;
int maxw = 48, maxh = 48;
int justx = 512, justy = 512;
@ -1715,8 +1716,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=")]));

3
src/network.c
View File

@ -126,7 +126,8 @@ GetNetText(char *URL)
}
time_t GetNetFileDate(char *URL)
time_t
GetNetFileDate(char *URL)
{
#ifdef AUTOUPGRADE

3
src/pager.c
View File

@ -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);

3
src/scursor.c
View File

@ -37,7 +37,8 @@ static Window sc_window = 0;
static Atom sc_atom = 0;
static ImlibData *imd = NULL;
Window SC_GetDestWin(void)
Window
SC_GetDestWin(void)
{
return 0;
}

21
src/session.c
View File

@ -147,7 +147,8 @@ typedef struct _match
char *role;
char *command;
char used;
int x, y, w, h, desktop, iconified, shaded, sticky, layer;
int x, y, w, h, desktop, iconified, shaded, sticky,
layer;
}
Match;
@ -692,14 +693,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},
@ -711,8 +716,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;

8
src/setup.c
View File

@ -610,6 +610,14 @@ SetupX()
desks.hiqualitybg = 1;
SetAreaSize(2, 1);
#ifdef HAS_XINERAMA
{
xinerama_active = XineramaIsActive(disp);
}
#endif
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; task_menu[i++] = NULL);
EDBUG_RETURN_;

1
src/snprintf.c
View File

@ -89,6 +89,7 @@ Esnprintf(char *str, size_t count, const char *fmt, ...)
int
Esnprintf(va_alist)
va_dcl
#endif
{
#ifndef HAVE_STDARGS

6
src/startup.c
View File

@ -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, min,
speed;
/* we have this many so that we save on lines o code - eAndroid */
struct timeval timev1, timev2;

3
src/tooltips.c
View File

@ -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)

6
src/ttfont.c
View File

@ -33,8 +33,10 @@ struct _efont_color_tab
};
/*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)

12
src/x.c
View File

@ -587,7 +587,8 @@ DelXID(Window win)
}
}
Window ECreateEventWindow(Window parent, int x, int y, int w, int h)
Window
ECreateEventWindow(Window parent, int x, int y, int w, int h)
{
Window win;
XSetWindowAttributes attr;
@ -603,7 +604,8 @@ Window ECreateEventWindow(Window parent, int x, int y, int w, int h)
* create a window which will accept the keyboard focus when no other
* windows have it
*/
Window ECreateFocusWindow(Window parent, int x, int y, int w, int h)
Window
ECreateFocusWindow(Window parent, int x, int y, int w, int h)
{
Window win;
XSetWindowAttributes attr;
@ -737,7 +739,8 @@ WinExists(Window win)
EDBUG_RETURN(0);
}
Window WindowAtXY_0(Window base, int bx, int by, int x, int y)
Window
WindowAtXY_0(Window base, int bx, int by, int x, int y)
{
Window *list = NULL;
XWindowAttributes att;
@ -784,7 +787,8 @@ Window WindowAtXY_0(Window base, int bx, int by, int x, int y)
EDBUG_RETURN(base);
}
Window WindowAtXY(int x, int y)
Window
WindowAtXY(int x, int y)
{
Window *list = NULL;
Window child = 0, parent_win = 0, root_win = 0;