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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.504 by sf-exg, Mon Jan 9 21:12:08 2012 UTC vs.
Revision 1.514 by root, Mon Jun 4 15:18:52 2012 UTC

 #ifdef KEYSYM_RESOURCE
 # include "keyboard.h"
 #endif
-#include <csignal>
+#include <signal.h>
 #if LINUX_YIELD_HACK
-# include <ctime>
+# include <time.h>
 #endif
 /*----------------------------------------------------------------------*/
 #define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
   XK_KP_Space,		0x2422,
 #endif
   0,
 };
-void
+void ecb_cold
 rxvt_term::iso14755_54 (int x, int y)
 {
   x = Pixel2Col (x);
   y = Pixel2Row (y);
       x--;
     }
 }
-void
+void ecb_cold
 rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
 {
   rxvt_fontset *fs = FONTSET (r);
   wchar_t *chr, *alloc, ch2, **fname;
   int len;
     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 ();
   refresh_count = 0;
   flush ();
 }
 #ifdef CURSOR_BLINK
+void
+rxvt_term::cursor_blink_reset ()
+{
+  if (hidden_cursor)
+    {
+      hidden_cursor = 0;
+      want_refresh = 1;
+    }
+  if (option (Opt_cursorBlink))
+    cursor_blink_ev.again ();
+  else
+    cursor_blink_ev.stop ();
+}
 void
 rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
 {
   hidden_cursor = !hidden_cursor;
   want_refresh = 1;
     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);
           }
         break;
     }
 #if defined(CURSOR_BLINK)
-  if (option (Opt_cursorBlink) && ev.type == KeyPress)
+  if (ev.type == KeyPress)
-    {
-      if (hidden_cursor)
-        {
-          hidden_cursor = 0;
-          want_refresh = 1;
-        }
-      cursor_blink_ev.again ();
+    cursor_blink_reset ();
-    }
 #endif
 #if defined(POINTER_BLANK)
   if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
     {
   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)
     }
 }
 /*}}} */
-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
   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 = 0, v_scale = 0;
+            int h_align = 0, v_align = 0;
+            if (image_vec.size () > 0)
+              {
+                h_scale = image_vec[0].h_scale;
+                v_scale = image_vec[0].v_scale;
+                h_align = image_vec[0].h_align;
+                v_align = image_vec[0].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 */
+                if (image_vec.size () > 0)
+                  changed = image_vec[0].set_file_geometry (str);
+                else
+                  {
+                    rxvt_image *image = new_image ();
+                    if (!image->set_file_geometry (str))
+                      image_vec.pop_back ();
+                    else
-                  changed = true;
+                      changed = true;
+                  }
               }
             else
               {
                 str++;
+                if (image_vec.size () > 0)
-                if (bg_set_geometry (str, true))
+                  changed = image_vec[0].set_geometry (str, true);
-                  changed = true;
               }
             if (changed)
               {
                 if (bg_window_position_sensitive ())
  *      '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')
     {
-      SavedModes |= (priv_modes & bit);
+      if (priv_modes & bit)
+        SavedModes |= bit;
+      else
+        SavedModes &= ~bit;
       return -1;
     }
   else
     {
       if (mode == 'r')
     }
 }
 /*}}} */
 /*{{{ 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.504 by sf-exg, Mon Jan 9 21:12:08 2012 UTC vs. Revision 1.514 by root, Mon Jun 4 15:18:52 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.504 by sf-exg, Mon Jan 9 21:12:08 2012 UTC vs.
Revision 1.514 by root, Mon Jun 4 15:18:52 2012 UTC