Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a way to get

1999-08-27  Tor Lillqvist  <tml@iki.fi>

Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a
way to get window contents continually refreshed while resizing. I
didn't like the effects myself, so it's not on by default.

* gdk/win32/gdkprivate.h: New flag variable
gdk_event_func_from_window_proc, FALSE by default.

* gdk/win32/gdk.c (gdk_init_check): Set above flag if the
environment variable GDK_EVENT_FUNC_FROM_WINDOW_PROC is set, or we
are passed --gdk-event-func-from-window-proc.

* gdk/win32/gdkevents.c (gdk_WindowProc): If above flag is set,
and we have am event_func, call it instead of enqueing the event.

diff --git a/ChangeLog b/ChangeLog
index 8b895dc02fbf89cffc1fefd0d6776215fa365524..168dd26aececb76a6e1b074f1d1ca175b43db855 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+1999-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a
+       way to get window contents continually refreshed while resizing. I
+       didn't like the effects myself, so it's not on by default.
+
+       * gdk/win32/gdkprivate.h: New flag variable
+       gdk_event_func_from_window_proc, FALSE by default.
+
+       * gdk/win32/gdk.c (gdk_init_check): Set above flag if the
+       environment variable GDK_EVENT_FUNC_FROM_WINDOW_PROC is set, or we
+       are passed --gdk-event-func-from-window-proc.
+
+       * gdk/win32/gdkevents.c (gdk_WindowProc): If above flag is set,
+       and we have am event_func, call it instead of enqueing the event.
+
 1999-08-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents.c (gdk_event_translate): Fix from Simon

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8b895dc02fbf89cffc1fefd0d6776215fa365524..168dd26aececb76a6e1b074f1d1ca175b43db855 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,19 @@
+1999-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a
+       way to get window contents continually refreshed while resizing. I
+       didn't like the effects myself, so it's not on by default.
+
+       * gdk/win32/gdkprivate.h: New flag variable
+       gdk_event_func_from_window_proc, FALSE by default.
+
+       * gdk/win32/gdk.c (gdk_init_check): Set above flag if the
+       environment variable GDK_EVENT_FUNC_FROM_WINDOW_PROC is set, or we
+       are passed --gdk-event-func-from-window-proc.
+
+       * gdk/win32/gdkevents.c (gdk_WindowProc): If above flag is set,
+       and we have am event_func, call it instead of enqueing the event.
+
 1999-08-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents.c (gdk_event_translate): Fix from Simon

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8b895dc02fbf89cffc1fefd0d6776215fa365524..168dd26aececb76a6e1b074f1d1ca175b43db855 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+1999-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a
+       way to get window contents continually refreshed while resizing. I
+       didn't like the effects myself, so it's not on by default.
+
+       * gdk/win32/gdkprivate.h: New flag variable
+       gdk_event_func_from_window_proc, FALSE by default.
+
+       * gdk/win32/gdk.c (gdk_init_check): Set above flag if the
+       environment variable GDK_EVENT_FUNC_FROM_WINDOW_PROC is set, or we
+       are passed --gdk-event-func-from-window-proc.
+
+       * gdk/win32/gdkevents.c (gdk_WindowProc): If above flag is set,
+       and we have am event_func, call it instead of enqueing the event.
+
 1999-08-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents.c (gdk_event_translate): Fix from Simon

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8b895dc02fbf89cffc1fefd0d6776215fa365524..168dd26aececb76a6e1b074f1d1ca175b43db855 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+1999-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a
+       way to get window contents continually refreshed while resizing. I
+       didn't like the effects myself, so it's not on by default.
+
+       * gdk/win32/gdkprivate.h: New flag variable
+       gdk_event_func_from_window_proc, FALSE by default.
+
+       * gdk/win32/gdk.c (gdk_init_check): Set above flag if the
+       environment variable GDK_EVENT_FUNC_FROM_WINDOW_PROC is set, or we
+       are passed --gdk-event-func-from-window-proc.
+
+       * gdk/win32/gdkevents.c (gdk_WindowProc): If above flag is set,
+       and we have am event_func, call it instead of enqueing the event.
+
 1999-08-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents.c (gdk_event_translate): Fix from Simon

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8b895dc02fbf89cffc1fefd0d6776215fa365524..168dd26aececb76a6e1b074f1d1ca175b43db855 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+1999-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a
+       way to get window contents continually refreshed while resizing. I
+       didn't like the effects myself, so it's not on by default.
+
+       * gdk/win32/gdkprivate.h: New flag variable
+       gdk_event_func_from_window_proc, FALSE by default.
+
+       * gdk/win32/gdk.c (gdk_init_check): Set above flag if the
+       environment variable GDK_EVENT_FUNC_FROM_WINDOW_PROC is set, or we
+       are passed --gdk-event-func-from-window-proc.
+
+       * gdk/win32/gdkevents.c (gdk_WindowProc): If above flag is set,
+       and we have am event_func, call it instead of enqueing the event.
+
 1999-08-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents.c (gdk_event_translate): Fix from Simon

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8b895dc02fbf89cffc1fefd0d6776215fa365524..168dd26aececb76a6e1b074f1d1ca175b43db855 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+1999-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a
+       way to get window contents continually refreshed while resizing. I
+       didn't like the effects myself, so it's not on by default.
+
+       * gdk/win32/gdkprivate.h: New flag variable
+       gdk_event_func_from_window_proc, FALSE by default.
+
+       * gdk/win32/gdk.c (gdk_init_check): Set above flag if the
+       environment variable GDK_EVENT_FUNC_FROM_WINDOW_PROC is set, or we
+       are passed --gdk-event-func-from-window-proc.
+
+       * gdk/win32/gdkevents.c (gdk_WindowProc): If above flag is set,
+       and we have am event_func, call it instead of enqueing the event.
+
 1999-08-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents.c (gdk_event_translate): Fix from Simon

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8b895dc02fbf89cffc1fefd0d6776215fa365524..168dd26aececb76a6e1b074f1d1ca175b43db855 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+1999-08-27  Tor Lillqvist  <tml@iki.fi>
+
+       Win32: Philippe Colantoni <colanton@aris.ss.uci.edu> suggests a
+       way to get window contents continually refreshed while resizing. I
+       didn't like the effects myself, so it's not on by default.
+
+       * gdk/win32/gdkprivate.h: New flag variable
+       gdk_event_func_from_window_proc, FALSE by default.
+
+       * gdk/win32/gdk.c (gdk_init_check): Set above flag if the
+       environment variable GDK_EVENT_FUNC_FROM_WINDOW_PROC is set, or we
+       are passed --gdk-event-func-from-window-proc.
+
+       * gdk/win32/gdkevents.c (gdk_WindowProc): If above flag is set,
+       and we have am event_func, call it instead of enqueing the event.
+
 1999-08-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents.c (gdk_event_translate): Fix from Simon

diff --git a/gdk/win32/gdk.c b/gdk/win32/gdk.c
index 78a64e25c1dac58a541358b1db611204d43397b4..d9d2dde82027a62ddc3a63a7457f67d545c4c69a 100644 (file)
--- a/gdk/win32/gdk.c
+++ b/gdk/win32/gdk.c
@@ -136,6 +136,9 @@ gdk_init_check (int    *argc,
   if (getenv ("GDK_IGNORE_WINTAB") != NULL)
     gdk_input_ignore_wintab = TRUE;
 
+  if (getenv ("GDK_EVENT_FUNC_FROM_WINDOW_PROC") != NULL)
+    gdk_event_func_from_window_proc = TRUE;
+
   if (argc && argv)
     {
       if (*argc > 0)
@@ -216,6 +219,11 @@ gdk_init_check (int    *argc,
                (*argv)[i] = NULL;
                gdk_input_ignore_wintab = TRUE;
              }
+           else if (strcmp ("--gdk-event-func-from-window-proc", (*argv)[i]) == 0)
+             {
+               (*argv)[i] = NULL;
+               gdk_event_func_from_window_proc = TRUE;
+             }
          i += 1;
        }
       

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 627532fb85514eb8cf3bd307eb4b38d571583cf5..6e5a876a5afce0fdfff1a2674f01676e844c2c70 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -47,6 +47,8 @@ typedef struct _GdkEventPrivate GdkEventPrivate;
 #define DOUBLE_CLICK_DIST      5
 #define TRIPLE_CLICK_DIST      5
 
+gint gdk_event_func_from_window_proc = FALSE;
+
 typedef enum
 {
   /* Following flag is set for events on the event queue during
@@ -201,11 +203,30 @@ gdk_WindowProc(HWND hwnd,
       eventp = gdk_event_new ();
       *eventp = event;
 
-      gdk_event_queue_append (eventp);
+      /* Philippe Colantoni <colanton@aris.ss.uci.edu> suggests this
+       * in order to handle events while opaque resizing neatly.  I
+       * don't want it as default. Set the
+       * GDK_EVENT_FUNC_FROM_WINDOW_PROC env var to get this
+       * behaviour.
+       */
+      if (gdk_event_func_from_window_proc && event_func)
+       {
+         GDK_THREADS_ENTER ();
+         
+         (*event_func) (eventp, event_data);
+         gdk_event_free (eventp);
+         
+         GDK_THREADS_LEAVE ();
+       }
+      else
+       {
+         gdk_event_queue_append (eventp);
 #if 1
-      /* Wake up WaitMessage */
-      PostMessage (NULL, gdk_ping_msg, 0, 0);
+         /* Wake up WaitMessage */
+         PostMessage (NULL, gdk_ping_msg, 0, 0);
 #endif
+       }
+      
       if (ret_val_flag)
        return ret_val;
       else

diff --git a/gdk/win32/gdkevents.c b/gdk/win32/gdkevents.c
index 627532fb85514eb8cf3bd307eb4b38d571583cf5..6e5a876a5afce0fdfff1a2674f01676e844c2c70 100644 (file)
--- a/gdk/win32/gdkevents.c
+++ b/gdk/win32/gdkevents.c
@@ -47,6 +47,8 @@ typedef struct _GdkEventPrivate GdkEventPrivate;
 #define DOUBLE_CLICK_DIST      5
 #define TRIPLE_CLICK_DIST      5
 
+gint gdk_event_func_from_window_proc = FALSE;
+
 typedef enum
 {
   /* Following flag is set for events on the event queue during
@@ -201,11 +203,30 @@ gdk_WindowProc(HWND hwnd,
       eventp = gdk_event_new ();
       *eventp = event;
 
-      gdk_event_queue_append (eventp);
+      /* Philippe Colantoni <colanton@aris.ss.uci.edu> suggests this
+       * in order to handle events while opaque resizing neatly.  I
+       * don't want it as default. Set the
+       * GDK_EVENT_FUNC_FROM_WINDOW_PROC env var to get this
+       * behaviour.
+       */
+      if (gdk_event_func_from_window_proc && event_func)
+       {
+         GDK_THREADS_ENTER ();
+         
+         (*event_func) (eventp, event_data);
+         gdk_event_free (eventp);
+         
+         GDK_THREADS_LEAVE ();
+       }
+      else
+       {
+         gdk_event_queue_append (eventp);
 #if 1
-      /* Wake up WaitMessage */
-      PostMessage (NULL, gdk_ping_msg, 0, 0);
+         /* Wake up WaitMessage */
+         PostMessage (NULL, gdk_ping_msg, 0, 0);
 #endif
+       }
+      
       if (ret_val_flag)
        return ret_val;
       else

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 78a64e25c1dac58a541358b1db611204d43397b4..d9d2dde82027a62ddc3a63a7457f67d545c4c69a 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -136,6 +136,9 @@ gdk_init_check (int    *argc,
   if (getenv ("GDK_IGNORE_WINTAB") != NULL)
     gdk_input_ignore_wintab = TRUE;
 
+  if (getenv ("GDK_EVENT_FUNC_FROM_WINDOW_PROC") != NULL)
+    gdk_event_func_from_window_proc = TRUE;
+
   if (argc && argv)
     {
       if (*argc > 0)
@@ -216,6 +219,11 @@ gdk_init_check (int    *argc,
                (*argv)[i] = NULL;
                gdk_input_ignore_wintab = TRUE;
              }
+           else if (strcmp ("--gdk-event-func-from-window-proc", (*argv)[i]) == 0)
+             {
+               (*argv)[i] = NULL;
+               gdk_event_func_from_window_proc = TRUE;
+             }
          i += 1;
        }
       

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 20b301bf42d6a139eaa629806e193b2a787a2672..80217a0de2eccdee72eb5e518fe0983f4b7d2235 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -388,6 +388,7 @@ GDKVAR gint          gdk_error_code;
 GDKVAR gint             gdk_error_warnings;
 GDKVAR gint              gdk_null_window_warnings;
 extern GList            *gdk_default_filters;
+extern gint             gdk_event_func_from_window_proc;
 
 #ifdef USE_XIM
 /* XIM support */

diff --git a/gdk/win32/gdkprivate.h b/gdk/win32/gdkprivate.h
index 20b301bf42d6a139eaa629806e193b2a787a2672..80217a0de2eccdee72eb5e518fe0983f4b7d2235 100644 (file)
--- a/gdk/win32/gdkprivate.h
+++ b/gdk/win32/gdkprivate.h
@@ -388,6 +388,7 @@ GDKVAR gint          gdk_error_code;
 GDKVAR gint             gdk_error_warnings;
 GDKVAR gint              gdk_null_window_warnings;
 extern GList            *gdk_default_filters;
+extern gint             gdk_event_func_from_window_proc;
 
 #ifdef USE_XIM
 /* XIM support */