diff --git a/po/xfwm4.pot b/po/xfwm4.pot index eddfc03c1d3be70154bec7e1e297d2511231dc48..f4f9815d57307269fbc719a9753e31016b44e1d5 100644 --- a/po/xfwm4.pot +++ b/po/xfwm4.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-04-19 00:14+0200\n" +"POT-Creation-Date: 2004-04-21 23:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -299,7 +299,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: src/client.c:525 +#: src/client.c:527 #, c-format msgid "%s: Unmanaged net_wm_state (window 0x%lx)" msgstr "" diff --git a/src/client.c b/src/client.c index 063da84a890c83155773476b9437184143dcc38c..a1dcef09ee77c64c2ac78395b50007a77485a5d7 100644 --- a/src/client.c +++ b/src/client.c @@ -5324,7 +5324,9 @@ clientMove_event_filter (XEvent * xevent, gpointer data) clientSnapPosition (c); clientConstrainPos (c, FALSE); +#ifdef SHOW_POSITION poswinSetPosition (passdata->poswin, c); +#endif if (params.box_move) { clientDrawOutline (c); @@ -5453,10 +5455,11 @@ clientMove (Client * c, XEvent * e) XPutBackEvent (dpy, e); } +#ifdef SHOW_POSITION passdata.poswin = poswinCreate(); poswinSetPosition (passdata.poswin, c); poswinShow (passdata.poswin); - +#endif FLAG_SET (c->flags, CLIENT_FLAG_MOVING_RESIZING); TRACE ("entering move loop"); pushEventFilter (clientMove_event_filter, &passdata); @@ -5464,9 +5467,10 @@ clientMove (Client * c, XEvent * e) popEventFilter (); TRACE ("leaving move loop"); FLAG_UNSET (c->flags, CLIENT_FLAG_MOVING_RESIZING); - +#ifdef SHOW_POSITION poswinDestroy (passdata.poswin); - +#endif + if (passdata.grab && params.box_move) { clientDrawOutline (c); @@ -5737,7 +5741,10 @@ clientResize_event_filter (XEvent * xevent, gpointer data) c->width = prev_width; } } - poswinSetPosition (passdata->poswin, c); + if ((c->size->width_inc > 1) || (c->size->height_inc > 1)) + { + poswinSetPosition (passdata->poswin, c); + } if (params.box_resize) { clientDrawOutline (c); @@ -5855,10 +5862,13 @@ clientResize (Client * c, int corner, XEvent * e) XPutBackEvent (dpy, e); } - passdata.poswin = poswinCreate(); - poswinSetPosition (passdata.poswin, c); - poswinShow (passdata.poswin); - + if ((c->size->width_inc > 1) || (c->size->height_inc > 1)) + { + passdata.poswin = poswinCreate(); + poswinSetPosition (passdata.poswin, c); + poswinShow (passdata.poswin); + } + FLAG_SET (c->flags, CLIENT_FLAG_MOVING_RESIZING); TRACE ("entering resize loop"); pushEventFilter (clientResize_event_filter, &passdata); @@ -5867,8 +5877,10 @@ clientResize (Client * c, int corner, XEvent * e) TRACE ("leaving resize loop"); FLAG_UNSET (c->flags, CLIENT_FLAG_MOVING_RESIZING); - poswinDestroy (passdata.poswin); - + if ((c->size->width_inc > 1) || (c->size->height_inc > 1)) + { + poswinDestroy (passdata.poswin); + } if (passdata.grab && params.box_resize) { clientDrawOutline (c); diff --git a/src/poswin.c b/src/poswin.c index 62459354d48b43a95f71b47f7b767b757ce156c8..1daee6b2c8a8cd5ee59e6f50f677aa6829fac87e 100644 --- a/src/poswin.c +++ b/src/poswin.c @@ -82,7 +82,11 @@ poswinSetPosition (Poswin * poswin, Client *c) wsizeinc = c->size->width_inc; hsizeinc = c->size->height_inc; +#ifdef SHOW_POSITION g_snprintf (label, 32, "(%ix%i) @ (%i,%i)", width / wsizeinc, height / hsizeinc, x, y); +#else + g_snprintf (label, 32, "(%ix%i)", width / wsizeinc, height / hsizeinc); +#endif gtk_label_set_text (GTK_LABEL (poswin->label), label); gtk_widget_queue_draw (poswin->window); gtk_window_get_size (GTK_WINDOW (poswin->window), &pw, &ph);