[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.378 by root, Fri Dec 14 02:27:54 2007 UTC vs.
Revision 1.400 by ayin, Mon Jan 28 12:54:47 2008 UTC

  * Copyright (c) 1998      Alfredo K. Kojima <kojima@windowmaker.org>
  * Copyright (c) 2001      Marius Gedminas
  *				- Ctrl/Mod4+Tab works like Meta+Tab (options)
  * Copyright (c) 2003      Rob McMullen <robm@flipturn.org>
  * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2007      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
            r & RS_Uline   ? " uline"   : "",
            r & RS_Careful ? " careful" : "");
   int width = wcswidth (fname, wcslen (fname));
-  max_it (width, 8+5); // for char + hey
+  max_it (width, 8+5); // for char + hex
   max_it (width, strlen (attr));
   if (y >= 0)
     {
       y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
       ch = *chr++;
       sprintf (buf, "%8x", ch);
       scr_overlay_set (0, y, buf);
       scr_overlay_set (9, y, '=');
-# if !UNICODE3
+# if !UNICODE_3
       if (ch >= 0x10000)
         ch = 0xfffd;
 # endif
       scr_overlay_set (11, y, ch, r);
     }
   display->flush ();
 }
+/* checks wether a refresh is requested and starts the refresh timer */
 void
-rxvt_term::prepare_cb (ev::prepare &w, int revents)
+rxvt_term::refresh_check ()
 {
-  make_current ();
-  display->flush ();
   if (want_refresh && !flush_ev.is_active ())
     flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
+  display->flush ();
 }
 void
 rxvt_term::flush_cb (ev::timer &w, int revents)
 {
 void
 rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
 {
   hidden_cursor = !hidden_cursor;
   want_refresh = 1;
+  refresh_check ();
 }
 #endif
 #ifdef TEXT_BLINK
 void
 {
   if (scr_refresh_rend (RS_Blink, RS_Blink))
     {
       hidden_text = !hidden_text;
       want_refresh = 1;
+      refresh_check ();
     }
   else
     w.stop ();
 }
 #endif
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
 void
 rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
 {
-  if ((scrollbar_isUp() || scrollbar_isDn()) &&
+  if ((scrollbar_isUp () || scrollbar_isDn ())
-      scr_page (scrollbar_isUp() ? UP : DN, 1))
+      && scr_page (scrollbar_isUp () ? UP : DN, 1))
+    {
-    want_refresh = 1;
+      want_refresh = 1;
+      refresh_check ();
+    }
   else
     w.stop ();
 }
 #endif
 {
   if (scr_page (scroll_selection_dir, scroll_selection_lines))
     {
       selection_extend (selection_save_x, selection_save_y, selection_save_state);
       want_refresh = 1;
+      refresh_check ();
     }
   else
     w.stop ();
 }
 #endif
 #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
 void
 rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
 {
-  if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
+  if (scr_changeview (view_start - mouse_slip_wheel_speed))
-                                 : scr_page (UP,  mouse_slip_wheel_speed))
+    {
-    want_refresh = 1;
+      want_refresh = 1;
+      refresh_check ();
+    }
   if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
     {
       mouse_slip_wheel_speed = 0;
       w.stop ();
       if (cmd_parse ())
         break;
   if (revents & ev::WRITE)
     pty_write ();
+  refresh_check ();
 }
 void
 rxvt_term::pointer_unblank ()
 {
             && ev.xfocus.mode != NotifyGrab)
           focus_out ();
         break;
       case ConfigureNotify:
-      /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
+        /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
               ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
-              szHint.width, szHint.height); */
+              szHint.width, szHint.height);*/
         if (ev.xconfigure.window == parent[0])
           {
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
               ;
               }
             else
               {
 #ifdef HAVE_BG_PIXMAP
                 if (bgPixmap.window_position_sensitive ())
+                  {
+                    if (mapped)
-                  update_background ();
+                      update_background ();
+                    else
+                      bgPixmap.invalidate ();
+                  }
 #endif
               }
             HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
           }
         break;
       case PropertyNotify:
       case SelectionRequest:
         selection_send (ev.xselectionrequest);
         break;
       case MapNotify:
+#ifdef HAVE_BG_PIXMAP
+        /* This is needed spcifically to fix the case of no window manager or a
+         * non-reparenting window manager. In those cases we never get first
+         * ConfigureNotify. Also that speeds startup under normal WM, by taking
+         * care of multiplicity of ConfigureNotify events arriwing while WM does
+         * reparenting.
+         * We should not render background immidiately, as there could be several
+         * ConfigureNotify's to follow. Lets take care of all of them in one scoop
+         * by scheduling background redraw as soon as we can, but giving a short
+         * bit of time for ConfigureNotifies to arrive.
+         * We should render background PRIOR to drawing any text, but AFTER all
+         * of ConfigureNotifys for the best results.
+         */
+        if (bgPixmap.flags & bgPixmap_t::isInvalid)
+          update_background_ev.start (0.025);
+#endif
         mapped = 1;
 #ifdef TEXT_BLINK
         text_blink_ev.start ();
 #endif
         HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
             while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
               {
                 scr_expose (ev.xexpose.x, ev.xexpose.y,
                             ev.xexpose.width, ev.xexpose.height, False);
               }
             want_refresh = 1;
           }
         else
           {
             XEvent unused_event;
             while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
               ;
             while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
               ;
-            if (isScrollbarWindow (ev.xany.window))
+            if (scrollBar.state && ev.xany.window == scrollBar.win)
               {
                 scrollBar.setIdle ();
                 scrollbar_show (0);
               }
           }
 #ifdef MOUSE_THRESHOLD
                   }
 #endif
               }
           }
-        else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
+        else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
           {
             while (XCheckTypedWindowEvent (dpy, scrollBar.win,
                                            MotionNotify, &ev))
               ;
       if (ev.type == KeyPress && hidden_pointer == 0)
         pointer_blank ();
     }
 #endif
+  refresh_check ();
 }
 void
 rxvt_term::focus_in ()
 {
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
             bgPixmap.set_root_pixmap ();
             update_background ();
           }
         break;
     }
 # endif
+  refresh_check ();
 }
 #endif
 void
 rxvt_term::button_press (XButtonEvent &ev)
     }
   /*
    * Scrollbar window processing of button press
    */
-  if (isScrollbarWindow (ev.window))
+  if (scrollBar.state && ev.window == scrollBar.win)
     {
+      int upordown = 0;
+      if (scrollBar.upButton (ev.y))
+        upordown = -1; /* up */
+      else if (scrollBar.dnButton (ev.y))
+        upordown = 1;  /* down */
       scrollBar.setIdle ();
       /*
        * Rxvt-style scrollbar:
        * move up if mouse is above slider
        * move dn if mouse is below slider
           /*
            * Mouse report disabled scrollbar:
            * arrow buttons - send up/down
            * click on scrollbar - send pageup/down
            */
-          if ((scrollBar.style == R_SB_NEXT
+          if (upordown < 0)
-               && scrollbarnext_upButton (ev.y))
-              || (scrollBar.style == R_SB_RXVT
-                  && scrollbarrxvt_upButton (ev.y)))
             tt_printf ("\033[A");
-          else if ((scrollBar.style == R_SB_NEXT
+          else if (upordown > 0)
-                    && scrollbarnext_dnButton (ev.y))
-                   || (scrollBar.style == R_SB_RXVT
-                       && scrollbarrxvt_dnButton (ev.y)))
             tt_printf ("\033[B");
           else
             switch (ev.button)
               {
                 case Button2:
         }
       else
 #endif /* NO_SCROLLBAR_REPORT */
         {
-          char upordown = 0;
-          if (scrollBar.style == R_SB_NEXT)
-            {
-              if (scrollbarnext_upButton (ev.y))
-                upordown = -1;	/* up */
-              else if (scrollbarnext_dnButton (ev.y))
-                upordown = 1;	/* down */
-            }
-          else if (scrollBar.style == R_SB_RXVT)
-            {
-              if (scrollbarrxvt_upButton (ev.y))
-                upordown = -1;	/* up */
-              else if (scrollbarrxvt_dnButton (ev.y))
-                upordown = 1;	/* down */
-            }
           if (upordown)
             {
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
               if (!cont_scroll_ev.is_active ())
                 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
             }
           else
             switch (ev.button)
               {
                 case Button2:
-                  switch (scrollbar_align)
+                  switch (scrollBar.align)
                     {
                       case R_SB_ALIGN_TOP:
                         csrO = 0;
                         break;
                       case R_SB_ALIGN_CENTRE:
                   scrollBar.setMotion ();
                   break;
                 case Button1:
-                  if (scrollbar_align == R_SB_ALIGN_CENTRE)
+                  if (scrollBar.align == R_SB_ALIGN_CENTRE)
                     csrO = ev.y - scrollBar.top;
                   /* FALLTHROUGH */
                 case Button3:
                   if (scrollBar.style != R_SB_XTERM)
                   if (!slip_wheel_ev.is_active ())
                     slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
                 }
               else
+# endif
                 {
-# endif
                   scr_page (v, i);
                   scrollbar_show (1);
-# ifdef MOUSE_SLIP_WHEELING
                 }
-# endif
             }
             break;
 #endif
         }
     }
                 // versions.
                 //
                 tt_printf ("\033[>%d;95;0c", 'U');
               }
             break;
           case '?':
             if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
               process_terminal_mode (ch, priv, nargs, arg);
             break;
         }
               *buf++ = '\0';
             process_color_seq (op, color, name, resp);
           }
         break;
+      case Rxvt_restoreFG:
       case XTerm_Color00:
         process_color_seq (op, Color_fg, str, resp);
         break;
+      case Rxvt_restoreBG:
       case XTerm_Color01:
         process_color_seq (op, Color_bg, str, resp);
         break;
 #ifndef NO_CURSORCOLOR
       case XTerm_Color_cursor:
 #if ENABLE_TRANSPARENCY
       case URxvt_Color_tint:
         process_color_seq (op, Color_tint, str, resp);
         {
           bool changed = false;
           if (ISSET_PIXCOLOR (Color_tint))
             changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
           else
             changed = bgPixmap.unset_tint ();
           if (changed)
             update_background ();
         }
         break;
                   changed++;
                 str = strchr (str, ';');
                 if (str == NULL)
                   bgPixmap.set_defaultGeometry ();
               }
             while (str)
               {
                 str++;
                 if (bgPixmap.set_geometry (str))
                   changed++;
                 str = strchr (str, ';');
               }
             if (changed)
-                update_background ();
+              update_background ();
           }
         break;
 #endif
-      case Rxvt_restoreFG:
-        set_window_color (Color_fg, str);
-        break;
-      case Rxvt_restoreBG:
-        set_window_color (Color_bg, str);
-        break;
       case XTerm_logfile:
         // TODO, when secure mode?
         break;
                  // 1037 send DEL for keypad delete NYI
                   { 1047, PrivMode_Screen },
                  // 1048 save and restore cursor
                   { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
                  // 1051, 1052, 1060, 1061 keyboard emulation NYI
+                  { 2004, PrivMode_BracketPaste },
                 };
   if (nargs == 0)
     return;
                */
               PrivMode (1, PrivMode_vt52);
               break;
             case 3:			/* 80/132 */
               if (priv_modes & PrivMode_132OK)
+                {
+                  scr_poweron ();
-                set_widthheight (((state ? 132 : 80) * fwidth), height);
+                  set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
+                }
               break;
             case 4:			/* smooth scrolling */
               set_option (Opt_jumpScroll, !state);
               break;
             case 5:			/* reverse video */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.378 by root, Fri Dec 14 02:27:54 2007 UTC vs. Revision 1.400 by ayin, Mon Jan 28 12:54:47 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.378 by root, Fri Dec 14 02:27:54 2007 UTC vs.
Revision 1.400 by ayin, Mon Jan 28 12:54:47 2008 UTC