make sure that we aren't doing an extra server round trip for every paint event because of debugging code. this adds an extra check box to the debugging window to enable debugging feedback in addition to having the caps lock key down for debugging paint events. r=pavlov

widget/src/gtk/nsWidget.cpp

@@ -176,7 +176,9 @@ static GtkWidget *debugTopLevel = NULL;
 static GtkWidget *debugBox = NULL;
 static GtkWidget *debugEntryBox = NULL;
 static GtkWidget *debugButton = NULL;
+static GtkWidget *debugCheckBox = NULL;
 nsWidget  *nsWidget::debugWidget = NULL;
+PRBool     nsWidget::sDebugFeedback = PR_FALSE;
 static PRBool     debugCheckedDebugWindow = PR_FALSE;
 static PRBool     debugCallbackRegistered = PR_FALSE;
 
@@ -184,6 +186,8 @@ static void      debugHandleActivate(GtkEditable *editable,
                                      gpointer user_data);
 static void      debugHandleClicked (GtkButton   *button,
                                      gpointer user_data);
+static void      debugHandleToggle  (GtkToggleButton *button,
+                                     gpointer user_data);
 static void      debugSetupWindow   (void);
 static void      debugDestroyWindow (void);
 static int       debugWindowPrefChanged (const char *newpref, void *data);
@@ -814,7 +818,7 @@ NS_IMETHODIMP nsWidget::SetCursor(nsCursor aCursor)
 }
 
 #define CAPS_LOCK_IS_ON \
-(nsGtkUtils::gdk_keyboard_get_modifiers() & GDK_LOCK_MASK)
+(nsWidget::sDebugFeedback && (nsGtkUtils::gdk_keyboard_get_modifiers() & GDK_LOCK_MASK))
 
 NS_IMETHODIMP nsWidget::Invalidate(PRBool aIsSynchronous)
 {
@@ -3196,6 +3200,17 @@ static void      debugHandleClicked (GtkButton   *button,
   setDebugWindow();
 }
 
+static void      debugHandleToggle  (GtkToggleButton *button,
+                                     gpointer user_data)
+{
+  if (gtk_toggle_button_get_active(button) == TRUE) {
+    nsWidget::sDebugFeedback = PR_TRUE;
+  }
+  else {
+    nsWidget::sDebugFeedback = PR_FALSE;
+  }
+}
+
 static void      debugDestroyWindow (void)
 {
   // this will destroy all of the widgets inside the window, too.
@@ -3204,6 +3219,7 @@ static void      debugDestroyWindow (void)
   debugBox = NULL;
   debugEntryBox = NULL;
   debugButton = NULL;
+  debugCheckBox = NULL;
   nsWidget::debugWidget = NULL;  
 }
 
@@ -3235,6 +3251,11 @@ static void      debugSetupWindow   (void)
       gtk_box_pack_start_defaults(GTK_BOX(debugBox), debugButton);
       gtk_signal_connect(GTK_OBJECT(debugButton), "clicked",
                          GTK_SIGNAL_FUNC(debugHandleClicked), NULL);
+
+      debugCheckBox = gtk_check_button_new_with_label("Debug Feedback");
+      gtk_box_pack_start_defaults(GTK_BOX(debugBox), debugCheckBox);
+      gtk_signal_connect(GTK_OBJECT(debugCheckBox), "toggled",
+                         GTK_SIGNAL_FUNC(debugHandleToggle), NULL);
       
       gtk_widget_show_all(debugTopLevel);
     }

widget/src/gtk/nsWidget.h

@@ -183,6 +183,7 @@ public:
 
 #ifdef NS_DEBUG
   static nsWidget *debugWidget;
+  static PRBool    sDebugFeedback;
 #endif
 
 

widget/src/gtk/nsWindow.cpp

@@ -57,10 +57,10 @@
 #define MODAL_TIMERS_BROKEN
 
 #define CAPS_LOCK_IS_ON \
-(nsGtkUtils::gdk_keyboard_get_modifiers() & GDK_LOCK_MASK)
+(nsWidget::sDebugFeedback && (nsGtkUtils::gdk_keyboard_get_modifiers() & GDK_LOCK_MASK))
 
 #define WANT_PAINT_FLASHING \
-(debug_WantPaintFlashing() && CAPS_LOCK_IS_ON)
+(CAPS_LOCK_IS_ON && debug_WantPaintFlashing())
 
 gint handle_toplevel_focus_in(
     GtkWidget *      aWidget,