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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC

  * 				- extensive modifications
  * 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) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
  * 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
 rxvt_term::flush ()
 {
   flush_ev.stop ();
 #ifdef HAVE_BG_PIXMAP
-  if (bgPixmap.flags & bgPixmap_t::hasChanged)
+  if (bg_flags & BG_NEEDS_REFRESH)
     {
-      bgPixmap.flags &= ~bgPixmap_t::hasChanged;
+      bg_flags &= ~BG_NEEDS_REFRESH;
       scr_touch (false);
     }
 #endif
   if (want_refresh)
 rxvt_term::pty_fill ()
 {
   ssize_t n = cmdbuf_endp - cmdbuf_ptr;
   if (CBUFSIZ == n)
-    {
+    n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
-      rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
-      n = 0;
-    }
   memmove (cmdbuf_base, cmdbuf_ptr, n);
   cmdbuf_ptr = cmdbuf_base;
   cmdbuf_endp = cmdbuf_ptr + n;
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
               ;
 #ifdef HAVE_BG_PIXMAP
             bool moved = false;
-            if (bgPixmap.window_position_sensitive ())
+            if (bg_window_position_sensitive ())
               {
                 int x, y;
                 if (ev.xconfigure.send_event)
                   {
                     x = ev.xconfigure.x;
                     y = ev.xconfigure.y;
                   }
                 else
                   get_window_origin (x, y);
-                if (bgPixmap.set_position (x, y)
+                if (bg_set_position (x, y)
-                    || (bgPixmap.flags & bgPixmap_t::isInvalid))
+                    || !(bg_flags & BG_IS_VALID))
                   moved = true;
               }
 #endif
             if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
                 if (moved)
                   {
                     if (mapped)
                       update_background ();
                     else
-                      bgPixmap.invalidate ();
+                      bg_invalidate ();
                   }
 #endif
               }
             HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
           }
         break;
       case PropertyNotify:
-        if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
+        HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
-          if (ev.xproperty.atom == xa[XA_VT_SELECTION]
-              && ev.xproperty.state == PropertyNewValue)
-            selection_property (ev.xproperty.window, ev.xproperty.atom);
         break;
       case SelectionClear:
         selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
-        break;
-      case SelectionNotify:
-        if (selection_wait == Sel_normal)
-          selection_paste (ev.xselection.requestor, ev.xselection.property, true);
         break;
       case SelectionRequest:
         selection_send (ev.xselectionrequest);
         break;
          * 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)
+        if (!(bg_flags & BG_IS_VALID))
           update_background_ev.start (0.025);
 #endif
         mapped = 1;
 #ifdef TEXT_BLINK
         text_blink_ev.start ();
         if (ev.xany.window == vt)
           {
             do
               {
                 scr_expose (ev.xexpose.x, ev.xexpose.y,
-                            ev.xexpose.width, ev.xexpose.height, False);
+                            ev.xexpose.width, ev.xexpose.height, false);
               }
             while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
             ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
             while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
               {
                 scr_expose (ev.xexpose.x, ev.xexpose.y,
-                            ev.xexpose.width, ev.xexpose.height, False);
+                            ev.xexpose.width, ev.xexpose.height, false);
               }
             want_refresh = 1;
           }
         else
          * use the property to determine the pixmap.  We use it later on.
          */
         if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
-            bgPixmap.set_root_pixmap ();
+            bg_set_root_pixmap ();
             update_background ();
           }
         break;
     }
         }
         break;
         /* kidnapped escape sequence: Should be 8.3.48 */
       case C1_ESA:		/* ESC G */
-        process_graphics ();
+        // used by original rxvt for rob nations own graphics mode
+        if (cmd_getc () == 'Q')
+          tt_printf ("\033G0\012");	/* query graphics - no graphics */
         break;
         /* 8.3.63: CHARACTER TABULATION SET */
       case C1_HTS:		/* ESC H */
         scr_set_tab (1);
         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]);
+            changed = bg_set_tint (pix_colors_focused [Color_tint]);
           if (changed)
             update_background ();
         }
         if (!strcmp (str, "?"))
           {
             char str[256];
             sprintf (str, "[%dx%d+%d+%d]",
-                     min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
+                     min (h_scale, 32767), min (v_scale, 32767),
-                     min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
+                     min (h_align, 32767), min (v_align, 32767));
             process_xterm_seq (XTerm_title, str, CHAR_ST);
           }
         else
           {
             int changed = 0;
             if (*str != ';')
               {
-                if (bgPixmap.set_file (str))	/* change pixmap */
+                if (bg_set_file (str))	/* change pixmap */
                   {
                     changed++;
                     str = strchr (str, ';');
                     if (str == NULL)
-                      bgPixmap.set_defaultGeometry ();
+                      bg_set_default_geometry ();
                     else
-                      bgPixmap.set_geometry (str+1);
+                      bg_set_geometry (str+1);
                   }
               }
             else
               {
                 str++;
-                if (bgPixmap.set_geometry (str, true))
+                if (bg_set_geometry (str, true))
                   changed++;
               }
             if (changed)
               {
-                if (bgPixmap.window_position_sensitive ())
+                if (bg_window_position_sensitive ())
                   {
                     int x, y;
                     get_window_origin (x, y);
-                    bgPixmap.set_position (x, y);
+                    bg_set_position (x, y);
                   }
                 update_background ();
               }
           }
         break;
         }
     }
 }
 /*}}} */
-/*{{{ (do not) process Rob Nation's own graphics mode sequences */
-void
-rxvt_term::process_graphics ()
-{
-  unicode_t ch, cmd = cmd_getc ();
-  if (cmd == 'Q')
-    {
-      /* query graphics */
-      tt_printf ("\033G0\012");	/* no graphics */
-      return;
-    }
-  /* swallow other graphics sequences until terminating ':' */
-  do
-    ch = cmd_getc ();
-  while (ch != ':');
-}
-/*}}} */
 /* ------------------------------------------------------------------------- */
 /*
  * Send printf () formatted output to the command.
  * Only use for small amounts of data.

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs. Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 2011 UTC