Re: [wmx] wmx7 perhaps ? (was Hi)

On Wed, 14 May 2003, Chris Cannam wrote:

> On Tuesday 13 May 2003 5:07 pm, Damion Yates wrote:

> > It's not inconvenient for me to store this patch somewhere
> > save and apply it on recently downloaded copies of the base
> > 6.0 (IIRC) release.  But surely this 80 lines or so could be
> > added for a 6.1 more tidy version?
>
> Bah, I don't do point releases.  Don't mind making a wmx-7 with
> just a few fixes though.
>
> There is a nasty occasional focus problem in 6 that I'd quite
> like to deal with, but I haven't actually done so yet.

I've tidied the gcc issues slightly, there were some warns
about #endif SOMETHING  which I've changed to #endif // SOMETHING

This patch is tiny but you'll probably want to decide about some
of the values.

For a 7 release I think it would make sense to check debian
and *BSD ports updates to see if their installs have been
automatically fixing bugs on top of the point release for some
time.

I'll take a look today if I get time.

Oh one further thing.  I really liked the yellow background.xpm that ysed to
be in wmx, the default now is very light gray.  Should we provide both and
make the choice a comment switch over in Config.h ?

Damion

-- 
Damion Yates - Maiden House, Vanwall Business estate, Maidenhead
email: Damion.Yates@bbc.co.uk - phone: +44 (0) 1628 407759 (or ex: 37759)

diff -ur wmx-6/Buttons.C wmx-7/Buttons.C
--- wmx-6/Buttons.C	2001-04-04 09:58:31.000000000 +0100
+++ wmx-7/Buttons.C	2003-05-14 10:09:52.000000000 +0100
@@ -184,19 +184,19 @@
 	    }
 	    
 	} else
-#endif CONFIG_QUICKRAISE_KEY
+#endif // CONFIG_QUICKRAISE_KEY
 #ifdef CONFIG_QUICKHIDE_KEY
 	if (key == CONFIG_QUICKHIDE_KEY && c) {
 	    c->hide();
 	      
 	} else 
-#endif CONFIG_QUICKHIDE_KEY
+#endif // CONFIG_QUICKHIDE_KEY
 #ifdef CONFIG_QUICKCLOSE_KEY
 	if (key == CONFIG_QUICKCLOSE_KEY && c) {
 	    c->kill();
 
 	} else
-#endif CONFIG_QUICKCLOSE_KEY
+#endif // CONFIG_QUICKCLOSE_KEY
 #ifdef CONFIG_QUICKHEIGHT_KEY
 	if (key == CONFIG_QUICKHEIGHT_KEY && c) {
 
@@ -232,7 +232,7 @@
 
            if (!m_altPressed) {
                // oops! bug
-               fprintf(stderr, "wmx: Alt key record in inconsistent state\n");
+       //        fprintf(stderr, "wmx: Alt key record in inconsistent state\n");
                m_altPressed = True;
                m_altStateRetained = False;
 //        fprintf(stderr, "state is %ld, mask is %ld\n",
@@ -465,6 +465,11 @@
 
     mapRaised();
 
+if ((e->button == Button1) && (!m_border->hasWindow(e->window))){
+ e->x += m_border->xIndent(); e->y += m_border->yIndent();
+ move(e);
+}
+
     if (e->button == Button1) {
 	if (m_border->hasWindow(e->window)) {
 
@@ -574,7 +579,7 @@
 
 	if (!found) {
 	    sleepval.tv_sec = 0;
-	    sleepval.tv_usec = 50000;
+	    sleepval.tv_usec = 1000;
 	    select(0, 0, 0, 0, &sleepval);
 	    continue;
 	}
@@ -724,7 +729,7 @@
 
 	if (!found) {
 	    sleepval.tv_sec = 0;
-	    sleepval.tv_usec = 50000;
+	    sleepval.tv_usec = 10000;
 	    select(0, 0, 0, 0, &sleepval);
 	    continue;
 	}
diff -ur wmx-6/Client.C wmx-7/Client.C
--- wmx-6/Client.C	2000-05-12 08:40:20.000000000 +0100
+++ wmx-7/Client.C	2003-05-14 10:09:29.000000000 +0100
@@ -214,6 +214,10 @@
         XGrabKey(display(), XKeysymToKeycode(display(), CONFIG_ALT_KEY),
                  0, m_window, True, GrabModeAsync, GrabModeAsync);
 
+//find me
+XGrabButton(display(), Button1, m_windowManager->altModMask(), m_window, False, 0,
+GrabModeAsync, GrabModeSync, None, None);
+
 	for (i = 0; i < sizeof(keys)/sizeof(keys[0]); ++i) {
 	    keycode = XKeysymToKeycode(display(), keys[i]);
 	    if (keycode) {
diff -ur wmx-6/Config.h wmx-7/Config.h
--- wmx-6/Config.h	2000-05-24 16:48:59.000000000 +0100
+++ wmx-7/Config.h	2003-05-14 10:09:29.000000000 +0100
@@ -75,8 +75,8 @@
 
 // What to run to get a new window (from the "New" menu option)
 #define CONFIG_NEW_WINDOW_LABEL "New"
-//#define CONFIG_NEW_WINDOW_COMMAND "xterm"
-#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
+#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+//#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
 #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
 // or, for example,
 //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
@@ -116,7 +116,7 @@
 
 #define CONFIG_AUTO_RAISE_DELAY       (dConfig.raiseDelay())
 #define CONFIG_POINTER_STOPPED_DELAY  80
-#define CONFIG_DESTROY_WINDOW_DELAY   1000
+#define CONFIG_DESTROY_WINDOW_DELAY   400
 
 // Number of pixels off the screen you have to push a window
 // before the manager notices the window is off-screen (the higher
@@ -205,8 +205,8 @@
 #define CONFIG_CIRCULATE_KEY	XK_Tab
 //#define CONFIG_CIRCULATE_KEY	XK_grave
 //#define CONFIG_CIRCULATE_KEY	XK_section
-#define CONFIG_DESTROY_KEY	XK_BackSpace
-//#define CONFIG_DESTROY_KEY	XK_Delete
+// #define CONFIG_DESTROY_KEY	XK_BackSpace
+#define CONFIG_DESTROY_KEY	XK_KP_Delete
 //#define CONFIG_DESTROY_KEY	XK_Insert
 
 // If WANT_KEYBOARD_MENU is True, then the MENU_KEY, when pressed with
diff -ur wmx-6/Menu.C wmx-7/Menu.C
--- wmx-6/Menu.C	2000-05-24 16:50:27.000000000 +0100
+++ wmx-7/Menu.C	2003-05-14 10:10:15.000000000 +0100
@@ -621,7 +621,7 @@
 
 
 CommandMenu::CommandMenu(WindowManager *manager, XEvent *e,
-			 char* otherdir = NULL)
+			 char* otherdir)
     : Menu(manager, e)
 {
     const char *home = getenv("HOME");