From 9aa6f39e2c55f7e612b7164121e371191fecf224 Mon Sep 17 00:00:00 2001 From: Mandrake Date: Fri, 24 Mar 2000 05:51:51 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 10 + src/E.h | 9 + src/Makefile.am | 1 + src/actions.c | 103 +++--- src/alert.c | 2 +- src/arrange.c | 8 +- src/arrange.h | 10 +- src/borders.c | 7 +- src/comms.c | 16 +- src/desktops.c | 10 +- src/dialog.c | 32 +- src/draw.c | 12 +- src/events.c | 6 +- src/evhandlers.c | 50 +-- src/focus.c | 8 +- src/fx.c | 91 ++--- src/globals.c | 5 + src/gnome.c | 15 +- src/groups.c | 8 +- src/handlers.c | 40 +-- src/icccm.c | 1 - src/iconify.c | 26 +- src/ipc.c | 866 ++++++++++++++++++++++++++-------------------- src/kde.c | 8 +- src/main.c | 2 +- src/memory.c | 32 +- src/menus.c | 20 +- src/modules.c | 8 +- src/mwm.c | 22 +- src/network.c | 13 +- src/pager.c | 21 +- src/scursor.c | 3 +- src/session.c | 43 ++- src/setup.c | 8 + src/size.c | 12 +- src/snprintf.c | 3 +- src/startup.c | 8 +- src/text.c | 6 +- src/theme.c | 8 +- src/tooltips.c | 35 +- src/ttfont.c | 16 +- src/warp.c | 4 +- src/windowmatch.c | 2 +- src/x.c | 12 +- 44 files changed, 890 insertions(+), 732 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f5e29621..f1a9b8c7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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) diff --git a/src/E.h b/src/E.h index f102ef46..22324fb3 100644 --- a/src/E.h +++ b/src/E.h @@ -37,6 +37,10 @@ #include #include +#ifdef HAS_XINERAMA +#include +#endif + /* dmalloc debugging */ /*#include */ @@ -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) */ diff --git a/src/Makefile.am b/src/Makefile.am index cb7077b6..34f3686b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/actions.c b/src/actions.c index 7b3d311a..ef15043d 100644 --- a/src/actions.c +++ b/src/actions.c @@ -664,17 +664,17 @@ runApp(char *exe, char *params) ("There was an error running the program:\n" "%s\n" "This program could not be executed.\n" - "This is because the file does not exist.\n"), -(char *)exe); + "This is because the file does not exist.\n"), + (char *)exe); /* relative path */ else DialogAlertOK(_ ("There was an error running the program:\n" "%s\n" "This program could not be executed.\n" - "This is most probably because this program " + "This is most probably because this program " "is not in the\n" - "path for your shell which is %s. I suggest " + "path for your shell which is %s. I suggest " "you read " "the manual\n" "page for that shell and read up how to " "change or add " "to your\n" @@ -689,26 +689,26 @@ runApp(char *exe, char *params) /* can execute it */ if (canexec((char *)path)) DialogAlertOK(_ - ("There was an error running the program:\n" - "%s\n" - "This program could not be executed.\n" - "I am unsure as to why you could not " - "do this. " "The file exists,\n" - "is a file, and you are allowed to " - "execute it. I " "suggest you look\n" - "into this.\n"), (char *)path); + ("There was an error running the program:\n" + "%s\n" + "This program could not be executed.\n" + "I am unsure as to why you could not " + "do this. " "The file exists,\n" + "is a file, and you are allowed to " + "execute it. I " "suggest you look\n" + "into this.\n"), (char *)path); /* not executable file */ else DialogAlertOK(_ - ("There was an error running the program:\n" - "%s\n" - "This program could not be executed.\n" - "This is because the file exists, is a" - " file, but " "you are unable\n" - "to execute it because you do not " - "have execute " - "access to this file.\n"), -(char *)path); + ("There was an error running the program:\n" + "%s\n" + "This program could not be executed.\n" + "This is because the file exists, is a" + " file, but " "you are unable\n" + "to execute it because you do not " + "have execute " + "access to this file.\n"), + (char *)path); } /* it's not a file */ else @@ -716,19 +716,19 @@ runApp(char *exe, char *params) /* its a dir */ if (isdir((char *)path)) DialogAlertOK(_ - ("There was an error running the program:\n" - "%s\n" - "This program could not be executed.\n" - "This is because the file is in fact " - "a directory.\n"), (char *)path); + ("There was an error running the program:\n" + "%s\n" + "This program could not be executed.\n" + "This is because the file is in fact " + "a directory.\n"), (char *)path); /* its not a file or a dir */ else DialogAlertOK(_ - ("There was an error running the program:\n" - "%s\n" - "This program could not be executed.\n" - "This is because the file is not a " - "regular file.\n"), (char *)path); + ("There was an error running the program:\n" + "%s\n" + "This program could not be executed.\n" + "This is because the file is not a " + "regular file.\n"), (char *)path); } if (path) Efree(path); @@ -1371,11 +1371,11 @@ doCleanup(void *params) floating[j++].h = ((EWin *) lst[i])->h; } else if ( - ( - (((EWin *) lst[i])->desktop == desks.current) || - (((EWin *) lst[i])->sticky)) && -(((EWin *) lst[i])->layer != 4) && -(((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu)) + ( + (((EWin *) lst[i])->desktop == desks.current) || + (((EWin *) lst[i])->sticky)) && + (((EWin *) lst[i])->layer != 4) && + (((EWin *) lst[i])->layer != 0) && (!((EWin *) lst[i])->menu)) { fixed = Erealloc(fixed, sizeof(RectBox) * (k + 1)); fixed[k].data = lst[i]; @@ -2473,7 +2473,7 @@ doHideShowButton(void *params) if (matchregexp(ss, lst[i]->name)) { if ((strcmp(lst[i]->name, - "_DESKTOP_DESKRAY_DRAG_CONTROL") && + "_DESKTOP_DESKRAY_DRAG_CONTROL") && (!lst[i]->used))) { if (!(lst[i]->visible)) @@ -2503,7 +2503,7 @@ doHideShowButton(void *params) if (!matchregexp(ss, lst[i]->name)) { if ((strcmp(lst[i]->name, - "_DESKTOP_DESKRAY_DRAG_CONTROL") && + "_DESKTOP_DESKRAY_DRAG_CONTROL") && (!lst[i]->used))) { if (!(lst[i]->visible)) @@ -3468,7 +3468,7 @@ doConfigure(void *params) { ChooseGroupDialog(ewin, _ - (" Pick the group the window will belong to: \n"), + (" Pick the group the window will belong to: \n"), GROUP_SELECT_ALL_EXCEPT_EWIN, ACTION_ADD_TO_GROUP); } @@ -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"}, @@ -3712,8 +3713,8 @@ doRaiseLower(void *params) { if (desks.desk[ewin->desktop].list[i]->layer == ewin->layer && (desks.desk[ewin->desktop].list[i] == ewin || - !FindEwinInList(desks.desk[ewin->desktop].list[i], gwins, - num))) + !FindEwinInList(desks.desk[ewin->desktop].list[i], gwins, + num))) { if (desks.desk[ewin->desktop].list[i] != ewin) raise = 1; @@ -3819,10 +3820,10 @@ doAddToGroup(void *params) ChooseGroupDialog(ewin, _ ("\n There's no current group at the moment. \n" - " The current group is the last one you created, \n" - " and it exists until you create a new one or break \n" + " The current group is the last one you created, \n" + " and it exists until you create a new one or break \n" " the latest one. \n\n" - " Pick another group that the window will belong to here: \n\n"), + " Pick another group that the window will belong to here: \n\n"), GROUP_SELECT_ALL_EXCEPT_EWIN, ACTION_ADD_TO_GROUP); EDBUG_RETURN(0); } @@ -3905,20 +3906,20 @@ doZoom(void *params) { fprintf(f, _ - ("You have been warned about the dangers of Zoom mode\n")); + ("You have been warned about the dangers of Zoom mode\n")); fclose(f); } DIALOG_OK(_("Warning !!!"), _ ("This feature is heavily reliant on a feature of your\n" - "X Server called the Vid Mode Extension. This feature exists\n" - "in XFree86 Servers, but is not a heavily used part of the\n" + "X Server called the Vid Mode Extension. This feature exists\n" + "in XFree86 Servers, but is not a heavily used part of the\n" "Server and thus isn't tested much.\n" "\n" - "It is possible your X Server does not deal well with being\n" + "It is possible your X Server does not deal well with being\n" "asked to switch modes quickly and it may hang, glitch,\n" "display artefacts or perhaps simply refuse to work.\n" "\n" - "This is a warning and will only be displayed this one time.\n" - "If your Server does not behave well then you will probably\n" + "This is a warning and will only be displayed this one time.\n" + "If your Server does not behave well then you will probably\n" "have to avoid using this feature.\n")); EDBUG_RETURN(0); } diff --git a/src/alert.c b/src/alert.c index 48fe9b7d..97016d88 100644 --- a/src/alert.c +++ b/src/alert.c @@ -42,7 +42,7 @@ int debug_level; char *call_stack[1024]; void -Alert(char *fmt, ...) +Alert(char *fmt,...) { char text[10240]; va_list ap; diff --git a/src/arrange.c b/src/arrange.c index a73f2131..e7669216 100644 --- a/src/arrange.c +++ b/src/arrange.c @@ -628,7 +628,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) if (((ewin->desktop == lst[i]->desktop) || (lst[i]->sticky)) && (!(lst[i]->floating)) && - (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) + (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) { if (IN_BELOW (ewin->x + dx, lst[i]->x + lst[i]->w - 1, @@ -661,7 +661,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) if (((ewin->desktop == lst[i]->desktop) || (lst[i]->sticky)) && (!(lst[i]->floating)) && - (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) + (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) { if (IN_ABOVE(ewin->x + ewin->w + dx - 1, lst[i]->x, mode.edge_snap_dist) && @@ -692,7 +692,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) if (((ewin->desktop == lst[i]->desktop) || (lst[i]->sticky)) && (!(lst[i]->floating)) && - (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) + (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) { if (IN_BELOW (ewin->y + dy, lst[i]->y + lst[i]->h - 1, @@ -725,7 +725,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy) if (((ewin->desktop == lst[i]->desktop) || (lst[i]->sticky)) && (!(lst[i]->floating)) && - (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) + (!(lst[i]->iconified)) && (!(lst[i]->ignorearrange))) { if (IN_ABOVE(ewin->y + ewin->h + dy - 1, lst[i]->y, mode.edge_snap_dist) && diff --git a/src/arrange.h b/src/arrange.h index f2eb5d08..b68e680b 100644 --- a/src/arrange.h +++ b/src/arrange.h @@ -29,11 +29,11 @@ #define ARRANGE_BY_POSITION 2 typedef struct _rectbox -{ - void *data; - int x, y, w, h; - int p; -} + { + void *data; + int x, y, w, h; + int p; + } RectBox; void ArrangeRects(RectBox * fixed, int fixed_count, diff --git a/src/borders.c b/src/borders.c index a74fbe9a..473928b2 100644 --- a/src/borders.c +++ b/src/borders.c @@ -269,7 +269,7 @@ SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx, int *ty, int num_wins, int speed) { int k, spd, *x = NULL, *y = - NULL, min, tmpx, tmpy, tmpw, tmph, i; + NULL, min, tmpx, tmpy, tmpw, tmph, i; struct timeval timev1, timev2; int dsec, dusec; double tm; @@ -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(); @@ -2588,7 +2585,7 @@ MinShadeSize(EWin * ewin, int *mw, int *mh) leftborderwidth = ewin->border->border.left - ewin->bits[i].x; if ((ewin->bits[i].x + ewin->bits[i].w) - - (ewin->w - ewin->border->border.right) > rightborderwidth) + (ewin->w - ewin->border->border.right) > rightborderwidth) rightborderwidth = (ewin->bits[i].x + ewin->bits[i].w) - (ewin->w - ewin-> diff --git a/src/comms.c b/src/comms.c index 22583dea..3b10857a 100644 --- a/src/comms.c +++ b/src/comms.c @@ -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,8 +1099,7 @@ HandleComms(XEvent * ev) char *name = NULL, *bgf = NULL, *topf = NULL; int updated = 0, tile, keep_aspect, tkeep_aspect; int xjust, yjust, xperc, yperc, txjust, tyjust, txperc, - - typerc; + typerc; sscanf(s, "%1000s %1000s", tmp, w); bg = @@ -1523,9 +1523,9 @@ HandleComms(XEvent * ev) Button *b; while ( - (b = - RemoveItem("_DESKTOP_DRAG_CONTROL", 0, LIST_FINDBY_NAME, - LIST_TYPE_BUTTON))) + (b = + RemoveItem("_DESKTOP_DRAG_CONTROL", 0, LIST_FINDBY_NAME, + LIST_TYPE_BUTTON))) DestroyButton(b); InitDesktopControls(); ShowDesktopControls(); @@ -1835,7 +1835,7 @@ HandleComms(XEvent * ev) "MWM_MINIMIZE: %5i\n" "MWM_MAXIMIZE: %5i\n" "APP_STATE: %5i\n", ewin->client.win, - ewin->win, ewin->x, ewin->y, ewin->w, ewin->h, none, + ewin->win, ewin->x, ewin->y, ewin->w, ewin->h, none, 0, 0, 0, 0, ewin->desktop, ewin->num_groups, ewin->docked, ewin->sticky, ewin->visible, ewin->iconified, ewin->shaded, ewin->active, @@ -1929,7 +1929,7 @@ HandleComms(XEvent * ev) { char buf[FILEPATH_LEN_MAX], *ret = NULL, none[] = - "-NONE-"; + "-NONE-"; EWin **lst; int i, num; diff --git a/src/desktops.c b/src/desktops.c index ba57ad7c..f9fdd4cf 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -28,10 +28,10 @@ GetUniqueBGString(Background * bg) char s[256]; const char *chmap = #ifndef __EMX__ - "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"; + "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"; #else - "0123456789abcdefghijklmnopqrstuvwxyz-_"; + "0123456789abcdefghijklmnopqrstuvwxyz-_"; /* cyrillic symbols from 866 page correctly handled instead of eng. capitals */ #endif @@ -1310,17 +1310,17 @@ InitDesktopControls() else if (desks.dragdir == 2) { b = CreateButton("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac, - NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, + NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, 99999, 0, 0, desks.desk[i].x, 0, desks.desk[i].y, 0, 0, 0, 0, 0, 1, 0, 1); } else { b = CreateButton("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac, - NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, + NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1, 99999, 0, 0, desks.desk[i].x, 0, desks.desk[i].y + root.h - - desks.dragbar_width, 0, 0, 0, 0, 0, 1, 0, 1); + desks.dragbar_width, 0, 0, 0, 0, 0, 1, 0, 1); } AddItem(b, b->name, 2, LIST_TYPE_BUTTON); desks.desk[i].tag = b; diff --git a/src/dialog.c b/src/dialog.c index bec83819..6a3145f2 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -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; @@ -1089,7 +1089,7 @@ DialogRealizeItem(Dialog * d, DItem * di) di->item.slider.border_orig_h = im->rgb_height; Imlib_destroy_image(id, im); di->item.slider.border_win = ECreateWindow(d->win, -20, - -20, 2, 2, 0); + -20, 2, 2, 0); EMapWindow(disp, di->item.slider.border_win); } } @@ -1236,8 +1236,9 @@ DialogRealizeItem(Dialog * d, DItem * di) rows = 1; if ((cols > 0) && (rows > 0)) { - int i, *col_size, *row_size = NULL, r = 0, c = - 0, x = 0, y = 0; + int i, *col_size, *row_size = NULL, r = 0, + c = + 0, x = 0, y = 0; col_size = Emalloc(sizeof(int) * cols); row_size = Erealloc(row_size, sizeof(int)); @@ -1353,7 +1354,7 @@ DialogRealizeItem(Dialog * d, DItem * di) dii->w, dii->h); if (dii->type == DITEM_CHECKBUTTON) EMoveResizeWindow(disp, - dii->item.check_button.check_win, + dii->item.check_button.check_win, dii->x, dii->y + ((dii->h - dii->item. @@ -1365,7 +1366,7 @@ DialogRealizeItem(Dialog * d, DItem * di) check_button.check_orig_h); if (dii->type == DITEM_RADIOBUTTON) EMoveResizeWindow(disp, - dii->item.radio_button.radio_win, + dii->item.radio_button.radio_win, dii->x, dii->y + ((dii->h - dii->item. @@ -1414,7 +1415,7 @@ DialogRealizeItem(Dialog * d, DItem * di) dii->item.slider.base_h); if (dii->item.slider.border_win) EMoveResizeWindow(disp, - dii->item.slider.border_win, + dii->item.slider.border_win, dii->x + dii->item.slider.border_x, dii->y + @@ -1428,7 +1429,7 @@ DialogRealizeItem(Dialog * d, DItem * di) dii->y + dii->item.slider.numeric_y, dii->item.slider.numeric_w, - dii->item.slider.numeric_h); + dii->item.slider.numeric_h); } } x += sw; @@ -1640,11 +1641,11 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h) if (di->item.check_button.onoff) IclassApply(di->iclass, di->item.check_button.check_win, di->item.check_button.check_orig_w, - di->item.check_button.check_orig_h, 1, 0, state, 0); + di->item.check_button.check_orig_h, 1, 0, state, 0); else IclassApply(di->iclass, di->item.check_button.check_win, di->item.check_button.check_orig_w, - di->item.check_button.check_orig_h, 0, 0, state, 0); + di->item.check_button.check_orig_h, 0, 0, state, 0); XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False); TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, di->item.check_button.text, @@ -1681,11 +1682,11 @@ DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w, int h) if (di->item.radio_button.onoff) IclassApply(di->iclass, di->item.radio_button.radio_win, di->item.radio_button.radio_orig_w, - di->item.radio_button.radio_orig_h, 1, 0, state, 0); + di->item.radio_button.radio_orig_h, 1, 0, state, 0); else IclassApply(di->iclass, di->item.radio_button.radio_win, di->item.radio_button.radio_orig_w, - di->item.radio_button.radio_orig_w, 0, 0, state, 0); + di->item.radio_button.radio_orig_w, 0, 0, state, 0); XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False); TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, di->item.radio_button.text, @@ -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; } diff --git a/src/draw.c b/src/draw.c index 2e00219e..2ede4c51 100644 --- a/src/draw.c +++ b/src/draw.c @@ -98,7 +98,7 @@ HandleDrawQueue() for (i = 0; i < num; i++) { if ((lst[i]->d == dq->d) && (dq->d->item) && - /*(dq->d->item == dq->di) && */ (lst[i]->di == dq->di)) + /*(dq->d->item == dq->di) && */ (lst[i]->di == dq->di)) { if (dq->x < lst[i]->x) { @@ -200,7 +200,7 @@ HandleDrawQueue() else if (lst[i]->iclass) { IclassApply(lst[i]->iclass, lst[i]->win, lst[i]->w, lst[i]->h, - lst[i]->active, lst[i]->sticky, lst[i]->state, 0); + lst[i]->active, lst[i]->sticky, lst[i]->state, 0); /* printf("I %x\n", lst[i]->win); */ } else if (lst[i]->pager) @@ -582,7 +582,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, 13))) + (p1 & p2 & ((0x1 << 11) | (0x1 << 5) | (0x1) | - (0x1 << 27) | (0x1 << 21) | (0x1 << 16))); + (0x1 << 27) | (0x1 << 21) | (0x1 << 16))); } } else @@ -604,7 +604,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, 13))) + (p1 & p2 & ((0x1 << 11) | (0x1 << 5) | (0x1) | - (0x1 << 27) | (0x1 << 21) | (0x1 << 16))); + (0x1 << 27) | (0x1 << 21) | (0x1 << 16))); } { unsigned short *pptr1, *pptr2, *pptr3; @@ -663,7 +663,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, 13))) + (p1 & p2 & ((0x1 << 10) | (0x1 << 5) | (0x1) | - (0x1 << 26) | (0x1 << 20) | (0x1 << 16))); + (0x1 << 26) | (0x1 << 20) | (0x1 << 16))); } } else @@ -685,7 +685,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, 13))) + (p1 & p2 & ((0x1 << 10) | (0x1 << 5) | (0x1) | - (0x1 << 26) | (0x1 << 20) | (0x1 << 16))); + (0x1 << 26) | (0x1 << 20) | (0x1 << 16))); } { unsigned short *pptr1, *pptr2, *pptr3; diff --git a/src/events.c b/src/events.c index 7290e616..b7a04629 100644 --- a/src/events.c +++ b/src/events.c @@ -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; diff --git a/src/evhandlers.c b/src/evhandlers.c index 18e9fc03..d23e9cde 100644 --- a/src/evhandlers.c +++ b/src/evhandlers.c @@ -43,11 +43,11 @@ static ToolTip *ttip = NULL; struct _mdata -{ - Menu *m; - MenuItem *mi; - EWin *ewin; -}; + { + Menu *m; + MenuItem *mi; + EWin *ewin; + }; static void ToolTipTimeout(int val, void *data); static void SubmenuShowTimeout(int val, void *dat); @@ -480,7 +480,7 @@ HandleMotion(XEvent * ev) if ((ndx != dx) && (((gwins[i]->x == 0) && (!(IN_RANGE - (gwins[i]->reqx, gwins[i]->x, screen_snap_dist)))) + (gwins[i]->reqx, gwins[i]->x, screen_snap_dist)))) || ((gwins[i]->x == (root.w - gwins[i]->w)) && (!(IN_RANGE @@ -494,7 +494,7 @@ HandleMotion(XEvent * ev) (gwins [i]->reqx, gwins[i]->x, - mode.edge_snap_dist))))))) + mode.edge_snap_dist))))))) { jumpx = 1; ndx = gwins[i]->reqx - gwins[i]->x + dx; @@ -503,7 +503,7 @@ HandleMotion(XEvent * ev) if ((ndy != dy) && (((gwins[i]->y == 0) && (!(IN_RANGE - (gwins[i]->reqy, gwins[i]->y, screen_snap_dist)))) + (gwins[i]->reqy, gwins[i]->y, screen_snap_dist)))) || ((gwins[i]->y == (root.h - gwins[i]->h)) && (!(IN_RANGE @@ -517,7 +517,7 @@ HandleMotion(XEvent * ev) (gwins [i]->reqy, gwins[i]->y, - mode.edge_snap_dist))))))) + mode.edge_snap_dist))))))) { jumpy = 1; ndy = gwins[i]->reqy - gwins[i]->y + dy; @@ -1641,9 +1641,9 @@ HandleMouseDown(XEvent * ev) DoIn("TOOLTIP_TIMEOUT", mode.tiptime, ToolTipTimeout, 0, NULL); if ( - (((float)(ev->xbutton.time - last_time) / 1000) < - mode_double_click_time) - && ((int)(ev->xbutton.button) == (int)(last_button))) + (((float)(ev->xbutton.time - last_time) / 1000) < + mode_double_click_time) + && ((int)(ev->xbutton.button) == (int)(last_button))) double_click = 1; last_time = ev->xbutton.time; last_button = ev->xbutton.button; @@ -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; @@ -2393,15 +2394,15 @@ HandleMouseUp(XEvent * ev) ((ew->desktop == desks.current) || (ew->sticky))) { if ( - (ev->xbutton.x_root >= - (ew->x + ew->border->border.left)) - && (ev->xbutton.x_root < - (ew->x + ew->w - ew->border->border.right)) - && (ev->xbutton.y_root >= - (ew->y + ew->border->border.top)) - && (ev->xbutton.y_root < - (ew->y + ew->h - - ew->border->border.bottom))) + (ev->xbutton.x_root >= + (ew->x + ew->border->border.left)) + && (ev->xbutton.x_root < + (ew->x + ew->w - ew->border->border.right)) + && (ev->xbutton.y_root >= + (ew->y + ew->border->border.top)) + && (ev->xbutton.y_root < + (ew->y + ew->h - + ew->border->border.bottom))) { ewin = ew; i = desks.desk[desks.current].num; @@ -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; @@ -2525,7 +2527,7 @@ HandleMouseUp(XEvent * ev) else { int ndesk, nx, ny, base_x = 0, base_y = - 0, ax, ay; + 0, ax, ay; ndesk = desks.current; nx = (int)ev->xbutton.x_root - diff --git a/src/focus.c b/src/focus.c index 5ab6152e..48a9af44 100644 --- a/src/focus.c +++ b/src/focus.c @@ -74,7 +74,7 @@ GetNextFocusEwin(void) ewin = lst0[i]; if (((ewin->sticky) || (ewin->desktop == desks.current)) && ((ewin->area_x == ax) && (ewin->area_y == ay)) && - (!ewin->skipfocus) && (!ewin->neverfocus) && (!ewin->iconified) + (!ewin->skipfocus) && (!ewin->neverfocus) && (!ewin->iconified) && (!ewin->menu) && (!ewin->pager) && (!ewin->ibox) && (!ewin->iconified) /*&& (ewin->client.mwm_decor_title) && * (ewin->client.mwm_decor_border) */ ) @@ -145,9 +145,9 @@ 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++; diff --git a/src/fx.c b/src/fx.c index 315ba7df..9620d42d 100644 --- a/src/fx.c +++ b/src/fx.c @@ -27,15 +27,15 @@ #endif typedef struct _fxhandler -{ - char *name; - void (*init_func) (char *name); - void (*desk_func) (void); - void (*quit_func) (void); - void (*pause_func) (void); - char in_use; - char paused; -} + { + char *name; + void (*init_func) (char *name); + void (*desk_func) (void); + void (*quit_func) (void); + void (*pause_func) (void); + char in_use; + char paused; + } FXHandler; void FX_Ripple_Init(char *name); @@ -56,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}, @@ -255,12 +256,12 @@ FX_ripple_timeout(int val, void *data) _("\n" "You have just started the Ripples Effect.\n" "\n" - "If you look closely on your desktop background, and if it\n" - "doesn't have a solid colour (i.e. has a background texture or\n" - "image), you will see a pool of water at the bottom of your\n" - "screen that reflects everything above it and \"ripples\".\n" + "If you look closely on your desktop background, and if it\n" + "doesn't have a solid colour (i.e. has a background texture or\n" + "image), you will see a pool of water at the bottom of your\n" + "screen that reflects everything above it and \"ripples\".\n" "\n" - "To disable this effect just select this option again to toggle\n" + "To disable this effect just select this option again to toggle\n" "it off.\n")); before = 1; } @@ -358,11 +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; -} + { + int x, y; + int count; + PixImg *buf; + } DropContext; static DropContext fx_raindrops[4]; @@ -386,17 +387,17 @@ FX_raindrops_timeout(int val, void *data) { DIALOG_OK(_("Unable to display raindrops"), _("\n" - "Enlightenment is unable to display raindrops on this\n" - "display because Shared memory is not available on this\n" + "Enlightenment is unable to display raindrops on this\n" + "display because Shared memory is not available on this\n" "X-Server.\n" "\n" - "This may be due to Enlightenment being a remote client\n" - "running over the network, a MIT-SHM incapable X-server,\n" + "This may be due to Enlightenment being a remote client\n" + "running over the network, a MIT-SHM incapable X-server,\n" "having run out of SHM ID's on the system or Shared\n" "Memory support being turned off in Imlib\n" "\n" - "You may correct this by either running `imlib_config'\n" - "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" + "You may correct this by either running `imlib_config'\n" + "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" "and editing it, enabling shared memory.\n" "\n")); return; } @@ -404,16 +405,16 @@ FX_raindrops_timeout(int val, void *data) { DIALOG_OK(_("Unable to display raindrops"), _("\n" - "Enlightenment is unable to display raindrops on this\n" - "display because shared pixmaps are not available on this\n" + "Enlightenment is unable to display raindrops on this\n" + "display because shared pixmaps are not available on this\n" "X-Server.\n" "\n" - "This may be due to either the X-Server not implementing\n" - "shared pixmaps, or shared pixmaps being disabled in\n" + "This may be due to either the X-Server not implementing\n" + "shared pixmaps, or shared pixmaps being disabled in\n" "Imlib's configuration.\n" "\n" - "You may correct this by either running `imlib_config'\n" - "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" + "You may correct this by either running `imlib_config'\n" + "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n" "and editing it, enabling shared pixmaps.\n" "\n")); return; } @@ -422,12 +423,12 @@ FX_raindrops_timeout(int val, void *data) _("\n" "You have just started the Raindrops Effect.\n" "\n" - "If you look closely on your desktop background, and if it\n" - "doesn't have a solid colour (i.e. has a background texture or\n" - "image), you will see \"raindrops\" hit the background and\n" - "make little splashes. This Effect can be VERY CPU intensive.\n" + "If you look closely on your desktop background, and if it\n" + "doesn't have a solid colour (i.e. has a background texture or\n" + "image), you will see \"raindrops\" hit the background and\n" + "make little splashes. This Effect can be VERY CPU intensive.\n" "\n" - "To disable this effect just select this option again to toggle\n" + "To disable this effect just select this option again to toggle\n" "it off.\n")); before = 1; if (first) @@ -513,7 +514,7 @@ FX_raindrops_timeout(int val, void *data) fx_raindrops[j].y + fx_raindrop_size)) || ((fx_raindrops - [i].x + fx_raindrop_size >= fx_raindrops[j].x) + [i].x + fx_raindrop_size >= fx_raindrops[j].x) && (fx_raindrops[i].x + fx_raindrop_size < fx_raindrops[j].x + fx_raindrop_size) && (fx_raindrops[i].y >= fx_raindrops[j].y) @@ -528,7 +529,7 @@ FX_raindrops_timeout(int val, void *data) fx_raindrops[j].y + fx_raindrop_size)) || ((fx_raindrops - [i].x + fx_raindrop_size >= fx_raindrops[j].x) + [i].x + fx_raindrop_size >= fx_raindrops[j].x) && (fx_raindrops[i].x + fx_raindrop_size < fx_raindrops[j].x + fx_raindrop_size) && (fx_raindrops[i].y + fx_raindrop_size >= @@ -717,12 +718,12 @@ FX_Wave_timeout(int val, void *data) _("\n" "You have just started the Waves Effect.\n" "\n" - "If you look closely on your desktop background, and if it\n" - "doesn't have a solid colour (i.e. has a background texture or\n" - "image), you will see a pool of water at the bottom of your\n" - "screen that reflects everything above it and \"waves\".\n" + "If you look closely on your desktop background, and if it\n" + "doesn't have a solid colour (i.e. has a background texture or\n" + "image), you will see a pool of water at the bottom of your\n" + "screen that reflects everything above it and \"waves\".\n" "\n" - "To disable this effect just select this option again to toggle\n" + "To disable this effect just select this option again to toggle\n" "it off.\n")); before = 1; } @@ -883,7 +884,7 @@ FX_imagespinner_timeout(int val, void *data) _("\n" "You have just started the imagespinners Effect.\n" "\n" - "To disable this effect just select this option again to toggle\n" + "To disable this effect just select this option again to toggle\n" "it off.\n")); before = 1; } diff --git a/src/globals.c b/src/globals.c index 4a13dcde..453b6461 100644 --- a/src/globals.c +++ b/src/globals.c @@ -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 diff --git a/src/gnome.c b/src/gnome.c index ca526249..85effc24 100644 --- a/src/gnome.c +++ b/src/gnome.c @@ -128,12 +128,12 @@ /* Preferences for behavior for app */ /* ONLY the client sets this */ -#define WIN_HINTS_SKIP_FOCUS (1<<0) /* "alt-tab" skips this win */ -#define WIN_HINTS_SKIP_WINLIST (1<<1) /* not in win list */ -#define WIN_HINTS_SKIP_TASKBAR (1<<2) /* not on taskbar */ -#define WIN_HINTS_GROUP_TRANSIENT (1<<3) /* ??????? */ -#define WIN_HINTS_FOCUS_ON_CLICK (1<<4) /* app only accepts focus when clicked */ -#define WIN_HINTS_DO_NOT_COVER (1<<5) /* attempt to not cover this window */ +#define WIN_HINTS_SKIP_FOCUS (1<<0) /* "alt-tab" skips this win */ +#define WIN_HINTS_SKIP_WINLIST (1<<1) /* not in win list */ +#define WIN_HINTS_SKIP_TASKBAR (1<<2) /* not on taskbar */ +#define WIN_HINTS_GROUP_TRANSIENT (1<<3) /* ??????? */ +#define WIN_HINTS_FOCUS_ON_CLICK (1<<4) /* app only accepts focus when clicked */ +#define WIN_HINTS_DO_NOT_COVER (1<<5) /* attempt to not cover this window */ #define XA_WIN_HINTS "_WIN_HINTS" /* WIN_HINTS = CARD32 */ @@ -720,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]) diff --git a/src/groups.c b/src/groups.c index ccdb0e14..6fc581b6 100644 --- a/src/groups.c +++ b/src/groups.c @@ -253,7 +253,7 @@ RemoveEwinFromGroup(EWin * ewin, Group * g) root.h) y = root.h - ewin->border->border.top - 1; else if ((ewin->y + ewin->h - - ewin->border->border.bottom - 1) < 0) + ewin->border->border.bottom - 1) < 0) y = 0 - ewin->h + ewin->border->border.bottom + 1; @@ -602,9 +602,9 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action) { DIALOG_OK(_("Window Group Error"), _ - ("\n This window currently does not belong to any groups. \n" - " You can only destroy groups or remove windows from groups \n" - " through a window that actually belongs to at least one group.\n\n")); + ("\n This window currently does not belong to any groups. \n" + " You can only destroy groups or remove windows from groups \n" + " through a window that actually belongs to at least one group.\n\n")); return; } if ((num_groups == 0) && (group_select == GROUP_SELECT_ALL_EXCEPT_EWIN)) diff --git a/src/handlers.c b/src/handlers.c index 9690eb63..a7e1d91b 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -59,10 +59,10 @@ HandleSigIll(int num) DialogAlert(_("Enlightenment performed an Illegal Instruction.\n" "\n" "This most likely is due to you having installed an run a\n" - "binary of Enlightenment that was compiled for a make or model\n" - "of CPU not 100%% identical or compatible with yours. Please\n" + "binary of Enlightenment that was compiled for a make or model\n" + "of CPU not 100%% identical or compatible with yours. Please\n" "either obtain the correct package for your system, or\n" - "re-compile Enlightenment and possibly any support libraries\n" + "re-compile Enlightenment and possibly any support libraries\n" "that you got in binary format to run Enlightenment.\n")); doExit("error"); EDBUG_RETURN_; @@ -86,13 +86,13 @@ HandleSigFpe(int num) UngrabX(); DialogAlert(_("Enlightenment caused a Floating Point Exception.\n" "\n" - "This means that Enlightenment or support library routines it calls\n" - "have performed an illegal mathematical operation (most likely\n" - "dividing a number by zero). This is most likely a bug. It is\n" - "recommended to restart now. If you wish to help fix this please\n" + "This means that Enlightenment or support library routines it calls\n" + "have performed an illegal mathematical operation (most likely\n" + "dividing a number by zero). This is most likely a bug. It is\n" + "recommended to restart now. If you wish to help fix this please\n" "compile Enlightenment with debugging symbols in and run\n" - "Enlightenment under gdb so you can backtrace for where it died and\n" - "send in a useful bug report with backtrace information and variable\n" + "Enlightenment under gdb so you can backtrace for where it died and\n" + "send in a useful bug report with backtrace information and variable\n" "dumps etc.\n")); doExit("error"); EDBUG_RETURN_; @@ -111,12 +111,12 @@ HandleSigSegv(int num) UngrabX(); DialogAlert(_("Enlightenment caused Segment Violation (Segfault)\n" "\n" - "This means that Enlightenment or support library routines it calls\n" - "have accessed areas of your system's memory that they are not\n" - "allowed access to. This is most likely a bug. It is recommended to\n" + "This means that Enlightenment or support library routines it calls\n" + "have accessed areas of your system's memory that they are not\n" + "allowed access to. This is most likely a bug. It is recommended to\n" "restart now. If you wish to help fix this please compile\n" - "Enlightenment with debugging symbols in and run Enlightenment\n" - "under gdb so you can backtrace for where it died and send in a\n" + "Enlightenment with debugging symbols in and run Enlightenment\n" + "under gdb so you can backtrace for where it died and send in a\n" "useful bug report with backtrace information and variable\n" "dumps etc.\n")); abort(); @@ -197,7 +197,7 @@ HandleSigBus(int num) UngrabX(); DialogAlert(_("Enlightenment caused Bus Error.\n" "\n" - "It is suggested you check your hardware and OS installation.\n" + "It is suggested you check your hardware and OS installation.\n" "It is highly unusual to cause Bus Errors on operational\n" "hardware.\n")); EDBUG_RETURN_; @@ -218,11 +218,11 @@ EHandleXError(Display * d, XErrorEvent * ev) _("OK (edit file)"), "", _("Cancel (do NOT edit)")); Alert(_("Another Window Manager is already running.\n" "\n" - "You will have to quit your current Window Manager first before\n" + "You will have to quit your current Window Manager first before\n" "you can successfully run Enlightenment.\n" "\n" - "If you haven't edited your user start-up files, Enlightenment\n" - "can do that now for you, so when you log in again after\n" + "If you haven't edited your user start-up files, Enlightenment\n" + "can do that now for you, so when you log in again after\n" "quitting your current window manager, you will have\n" "Enlightenment running.\n" "\n" @@ -231,13 +231,13 @@ EHandleXError(Display * d, XErrorEvent * ev) "\n" "WARNING WARNING WARNING WARNING!\n" "\n" - "It is possible that this MAY not properly edit your files.\n")); + "It is possible that this MAY not properly edit your files.\n")); ASSIGN_ALERT(_("Are you sure?"), _("YES (edit file)"), "", _("NO (do not edit)")); Alert(_ ("Are you absolutely sure you want to have Enlightenment\n" "edit your start-up files for you?\n" "\n" - "If your start-up files are highly customised this may not\n" + "If your start-up files are highly customised this may not\n" "work.\n" "\n" "Are you ABSOLUTELY sure?\n")); RESET_ALERT; AddE(); diff --git a/src/icccm.c b/src/icccm.c index 2b178a3c..fd3f3fda 100644 --- a/src/icccm.c +++ b/src/icccm.c @@ -912,7 +912,6 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change) else ewin->client.icon_name = NULL; } - ok = 1; if (atom_change) { diff --git a/src/iconify.c b/src/iconify.c index b691beba..6bde9916 100644 --- a/src/iconify.c +++ b/src/iconify.c @@ -32,7 +32,7 @@ IB_Animate(char iconify, EWin * from, EWin * to) { double t1, t2, t, i, spd, ii; int x, y, x1, y1, x2, y2, x3, y3, x4, y4, w, h, fx, fy, - fw, fh, dx, dy, dw, dh; + fw, fh, dx, dy, dw, dh; GC gc; XGCValues gcv; @@ -2113,9 +2113,9 @@ RedrawIconbox(Iconbox * ib) EMoveResizeWindow(disp, ib->icon_win, 0, 0, ib->w - ib->scroll_thickness, ib->h); if ( - (ic = - FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, - LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) + (ic = + FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, + LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) { EMoveResizeWindow(disp, ib->cover_win, 0, 0, ib->w - ib->scroll_thickness, ib->h); @@ -2135,9 +2135,9 @@ RedrawIconbox(Iconbox * ib) ib->scroll_thickness, 0, ib->w - ib->scroll_thickness, ib->h); if ( - (ic = - FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, - LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) + (ic = + FindItem("ICONBOX_COVER_VERTICAL", 0, LIST_FINDBY_NAME, + LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) { EMoveResizeWindow(disp, ib->cover_win, ib->scroll_thickness, 0, @@ -2245,9 +2245,9 @@ RedrawIconbox(Iconbox * ib) EMoveResizeWindow(disp, ib->icon_win, 0, 0, ib->w, ib->h - ib->scroll_thickness); if ( - (ic = - FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, - LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) + (ic = + FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, + LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) { EMoveResizeWindow(disp, ib->cover_win, 0, 0, ib->w, ib->h - ib->scroll_thickness); @@ -2267,9 +2267,9 @@ RedrawIconbox(Iconbox * ib) 0, ib->scroll_thickness, ib->w, ib->h - ib->scroll_thickness); if ( - (ic = - FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, - LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) + (ic = + FindItem("ICONBOX_COVER_HORIZONTAL", 0, LIST_FINDBY_NAME, + LIST_TYPE_ICLASS)) && (!(ib->cover_hide))) { EMoveResizeWindow(disp, ib->cover_win, 0, ib->scroll_thickness, diff --git a/src/ipc.c b/src/ipc.c index 5ddb1645..850c33b2 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -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_ / #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,430 +117,495 @@ void IPC_Group(char *params, Client * c); * --Mandrake */ -IPCStruct IPCArray[] = { +IPCStruct IPCArray[] = +{ { - IPC_Help, - "help", - "gives you this help screen", - "Additional parameters will retrieve help on many topics - " - "\"help \".\nuse \"help all\" for a list of commands."}, + IPC_Help, + "help", + "gives you this help screen", + "Additional parameters will retrieve help on many topics - " + "\"help \".\nuse \"help all\" for a list of commands." + }, { - IPC_Version, - "version", - "displays the current version of Enlightenment running", - NULL}, + IPC_Version, + "version", + "displays the current version of Enlightenment running", + NULL + }, { - IPC_Nop, - "nop", - "IPC No-operation - returns nop", - NULL}, + IPC_Nop, + "nop", + "IPC No-operation - returns nop", + NULL + }, { - IPC_Copyright, - "copyright", - "displays copyright information for Enlightenment", - NULL}, + IPC_Copyright, + "copyright", + "displays copyright information for Enlightenment", + NULL + }, { - IPC_AutoSave, - "autosave", - "toggle the Automatic Saving Feature", - "Use \"autosave ?\" to list the current status\n" - "use \"autosave on\" or \"autosave off\" to toggle the status"}, + IPC_AutoSave, + "autosave", + "toggle the Automatic Saving Feature", + "Use \"autosave ?\" to list the current status\n" + "use \"autosave on\" or \"autosave off\" to toggle the status" + }, { - IPC_DefaultTheme, - "default_theme", - "toggle the default theme", - "Use \"default_theme ?\" to get the current default theme\n" - "use \"default_theme /path/to/theme\"\n" - "you can retrieve a list of available themes from the " - "\"list_themes\" command"}, + IPC_DefaultTheme, + "default_theme", + "toggle the default theme", + "Use \"default_theme ?\" to get the current default theme\n" + "use \"default_theme /path/to/theme\"\n" + "you can retrieve a list of available themes from the " + "\"list_themes\" command" + }, { - IPC_Restart, - "restart", - "Restart Enlightenment", - NULL}, + IPC_Restart, + "restart", + "Restart Enlightenment", + NULL + }, { - IPC_RestartWM, - "restart_wm", - "Restart another window manager", - "Use \"restart_wm \" to start another window manager.\n" - "Example: \"restart_wm fvwm\""}, + IPC_RestartWM, + "restart_wm", + "Restart another window manager", + "Use \"restart_wm \" to start another window manager.\n" + "Example: \"restart_wm fvwm\"" + }, { - IPC_RestartTheme, - "restart_theme", - "Restart with another theme", - "Use \"restart_theme \" to restart enlightenment " - "with another theme\nExample: \"restart_theme icE\""}, + IPC_RestartTheme, + "restart_theme", + "Restart with another theme", + "Use \"restart_theme \" to restart enlightenment " + "with another theme\nExample: \"restart_theme icE\"" + }, { - IPC_Exit, - "exit", - "Exit Enlightenment", - NULL}, + IPC_Exit, + "exit", + "Exit Enlightenment", + NULL + }, { - IPC_ForceSave, - "save_config", - "Force Enlightenment to save settings now", - NULL}, + IPC_ForceSave, + "save_config", + "Force Enlightenment to save settings now", + NULL + }, { - IPC_SMFile, - "sm_file", - "Change the default prefix used for session saves", - "Average users are encouraged not to touch this setting.\n" - "Use \"sm_file ?\" to retrieve the current session management " - "file prefix\nUse \"sm_file /path/to/prefix/filenameprefix\" " - "to change."}, + IPC_SMFile, + "sm_file", + "Change the default prefix used for session saves", + "Average users are encouraged not to touch this setting.\n" + "Use \"sm_file ?\" to retrieve the current session management " + "file prefix\nUse \"sm_file /path/to/prefix/filenameprefix\" " + "to change." + }, { - IPC_ListThemes, - "list_themes", - "List currently available themes", - NULL}, + IPC_ListThemes, + "list_themes", + "List currently available themes", + NULL + }, { - IPC_GotoDesktop, - "goto_desktop", - "Change currently active destkop", - "Use \"goto_desktop num\" to go to a specific desktop.\n" - "Use \"goto_desktop next\" and \"goto_desktop prev\" to go to " - "the next and\n previous desktop\n" - "Use \"goto_desktop ?\" to find out what desktop you are " "currently on"}, + IPC_GotoDesktop, + "goto_desktop", + "Change currently active destkop", + "Use \"goto_desktop num\" to go to a specific desktop.\n" + "Use \"goto_desktop next\" and \"goto_desktop prev\" to go to " + "the next and\n previous desktop\n" + "Use \"goto_desktop ?\" to find out what desktop you are " + "currently on" + }, { - IPC_GotoArea, - "goto_area", - "Change currently active area", - "Use \"goto_area \" to go to a specific desktop.\n" - "Use \"goto_desktop next \" and \"goto_desktop " - "prev \" to go to the next and\n " - "previous areas\nUse \"goto_area ?\" to find out what area " - "you are currently on"}, + IPC_GotoArea, + "goto_area", + "Change currently active area", + "Use \"goto_area \" to go to a specific desktop.\n" + "Use \"goto_desktop next \" and \"goto_desktop " + "prev \" to go to the next and\n " + "previous areas\nUse \"goto_area ?\" to find out what area " + "you are currently on" + }, { - IPC_ShowIcons, - "show_icons", - "Toggle the display of icons on the desktop", - "Use \"show_icons on\" and \"show_icons off\" to change this setting\n" - "Use \"show_icons ?\" to retrieve the current setting"}, + IPC_ShowIcons, + "show_icons", + "Toggle the display of icons on the desktop", + "Use \"show_icons on\" and \"show_icons off\" to change this setting\n" + "Use \"show_icons ?\" to retrieve the current setting" + }, { - IPC_FocusMode, - "focus_mode", - "Change the current focus mode setting", - "Use \"focus_mode \" to change the focus mode.\n" - "Use \"focus_mode ?\" to retrieve the current setting\n" - "Focus Types:\n" - "click: This is the traditional click-to-focus mode.\n" - "clicknograb: This is a similar focus mode, but without the " - "grabbing of the click\n " - "(you cannot click anywhere in a window to focus it)\n" - "pointer: The focus will follow the mouse pointer\n" - "sloppy: in sloppy-focus, the focus follows the mouse, " - "but when over\n " - "the desktop background the last window does not lose the focus"}, + IPC_FocusMode, + "focus_mode", + "Change the current focus mode setting", + "Use \"focus_mode \" to change the focus mode.\n" + "Use \"focus_mode ?\" to retrieve the current setting\n" + "Focus Types:\n" + "click: This is the traditional click-to-focus mode.\n" + "clicknograb: This is a similar focus mode, but without the " + "grabbing of the click\n " + "(you cannot click anywhere in a window to focus it)\n" + "pointer: The focus will follow the mouse pointer\n" + "sloppy: in sloppy-focus, the focus follows the mouse, " + "but when over\n " + "the desktop background the last window does not lose the focus" + }, { - IPC_AdvancedFocus, - "advanced_focus", - "Toggle Advanced Focus Settings", - "use \"advanced_focus