Merge pull request #4 from orchardstreet/orchardstreet-patch-2

Turn XAutoRepeat back on when exit via titlebar

Author: JoesCat

main-x11.c

@@ -21,6 +21,7 @@
 ------------------------------------------------------------------*/
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/Xatom.h>
 #include <X11/keysym.h>
 #include <sys/types.h>
 
@@ -57,6 +58,7 @@ XTextProperty wname;
 char          *font_name = "10x20";
 unsigned int  window_width, window_height,
               display_width, display_height;
+Atom wmDeleteMessage;
 
 /*------------------------------------------------------------------
  * main
@@ -138,6 +140,10 @@ int Graphics_init ( unsigned int win_width, unsigned int win_height )
    color_gc = XCreateGC ( display, win, gc_valuemask, &gc_values );
    text_gc  = XCreateGC ( display, win, gc_valuemask, &gc_values );
 
+   /* Get atom and indicate X11 client is willing to participate */
+   wmDeleteMessage = XInternAtom ( display, "WM_DELETE_WINDOW", False );
+   XSetWMProtocols ( display, win, &wmDeleteMessage, 1 );
+
    /* load default font */
    font_info = XLoadQueryFont ( display, font_name );
    if ( !font_info )
@@ -477,6 +483,15 @@ int Handle_events ( void )
             }
             break;
 
+         case ClientMessage:
+            if ( event.xclient.data.l[0] >= 0 && ((unsigned long int) \
+                 event.xclient.data.l[0]) == wmDeleteMessage )
+            {
+               Graphics_shutdown ();
+               exit(0);
+            }
+            break;
+
          default:
             break;
       }

player.c

@@ -164,17 +164,17 @@ void Player_update1 ( OBJECT *obj )
    if ( (gv->key_LEFT1 == FALSE) && (gv->key_RIGHT1 == FALSE) && \
          player1->rot )
    {
-      if(player1->rot > 0) 
+      if ( player1->rot > 0 )
       {
          player1->rot -= ROT_Z * gv->fadjust;
-	 if(player1->rot < 0)
+         if ( player1->rot < 0 )
             player1->rot = 0;
-      } 
-      else 
+      }
+      else
       {
          player1->rot += ROT_Z * gv->fadjust;
-	 if(player1->rot > 0)
-	    player1->rot = 0;
+         if ( player1->rot > 0 )
+            player1->rot = 0;
       }
    }
 
@@ -235,17 +235,17 @@ void Player_update2 ( OBJECT *obj )
    if ( (gv->key_LEFT2 == FALSE) && (gv->key_RIGHT2 == FALSE) && \
          player2->rot )
    {
-      if(player2->rot > 0) 
+      if ( player2->rot > 0 )
       {
          player2->rot -= ROT_Z * gv->fadjust;
-	 if(player2->rot < 0)
+         if ( player2->rot < 0 )
             player2->rot = 0;
-      } 
-      else 
+      }
+      else
       {
          player2->rot += ROT_Z * gv->fadjust;
-	 if(player2->rot > 0)
-	    player2->rot = 0;
+         if ( player2->rot > 0 )
+            player2->rot = 0;
       }
    }