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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.528 by sf-exg, Sat Dec 29 15:59:51 2012 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 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-2011 Marc Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2003-2014 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
           break;
       }
   return param;
 }
+static inline wchar_t *
+rxvt_wcsdup (const wchar_t *str, int len)
+{
+  wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
+  memcpy (r, str, len * sizeof (wchar_t));
+  r[len] = 0;
+  return r;
+}
 void ecb_cold
 rxvt_term::key_press (XKeyEvent &ev)
 {
   int ctrl, meta, shft, len;
   KeySym keysym;
 #endif
               max_it (lnsppg, 1);
               if (keysym == XK_Prior)
                 {
-                  scr_page (UP, lnsppg);
+                  scr_page (lnsppg);
                   return;
                 }
               else if (keysym == XK_Next)
                 {
-                  scr_page (DN, lnsppg);
+                  scr_page (-lnsppg);
                   return;
                 }
             }
 #ifdef SCROLL_ON_UPDOWN_KEYS
           if (IS_SCROLL_MOD)
             {
               if (keysym == XK_Up)
                 {
-                  scr_page (UP, 1);
+                  scr_page (1);
                   return;
                 }
               else if (keysym == XK_Down)
                 {
-                  scr_page (DN, 1);
+                  scr_page (-1);
                   return;
                 }
             }
 #endif
 #ifdef SCROLL_ON_HOMEEND_KEYS
           if (IS_SCROLL_MOD)
             {
               if (keysym == XK_Home)
                 {
-                  scr_move_to (0, 1);
+                  scr_changeview (top_row);
                   return;
                 }
               else if (keysym == XK_End)
                 {
-                  scr_move_to (1, 1);
+                  scr_changeview (0);
                   return;
                 }
             }
 #endif
         }
                   case XK_KP_Subtract:	/* Shift+KP_Subtract = smaller font */
                     return;
 #endif
                 }
             }
+        }
+      if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
+        {
+          if (keysym == XK_v)
+            selection_request (ev.time, Sel_Clipboard);
+          else if (selection.len > 0)
+            {
+              free (selection.clip_text);
+              selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
+              selection.clip_len = selection.len;
+              selection_grab (CurrentTime, true);
+            }
+          return;
         }
 #if ENABLE_FRILLS || ISO_14755
       // ISO 14755 support
       if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
 #ifdef SELECTION_SCROLLING
 void
 rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
 {
-  if (scr_page (scroll_selection_dir, scroll_selection_lines))
+  if (scr_page (scroll_selection_lines))
     {
       selection_extend (selection_save_x, selection_save_y, selection_save_state);
       want_refresh = 1;
       refresh_check ();
     }
 #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
 void
 rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
 {
-  if (scr_changeview (view_start - mouse_slip_wheel_speed))
+  if (scr_page (mouse_slip_wheel_speed))
     {
       want_refresh = 1;
       refresh_check ();
     }
             bool moved = false;
 #ifdef HAVE_BG_PIXMAP
             if (bg_window_position_sensitive ())
               {
                 want_position_change = true;
-                if (!(bg_flags & BG_IS_VALID))
+                if (bg_img == 0)
                   moved = true;
               }
 #endif
             if (want_position_change)
         selection_send (ev.xselectionrequest);
         break;
       case MapNotify:
 #ifdef HAVE_BG_PIXMAP
-        /* This is needed specifically to fix the case of no window manager or a
+        // This is needed at startup for the case of no window manager
-         * non-reparenting window manager. In those cases we never get first
+        // or a non-reparenting window manager and also because we
-         * ConfigureNotify. Also that speeds startup under normal WM, by taking
+        // defer bg image updates if the window is not mapped. The
-         * care of multiplicity of ConfigureNotify events arriving while WM does
+        // short delay is to optimize for multiple ConfigureNotify
-         * reparenting.
+        // events at startup when the window manager reparents the
-         * We should not render background immediately, as there could be several
+        // window, so as to perform the computation after we have
-         * ConfigureNotify's to follow. Lets take care of all of them in one scoop
+        // received all of them.
-         * by scheduling background redraw as soon as we can, but giving a short
+        if (bg_img == 0)
-         * 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 (!(bg_flags & BG_IS_VALID))
           update_background_ev.start (0.025);
 #endif
         mapped = 1;
 #ifdef TEXT_BLINK
         text_blink_ev.start ();
 #ifdef SELECTION_SCROLLING
                     if (ev.xbutton.y < int_bwidth
                         || Pixel2Row (ev.xbutton.y) > (nrow-1))
                       {
+                        page_dirn scroll_selection_dir;
                         int dist;
                         /* don't clobber the current delay if we are
                          * already in the middle of scrolling.
                          */
                         scroll_selection_lines = Pixel2Height (dist)
                                                  / SELECTION_SCROLL_LINE_SPEEDUP
                                                  + 1;
                         min_it (scroll_selection_lines,
                                 SELECTION_SCROLL_MAX_LINES);
+                        scroll_selection_lines *= scroll_selection_dir;
                       }
                     else
                       {
                         /* we are within the text window, so we
                          * shouldn't be scrolling
          */
         if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
 #if BG_IMAGE_FROM_ROOT
-            bg_set_root_pixmap ();
+            if (option (Opt_transparent))
+              {
+                rxvt_img::new_from_root (this)->replace (root_img);
-            update_background ();
+                update_background ();
+              }
 #endif
-#if ENABLE_PERL
             HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
-#endif
           }
         break;
     }
 #ifdef MOUSE_WHEEL
           case Button4:
           case Button5:
             {
-              int i;
+              int lines;
-              page_dirn v;
+              page_dirn dirn;
-              v = ev.button == Button4 ? UP : DN;
+              dirn = ev.button == Button4 ? UP : DN;
               if (ev.state & ShiftMask)
-                i = 1;
+                lines = 1;
               else if (option (Opt_mouseWheelScrollPage))
-                i = nrow - 1;
+                lines = nrow - 1;
               else
-                i = 5;
+                lines = 5;
 # ifdef MOUSE_SLIP_WHEELING
               if (ev.state & ControlMask)
                 {
-                  mouse_slip_wheel_speed += v ? -1 : 1;
+                  mouse_slip_wheel_speed += dirn;
-                  if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
+                  clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
-                  if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
                   if (!slip_wheel_ev.is_active ())
                     slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
                 }
               else
 # endif
                 {
-                  scr_page (v, i);
+                  scr_page (dirn, lines);
                   scrollBar.show (1);
                 }
             }
             break;
 #endif
   };
 void ecb_hot
 rxvt_term::process_csi_seq ()
 {
-  unicode_t ch, priv, i;
+  unicode_t ch, priv, prev_ch, i;
   unsigned int nargs, p;
   int n, ndef;
   int arg[ESC_ARGS] = { };
   nargs = 0;
       /* '<' '=' '>' '?' '!' */
       priv = ch;
       ch = cmd_getc ();
     }
+  prev_ch = 0;
   /* read any numerical arguments */
   for (n = -1; ch < CSI_ICH; )
     {
       if (isdigit (ch))
         {
           n = -1;
         }
       else if (IS_CONTROL (ch))
         process_nonprinting (ch);
+      prev_ch = ch;
       ch = cmd_getc ();
     }
   if (ch > CSI_7F)
     return;
           scr_insert_mode (1);
         else if (arg[0] == 20)
           priv_modes |= PrivMode_LFNL;
         break;
+      case CSI_71:		// DESCUSR: set cursor style
+        if (prev_ch == ' ')
+          set_cursor_style (arg[0]);
+        break;
         /*
          * PRIVATE USE beyond this point.  All CSI_7? sequences here
          */
       case CSI_72:		/* DECSTBM: set top and bottom margins */
         if (nargs == 1)
 rxvt_term::get_to_st (unicode_t &ends_how)
 {
   unicode_t ch;
   bool seen_esc = false;
   unsigned int n = 0;
-  wchar_t string[STRING_MAX];
+  wchar_t string[CBUFSIZ];
   while ((ch = cmd_getc ()) != NOCHAR)
     {
       if (seen_esc)
         {
       else if (ch < 0x20)
         return NULL;	/* other control character - exit */
       seen_esc = false;
-      if (n >= STRING_MAX - 1)
+      if (n >= sizeof (string) - 1)
         // stop at some sane length
         return NULL;
       string[n++] = ch;
     }
                                        &nitems, &bytes_after, &value) == Success
                 && actual_type != None
                 && actual_format == 8)
               str = (const char *)(value);
-            tt_printf ("\033]%d;%s%c", op, str, resp);
+            tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
             XFree (value);
           }
         else
           {
             break;
 #endif
         }
     }
 }
+void
+rxvt_term::set_cursor_style (int style)
+{
+  if (!IN_RANGE_INC (style, 0, 4))
+    return;
+  set_option (Opt_cursorUnderline, style >= 3);
+#ifdef CURSOR_BLINK
+  set_option (Opt_cursorBlink, !style || (style & 1));
+  cursor_blink_reset ();
+#endif
+  want_refresh = 1;
+}
 /*}}} */
 /* ------------------------------------------------------------------------- */
 /*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.528 by sf-exg, Sat Dec 29 15:59:51 2012 UTC vs. Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.528 by sf-exg, Sat Dec 29 15:59:51 2012 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC