ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC

… …
464 { 464 {
465 switch (keysym) 465 switch (keysym)
466 { 466 {
467 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 469 selection_request (ev.time);
470 return; 470 return;
471#if TODO 471#if TODO
472 /* rxvt extras */ 472 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
919#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
921} 921}
922/*}}} */ 922/*}}} */
923 923
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 925unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 927{
930 unsigned int n, s; 928 unsigned int n, s;
931 929
… …
1008 while (l->is_longer () && row < end_row); 1006 while (l->is_longer () && row < end_row);
1009 } 1007 }
1010 while (row < end_row); 1008 while (row < end_row);
1011 } 1009 }
1012 1010
1013 scr_refresh (refresh_type); 1011 scr_refresh ();
1014 scrollbar_show (1); 1012 scrollbar_show (1);
1015#ifdef USE_XIM 1013#ifdef USE_XIM
1016 IMSendSpot (); 1014 IMSendSpot ();
1017#endif 1015#endif
1018 } 1016 }
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1069{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1072 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1073 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1075 }
1079} 1076}
1080#endif 1077#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1082{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1084 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1086 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1088 }
1093} 1089}
1094#endif 1090#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1099 {
1104 if (view_start == top_row || view_start == 0) 1100 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1106 1102
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1103 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1105 }
1111} 1106}
1112#endif 1107#endif
… …
1142 1137
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1146 1141
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1143
1149 if (r > 0) 1144 if (r > 0)
1150 { 1145 {
1151 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1152 return true; 1147 return true;
… …
1306 make_current (); 1301 make_current ();
1307 1302
1308 dDisp; 1303 dDisp;
1309 1304
1310 if (ev.xany.window == vt 1305 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1308 return;
1313 1309
1314 // for XQueryPointer 1310 // for XQueryPointer
1315 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
… …
1506 { 1502 {
1507 seen_resize = 1; 1503 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 } 1505 }
1510 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1512 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1513 check_our_parents (); 1511 check_our_parents ();
1514#endif 1512#endif
1515 } 1513 }
… …
1586 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1587 { 1585 {
1588 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1589 scrollbar_show (0); 1587 scrollbar_show (0);
1590 } 1588 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595 1589
1596#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1599#endif 1593#endif
… …
1603 case MotionNotify: 1597 case MotionNotify:
1604#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1599 if (hidden_pointer)
1606 pointer_unblank (); 1600 pointer_unblank ();
1607#endif 1601#endif
1608#if MENUBAR
1609 if (isMenuBarWindow (ev.xany.window))
1610 {
1611 menubar_control (ev.xbutton);
1612 break;
1613 }
1614#endif
1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1603 break;
1617 1604
1618 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1619 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1609 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1611 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1625 ; 1613 ;
… …
2096 } 2084 }
2097 } 2085 }
2098 2086
2099 return; 2087 return;
2100 } 2088 }
2101
2102#if MENUBAR
2103 /*
2104 * Menubar window processing of button press
2105 */
2106 if (isMenuBarWindow (ev.window))
2107 menubar_control (ev);
2108#endif
2109} 2089}
2110 2090
2111void 2091void
2112rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2113{ 2093{
… …
2119 2099
2120 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2121 { 2101 {
2122 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2123 scrollbar_show (0); 2103 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2104 }
2128 2105
2129#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2178 { 2155 {
2179 case Button1: 2156 case Button1:
2180 case Button3: 2157 case Button3:
2181 selection_make (ev.time); 2158 selection_make (ev.time);
2182 break; 2159 break;
2160
2183 case Button2: 2161 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width)
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2184 selection_request (ev.time, ev.x, ev.y); 2164 selection_request (ev.time);
2165
2185 break; 2166 break;
2167
2186#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2187 case Button4: 2169 case Button4:
2188 case Button5: 2170 case Button5:
2189 { 2171 {
2190 int i; 2172 int i;
… …
2222 } 2204 }
2223 break; 2205 break;
2224#endif 2206#endif
2225 } 2207 }
2226 } 2208 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2209}
2232 2210
2233#ifdef TRANSPARENT 2211#ifdef TRANSPARENT
2234#if TINTING 2212#if TINTING
2235/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
… …
2778 } 2756 }
2779 2757
2780 // scr_add_lines only works for nlines <= nrow - 1. 2758 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2759 if (nlines >= nrow - 1)
2782 { 2760 {
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2763 scr_add_lines (buf, str - buf, nlines);
2785 2764
2786 nlines = 0; 2765 nlines = 0;
2787 str = buf; 2766 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2767 eol = str + min (ncol, UBUFSIZ);
… …
2803 2782
2804 seq_begin = cmdbuf_ptr; 2783 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2784 ch = next_char ();
2806 } 2785 }
2807 2786
2787 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2788 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2809 scr_add_lines (buf, str - buf, nlines); 2789 scr_add_lines (buf, str - buf, nlines);
2810 2790
2811 /* 2791 /*
2812 * If there have been a lot of new lines, then update the screen 2792 * If there have been a lot of new lines, then update the screen
2813 * What the heck I'll cheat and only refresh less than every page-full. 2793 * What the heck I'll cheat and only refresh less than every page-full.
… …
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++; 2800 refresh_limit++;
2821 else 2801 else
2822 { 2802 {
2823 flag = true; 2803 flag = true;
2824 scr_refresh (refresh_type); 2804 scr_refresh ();
2825 want_refresh = 1; 2805 want_refresh = 1;
2826 } 2806 }
2827 } 2807 }
2828 2808
2829 } 2809 }
… …
3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3771 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792 */ 3772 */
3793void 3773void
3794rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3774rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795{ 3775{
3796 int changed = 0;
3797 int color; 3776 int color;
3798 char *buf, *name; 3777 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1]; 3778 bool query = str[0] == '?' && !str[1];
3800 int saveop = op; 3779 int saveop = op;
3801 dDisp; 3780 dDisp;
… …
3917 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3918 break; 3897 break;
3919#endif 3898#endif
3920 3899
3921 case Rxvt_Pixmap: 3900 case Rxvt_Pixmap:
3901 {
3922 if (*str != ';') 3902 if (*str != ';')
3923 { 3903 {
3924#if XPM_BACKGROUND 3904#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3905 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3906 set_bgPixmap (str); /* change pixmap */
3927 scr_touch (true); 3907 scr_touch (true);
3928#endif 3908#endif
3929 } 3909 }
3930 3910
3911 int changed = 0;
3912
3931 while ((str = strchr (str, ';')) != NULL) 3913 while ((str = strchr (str, ';')) != NULL)
3932 { 3914 {
3933 str++; 3915 str++;
3934#if XPM_BACKGROUND 3916#if XPM_BACKGROUND
3935 changed += scale_pixmap (str); 3917 changed += scale_pixmap (str);
3936#endif 3918#endif
3937 } 3919 }
3938 3920
3939 if (changed) 3921 if (changed)
3940 { 3922 {
3941#ifdef XPM_BACKGROUND 3923#ifdef XPM_BACKGROUND
3942 resize_pixmap (); 3924 resize_pixmap ();
3943 scr_touch (true); 3925 scr_touch (true);
3944#endif 3926#endif
3945 } 3927 }
3928 }
3946 break; 3929 break;
3947 3930
3948 case Rxvt_restoreFG: 3931 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3932 set_window_color (Color_fg, str);
3950 break; 3933 break;
… …
3954 3937
3955 case XTerm_logfile: 3938 case XTerm_logfile:
3956 // TODO, when secure mode? 3939 // TODO, when secure mode?
3957 break; 3940 break;
3958 3941
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0 3942#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3943 case Rxvt_dumpscreen: /* no error notices */
3967 { 3944 {
3968 int fd; 3945 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3946 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4002 if (query) 3979 if (query)
4003 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4004 else 3981 else
4005 { 3982 {
4006 set_locale (str); 3983 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3984 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3985 init_xlocale ();
4009 } 3986 }
4010 break; 3987 break;
4011 3988
4012 case URxvt_view_up: 3989 case URxvt_view_up:
… …
4086 { 5, PrivMode_rVideo }, 4063 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 4064 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 4065 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 4066 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 4067 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 4068 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 4069 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 4070#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 4071 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 4072#endif
… …
4193 /* case 8: - auto repeat, can't do on a per window basis */ 4167 /* case 8: - auto repeat, can't do on a per window basis */
4194 case 9: /* X10 mouse reporting */ 4168 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 4169 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 4170 priv_modes &= ~PrivMode_MouseX11;
4197 break; 4171 break;
4198#ifdef menuBar_esc
4199 case menuBar_esc:
4200#ifdef MENUBAR
4201 map_menuBar (state);
4202#endif
4203 break;
4204#endif
4205#ifdef scrollBar_esc 4172#ifdef scrollBar_esc
4206 case scrollBar_esc: 4173 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 4174 if (scrollbar_mapping (state))
4208 { 4175 {
4209 resize_all_windows (0, 0, 0); 4176 resize_all_windows (0, 0, 0);
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 4421rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 4422{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4423 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return; 4424 return;
4458 4425
4459 if (pty.pty < 0) 4426 if (pty->pty < 0)
4460 return; 4427 return;
4461 4428
4462 if (v_buflen == 0) 4429 if (v_buflen == 0)
4463 { 4430 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4431 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465 4432
4466 if ((unsigned int)written == len) 4433 if ((unsigned int)written == len)
4467 return; 4434 return;
4468 4435
4469 data += written; 4436 data += written;
… …
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 4445 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4446}
4480 4447
4481void rxvt_term::pty_write () 4448void rxvt_term::pty_write ()
4482{ 4449{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4450 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484 4451
4485 if (written > 0) 4452 if (written > 0)
4486 { 4453 {
4487 v_buflen -= written; 4454 v_buflen -= written;
4488 4455

Diff Legend

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