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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.508 by sf-exg, Fri Apr 13 09:23:58 2012 UTC vs.
Revision 1.524 by root, Tue Aug 14 20:32:48 2012 UTC

   XK_KP_Space,		0x2422,
 #endif
   0,
 };
-void
+void ecb_cold
 rxvt_term::iso14755_54 (int x, int y)
 {
   x = Pixel2Col (x);
   y = Pixel2Row (y);
       text_t t = l.t[x];
       if (t != NOCHAR || !x)
         {
-          iso14755_51 (l.t[x], l.r[x], x, y);
+          iso14755_51 (l.t[x], l.r[x], x, y, view_start);
           iso14755buf = ISO_14755_54;
           break;
         }
       x--;
     }
 }
-void
+void ecb_cold
-rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
+rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
 {
   rxvt_fontset *fs = FONTSET (r);
   wchar_t *chr, *alloc, ch2, **fname;
   int len;
       alloc = 0;
       chr = &ch2;
       len = 1;
     }
+  char rowcol[40];
+  snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
   char attr[80]; // plenty
   sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
            (int)r,
       rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
       fname[i] = rxvt_utf8towcs (f->name);
       max_it (width, wcswidth (fname[i], wcslen (fname[i])));
     }
-  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;
       x = 0;
     }
-  scr_overlay_new (x, y, width, len * 2 + 1);
+  scr_overlay_new (x, y, width, len * 2 + 2);
+  scr_overlay_set (0, 0, rowcol);
   r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
   for (int y = 0; y < len; y++)
     {
       char buf[9];
       ch = *chr++;
       sprintf (buf, "%8x", ch);
-      scr_overlay_set (0, y, buf);
+      scr_overlay_set (0, y + 1, buf);
-      scr_overlay_set (9, y, '=');
+      scr_overlay_set (9, y + 1, '=');
 # if !UNICODE_3
       if (ch >= 0x10000)
         ch = 0xfffd;
 # endif
-      scr_overlay_set (11, y, ch, r);
+      scr_overlay_set (11, y + 1, ch, r);
       if (WCWIDTH (ch) >= 2)
-        scr_overlay_set (12, y, NOCHAR, r);
+        scr_overlay_set (12, y + 1, NOCHAR, r);
     }
 //  {
 //    char buf[4+4+3+1];
 //    snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
 //    scr_overlay_set (0, 0, buf);
 //  }
-  scr_overlay_set (0, len    , attr);
+  scr_overlay_set (0, len + 1, attr);
   for (int i = 0; i < len; i++)
     {
-      scr_overlay_set (0, len + 1 + i, fname[i]);
+      scr_overlay_set (0, len + 2 + i, fname[i]);
       free (fname[i]);
     }
 # if ENABLE_COMBINING
   if (alloc)
     delete [] alloc;
 # endif
 }
 #endif
-void
+void ecb_cold
 rxvt_term::commit_iso14755 ()
 {
   wchar_t ch = iso14755buf & ISO_14755_MASK;
   if (iso14755buf & ISO_14755_51)
     }
   iso14755buf = 0;
 }
-static int
+static int ecb_cold
 hex_keyval (XKeyEvent &ev)
 {
   // check whether this event corresponds to a hex digit
   // if the modifiers had not been pressed.
   for (int index = 0; index < 8; index++)
   return -1;
 }
 #endif
-static inline KeySym
+static inline KeySym ecb_cold
 translate_keypad (KeySym keysym, bool kp)
 {
 #ifdef XK_KP_Home
   static const KeySym keypadtrans[] = {
     XK_KP_7, // XK_KP_Home
 # endif
 #endif
   return keysym;
 }
-static inline int
+static inline int ecb_cold
 map_function_key (KeySym keysym)
 {
   int param = 0;
   if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
           break;
       }
   return param;
 }
-void
+void ecb_cold
 rxvt_term::key_press (XKeyEvent &ev)
 {
   int ctrl, meta, shft, len;
   KeySym keysym;
   int valid_keysym;
   ctrl = ev.state & ControlMask;
   meta = ev.state & ModMetaMask;
   kbuf[0] = 0;
-#ifdef USE_XIM
+#if USE_XIM
   if (Input_Context)
     {
       Status status_return;
 #if 0
     }
   tt_write (kbuf, (unsigned int)len);
 }
-void
+void ecb_cold
 rxvt_term::key_release (XKeyEvent &ev)
 {
 #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
   KeySym keysym;
           while (row < end_row);
         }
       scr_refresh ();
       scrollBar.show (1);
-#ifdef USE_XIM
+#if USE_XIM
       im_send_spot ();
 #endif
     }
   display->flush ();
     pty_write ();
   refresh_check ();
 }
-void
+void ecb_cold
 rxvt_term::pointer_unblank ()
 {
   XDefineCursor (dpy, vt, TermWin_cursor);
   recolour_cursor ();
     pointer_ev.start (pointerBlankDelay);
 #endif
 }
 #ifdef POINTER_BLANK
-void
+void ecb_cold
 rxvt_term::pointer_blank ()
 {
   if (!option (Opt_pointerBlank))
     return;
   XFlush (dpy);
   hidden_pointer = 1;
 }
-void
+void ecb_cold
 rxvt_term::pointer_cb (ev::timer &w, int revents)
 {
   make_current ();
   pointer_blank ();
               32 + x,
               32 + y);
 }
 /*{{{ process an X event */
-void
+void ecb_hot
 rxvt_term::x_cb (XEvent &ev)
 {
   make_current ();
   dLocal (Display *, dpy);
         if (ev.xconfigure.window == parent)
           {
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
               ;
+            bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
+            bool moved = false;
 #ifdef HAVE_BG_PIXMAP
-            bool moved = false;
             if (bg_window_position_sensitive ())
               {
+                want_position_change = true;
+                if (!(bg_flags & BG_IS_VALID))
+                  moved = true;
+              }
+#endif
+            if (want_position_change)
+              {
                 int x, y;
                 if (ev.xconfigure.send_event)
                   {
                     x = ev.xconfigure.x;
                     y = ev.xconfigure.y;
                   }
                 else
                   get_window_origin (x, y);
-                if (bg_set_position (x, y)
+                if (x != parent_x || y != parent_y)
-                    || !(bg_flags & BG_IS_VALID))
+                  {
+                    parent_x = x;
+                    parent_y = y;
+                    HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
-                  moved = true;
+                    moved = true;
+                  }
               }
-#endif
             if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
               {
                 seen_resize = 1;
                 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
   refresh_check ();
 }
 #if ENABLE_FRILLS
-void
+void ecb_cold
 rxvt_term::set_urgency (bool enable)
 {
   if (enable == urgency_hint)
     return;
       XFree (h);
     }
 }
 #endif
-void
+void ecb_cold
 rxvt_term::focus_in ()
 {
   if (!focus)
     {
       focus = 1;
       HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
     }
 }
-void
+void ecb_cold
 rxvt_term::focus_out ()
 {
   if (focus)
     {
       focus = 0;
       HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
     }
 }
-void
+void ecb_cold
 rxvt_term::update_fade_color (unsigned int idx)
 {
 #if OFF_FOCUS_FADING
   if (rs[Rs_fade])
     {
     }
 #endif
 }
 #if ENABLE_TRANSPARENCY || ENABLE_PERL
-void
+void ecb_hot
 rxvt_term::rootwin_cb (XEvent &ev)
 {
   make_current ();
   if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
       && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
     return;
-# if ENABLE_TRANSPARENCY
   switch (ev.type)
     {
       case PropertyNotify:
         /*
          * if user used some Esetroot compatible prog to set the root bg,
          * 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])
           {
+# if ENABLE_TRANSPARENCY
             bg_set_root_pixmap ();
             update_background ();
+#endif
+#if ENABLE_PERL
+            HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
+#endif
           }
         break;
     }
-# endif
   refresh_check ();
 }
 #endif
     }
 }
 /*}}} */
-void
+void ecb_hot
 rxvt_term::cmd_parse ()
 {
   wchar_t ch = NOCHAR;
   char *seq_begin; // remember start of esc-sequence here
         }
     }
 }
 // read the next character
-wchar_t
+wchar_t ecb_hot
 rxvt_term::next_char () NOTHROW
 {
   while (cmdbuf_ptr < cmdbuf_endp)
     {
       // assume 7-bit to be ascii ALWAYS
         }
       if (len == (size_t)-1)
         {
           mbstate.reset (); // reset now undefined conversion state
+          // a -1 might indicate that a previous incomplet char is invalid (previous return -2)
+          // in which case we "errornously" return the next byte which might be valid.
           return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
         }
       // assume wchar == unicode
       cmdbuf_ptr += len;
   return NOCHAR;
 }
 // read the next octet
-uint32_t
+uint32_t ecb_hot
 rxvt_term::next_octet () NOTHROW
 {
   return cmdbuf_ptr < cmdbuf_endp
          ? (unsigned char)*cmdbuf_ptr++
          : NOCHAR;
 }
 static class out_of_input out_of_input;
-wchar_t
+wchar_t ecb_hot
 rxvt_term::cmd_getc () THROW ((class out_of_input))
 {
   wchar_t c = next_char ();
   if (c == NOCHAR)
     throw out_of_input;
   return c;
 }
-uint32_t
+uint32_t ecb_hot
 rxvt_term::cmd_get8 () THROW ((class out_of_input))
 {
   uint32_t c = next_octet ();
   if (c == NOCHAR)
 }
 /*{{{ print pipe */
 /*----------------------------------------------------------------------*/
 #ifdef PRINTPIPE
-FILE *
+FILE * ecb_cold
 rxvt_term::popen_printer ()
 {
   FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
   if (stream == NULL)
     rxvt_warn ("can't open printer pipe, not printing.\n");
   return stream;
 }
-int
+int ecb_cold
 rxvt_term::pclose_printer (FILE *stream)
 {
   fflush (stream);
   return pclose (stream);
 }
 /*
  * simulate attached vt100 printer
  */
-void
+void ecb_cold
 rxvt_term::process_print_pipe ()
 {
   FILE *fd = popen_printer ();
   if (!fd)
   C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
   C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
 };
 /*{{{ process non-printing single characters */
-void
+void ecb_hot
 rxvt_term::process_nonprinting (unicode_t ch)
 {
   switch (ch)
     {
       case C0_ESC:
 }
 /*}}} */
 /*{{{ process VT52 escape sequences */
-void
+void ecb_cold
 rxvt_term::process_escape_vt52 (unicode_t ch)
 {
   int row, col;
   switch (ch)
 }
 /*}}} */
 /*{{{ process escape sequences */
-void
+void ecb_hot
 rxvt_term::process_escape_seq ()
 {
   unicode_t ch = cmd_getc ();
   if (priv_modes & PrivMode_vt52)
     make_byte (0,0,1,1,0,0,0,0),	/* h, i, j, k, l, m, n, o, */
     make_byte (0,0,0,0,0,0,0,0),	/* p, q, r, s, t, u, v, w, */
     make_byte (0,0,0,0,0,0,0,0),	/* x, y, z, {, |, }, ~,    */
   };
-void
+void ecb_hot
 rxvt_term::process_csi_seq ()
 {
   unicode_t ch, priv, i;
   unsigned int nargs, p;
   int n, ndef;
         process_color_seq (op, Color_tint, str, resp);
         {
           bool changed = false;
           if (ISSET_PIXCOLOR (Color_tint))
-            changed = bg_set_tint (pix_colors_focused [Color_tint]);
+            changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
           if (changed)
             update_background ();
         }
 #if BG_IMAGE_FROM_FILE
       case Rxvt_Pixmap:
         if (!strcmp (str, "?"))
           {
             char str[256];
+            int h_scale = fimage.h_scale;
+            int v_scale = fimage.v_scale;
+            int h_align = fimage.h_align;
+            int v_align = fimage.v_align;
             sprintf (str, "[%dx%d+%d+%d]",
-                     min (h_scale, 32767), min (v_scale, 32767),
+                     h_scale, v_scale,
-                     min (h_align, 32767), min (v_align, 32767));
+                     h_align, v_align);
             process_xterm_seq (XTerm_title, str, CHAR_ST);
           }
         else
           {
             bool changed = false;
             if (*str != ';')
               {
-                if (bg_set_file (str))	/* change pixmap */
+                try
+                  {
+                    fimage.set_file_geometry (this, str);
-                  changed = true;
+                    changed = true;
+                  }
+                catch (const class rxvt_failure_exception &e)
+                  {
+                  }
               }
             else
               {
                 str++;
-                if (bg_set_geometry (str, true))
+                if (fimage.set_geometry (str, true))
                   changed = true;
               }
             if (changed)
               {
                 if (bg_window_position_sensitive ())
                   {
                     int x, y;
                     get_window_origin (x, y);
-                    bg_set_position (x, y);
+                    parent_x = x;
+                    parent_y = y;
                   }
                 update_background ();
               }
           }
         break;
  *      's' = save
  *      'r' = restore
  *      't' = toggle
  * so no need for fancy checking
  */
-int
+int ecb_cold
 rxvt_term::privcases (int mode, unsigned long bit)
 {
   int state;
   if (mode == 's')
     }
 }
 /*}}} */
 /*{{{ process sgr sequences */
-void
+void ecb_hot
 rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
 {
   unsigned int i;
   short rendset;
   int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.508 by sf-exg, Fri Apr 13 09:23:58 2012 UTC vs. Revision 1.524 by root, Tue Aug 14 20:32:48 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.508 by sf-exg, Fri Apr 13 09:23:58 2012 UTC vs.
Revision 1.524 by root, Tue Aug 14 20:32:48 2012 UTC