diff --git a/src/ChangeLog b/src/ChangeLog index f4329104..336eea18 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4006,3 +4006,10 @@ fix to allow setting of which mouse button do what on the pager fix to border width handlign in icccm fix to warp foucs some other stuff i probabyl forgot about... + +------------------------------------------------------------------------------- + +Mon Dec 6 14:57:42 PST 1999 +(Raster) + +how DID border s get that in there????????????? diff --git a/src/borders.c b/src/borders.c index dfa4db9b..8bfcef19 100644 --- a/src/borders.c +++ b/src/borders.c @@ -1228,9 +1228,9 @@ CalcEwinWinpart(EWin * ewin, int i) iclass = ewin->border->part[i].iclass; tclass = ewin->border->part[i].tclass; - TextSize(tclass, \ewin->active, \ewin->sticky, \ewin->bits[i].state, - \ewin->client.title, \&max, \&dummyheight, - \h - (iclass->padding.top + iclass->padding.bottom) \); + TextSize(tclass, ewin->active, ewin->sticky, ewin->bits[i].state, + ewin->client.title, &max, &dummyheight, + h - (iclass->padding.top + iclass->padding.bottom)); max += iclass->padding.left + iclass->padding.right; if (w > max) diff --git a/src/comms.c b/src/comms.c index 885686b2..57f9c0e0 100644 --- a/src/comms.c +++ b/src/comms.c @@ -1751,8 +1751,30 @@ HandleComms(XEvent * ev) "MWM_TITLE: %5i\n" "MWM_MENU: %5i\n" "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, ewin->border->name, ewin->border->border.left, ewin->border->border.right, ewin->border->border.top, ewin->border->border.bottom, ewin->desktop, ewin->num_groups, ewin->docked, ewin->sticky, ewin->visible, ewin->iconified, ewin->shaded, ewin->active, ewin->layer, ewin->never_use_area, ewin->floating, ewin->client.w, ewin->client.h, ewin->client.icon_win, ewin->client.icon_pmap, ewin->client.icon_mask, ewin->client.group, ewin->client.need_input, ewin->client.transient, ewin->client.title, ewin->client.class, ewin->client.name, ewin->client.command, ewin->client.machine, ewin->client.icon_name, ewin->client.is_group_leader, ewin->client.no_resize_h, ewin->client.no_resize_v, ewin->client.shaped, ewin->client.width.min, ewin->client.height.min, ewin->client.width.max, ewin->client.height.max, ewin->client.base_w, ewin->client.base_h, ewin->client.w_inc, ewin->client.h_inc, - ewin->client.aspect_min, + "MWM_MAXIMIZE: %5i\n" + "APP_STATE: %5i\n", ewin->client.win, + ewin->win, ewin->x, ewin->y, ewin->w, ewin->h, + ewin->border->name, ewin->border->border.left, + ewin->border->border.right, + ewin->border->border.top, + ewin->border->border.bottom, ewin->desktop, + ewin->num_groups, ewin->docked, ewin->sticky, + ewin->visible, ewin->iconified, ewin->shaded, + ewin->active, ewin->layer, ewin->never_use_area, + ewin->floating, ewin->client.w, ewin->client.h, + ewin->client.icon_win, ewin->client.icon_pmap, + ewin->client.icon_mask, ewin->client.group, + ewin->client.need_input, ewin->client.transient, + ewin->client.title, ewin->client.class, + ewin->client.name, ewin->client.command, + ewin->client.machine, ewin->client.icon_name, + ewin->client.is_group_leader, + ewin->client.no_resize_h, ewin->client.no_resize_v, + ewin->client.shaped, ewin->client.width.min, + ewin->client.height.min, ewin->client.width.max, + ewin->client.height.max, ewin->client.base_w, + ewin->client.base_h, ewin->client.w_inc, + ewin->client.h_inc, ewin->client.aspect_min, ewin->client.aspect_max, ewin->client.mwm_decor_border, ewin->client.mwm_decor_resizeh, @@ -1810,56 +1832,26 @@ HandleComms(XEvent * ev) "MWM_MENU: %5i\n" "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, - 0, - 0, - 0, - 0, - ewin->desktop, - ewin->num_groups, - ewin->docked, - ewin->sticky, - ewin->visible, - ewin->iconified, - ewin->shaded, - ewin->active, - ewin->layer, - ewin->never_use_area, - ewin->floating, - ewin->client.w, - ewin->client.h, - ewin->client.icon_win, - ewin->client.icon_pmap, - ewin->client.icon_mask, - ewin->client.group, - ewin->client.need_input, - ewin->client.transient, - ewin->client.title, - ewin->client.class, - ewin->client.name, - ewin->client.command, - ewin->client.machine, - ewin->client.icon_name, + "APP_STATE: %5i\n", ewin->client.win, + 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, + ewin->layer, ewin->never_use_area, ewin->floating, + ewin->client.w, ewin->client.h, + ewin->client.icon_win, ewin->client.icon_pmap, + ewin->client.icon_mask, ewin->client.group, + ewin->client.need_input, ewin->client.transient, + ewin->client.title, ewin->client.class, + ewin->client.name, ewin->client.command, + ewin->client.machine, ewin->client.icon_name, ewin->client.is_group_leader, - ewin->client.no_resize_h, - ewin->client.no_resize_v, - ewin->client.shaped, - ewin->client.width.min, - ewin->client.height.min, - ewin->client.width.max, - ewin->client.height.max, - ewin->client.base_w, - ewin->client.base_h, - ewin->client.w_inc, - ewin->client.h_inc, - ewin->client.aspect_min, + ewin->client.no_resize_h, ewin->client.no_resize_v, + ewin->client.shaped, ewin->client.width.min, + ewin->client.height.min, ewin->client.width.max, + ewin->client.height.max, ewin->client.base_w, + ewin->client.base_h, ewin->client.w_inc, + ewin->client.h_inc, ewin->client.aspect_min, ewin->client.aspect_max, ewin->client.mwm_decor_border, ewin->client.mwm_decor_resizeh, diff --git a/src/evhandlers.c b/src/evhandlers.c index 59334836..1547ede2 100644 --- a/src/evhandlers.c +++ b/src/evhandlers.c @@ -491,8 +491,8 @@ HandleMotion(XEvent * ev) gwins[i]->w) && (!(IN_RANGE - (gwins[i]-> - reqx, + (gwins + [i]->reqx, gwins[i]->x, mode. edge_snap_dist))))))) @@ -515,8 +515,8 @@ HandleMotion(XEvent * ev) gwins[i]->h) && (!(IN_RANGE - (gwins[i]-> - reqy, + (gwins + [i]->reqy, gwins[i]->y, mode. edge_snap_dist))))))) @@ -2504,8 +2504,8 @@ HandleMouseUp(XEvent * ev) } HideEwin(gwins[i]); MoveEwin(gwins[i], gwin_px[i] + - ((desks. - desk[gwins[i]->desktop]. + ((desks.desk + [gwins[i]->desktop]. current_area_x) - p->hi_ewin->area_x) * root.w, gwin_py[i] + diff --git a/src/iconify.c b/src/iconify.c index 3a2d0d2a..88a91f84 100644 --- a/src/iconify.c +++ b/src/iconify.c @@ -263,12 +263,12 @@ IconifyEwin(EWin * ewin) HideEwin(lst[i]); MoveEwin(lst[i], lst[i]->x + - ((desks. - desk[lst[i]->desktop].current_area_x) - + ((desks.desk + [lst[i]->desktop].current_area_x) - lst[i]->area_x) * root.w, lst[i]->y + - ((desks. - desk[lst[i]->desktop].current_area_y) - + ((desks.desk + [lst[i]->desktop].current_area_y) - lst[i]->area_y) * root.h); lst[i]->iconified = 4; if (lst[i] == mode.focuswin) diff --git a/src/menus.c b/src/menus.c index 90aaa5e3..d47bf579 100644 --- a/src/menus.c +++ b/src/menus.c @@ -1686,7 +1686,6 @@ CreateMenuFromGnome(char *name, MenuStyle * ms, char *dir) if (f) { char *iname = NULL, *exec = NULL, *texec = - NULL, *tmp; char *en_name = NULL; diff --git a/src/snaps.c b/src/snaps.c index 86db2d03..882a4f5c 100644 --- a/src/snaps.c +++ b/src/snaps.c @@ -1190,25 +1190,21 @@ MatchEwinToSnapInfoAfter(EWin * ewin) if (sn->use_desktop) MoveEwin(ewin, sn->x + - ((sn-> - area_x - + ((sn->area_x - desks.desk[ewin->desktop].current_area_x) * root.w), sn->y + - ((sn-> - area_y - + ((sn->area_y - desks.desk[ewin->desktop].current_area_y) * root.h)); else MoveEwin(ewin, sn->x + - ((sn-> - area_x - + ((sn->area_x - desks.desk[desks.current].current_area_x) * root.w), sn->y + - ((sn-> - area_y - + ((sn->area_y - desks.desk[desks.current].current_area_y) * root.h)); } diff --git a/src/startup.c b/src/startup.c index 556bd111..5ed3c6d8 100644 --- a/src/startup.c +++ b/src/startup.c @@ -33,9 +33,9 @@ AddEToFile(char *file) char foundwm = 0; char *wms[] = { "wmaker", "afterstep", "fvwm", "fvwm2", "twm", "mwm", "vtwm", "ctwm", - "gwm", + "gwm", "mlvwm", "kwm", "olwm", "wm2", "wmx", "olvwm", "9wm", "blackbox", "awm", - "uwm", + "uwm", "amiwm", "dtwm", "4dwm", "scwm", "fvwm95", "fvwm95-2", "tvtwm", "bowman", "qwm", "icewm", "qvwm", "gnome-session", "xsm", "startkde" };