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.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC

… …
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;
… …
1507 { 1502 {
1508 seen_resize = 1; 1503 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1505 }
1511 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1514 check_our_parents (); 1511 check_our_parents ();
1515#endif 1512#endif
1516 } 1513 }
… …
1587 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1588 { 1585 {
1589 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1590 scrollbar_show (0); 1587 scrollbar_show (0);
1591 } 1588 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1589
1597#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1600#endif 1593#endif
… …
1603 1596
1604 case MotionNotify: 1597 case MotionNotify:
1605#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1599 if (hidden_pointer)
1607 pointer_unblank (); 1600 pointer_unblank ();
1608#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif 1601#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1603 break;
1618 1604
1619 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
… …
2098 } 2084 }
2099 } 2085 }
2100 2086
2101 return; 2087 return;
2102 } 2088 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2089}
2112 2090
2113void 2091void
2114rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2115{ 2093{
… …
2121 2099
2122 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2123 { 2101 {
2124 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2125 scrollbar_show (0); 2103 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2104 }
2130 2105
2131#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2224 } 2199 }
2225 break; 2200 break;
2226#endif 2201#endif
2227 } 2202 }
2228 } 2203 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2204}
2234 2205
2235#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2236#if TINTING 2207#if TINTING
2237/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++; 2795 refresh_limit++;
2825 else 2796 else
2826 { 2797 {
2827 flag = true; 2798 flag = true;
2828 scr_refresh (refresh_type); 2799 scr_refresh ();
2829 want_refresh = 1; 2800 want_refresh = 1;
2830 } 2801 }
2831 } 2802 }
2832 2803
2833 } 2804 }
… …
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3767 */
3797void 3768void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799{ 3770{
3800 int changed = 0;
3801 int color; 3771 int color;
3802 char *buf, *name; 3772 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3774 int saveop = op;
3805 dDisp; 3775 dDisp;
… …
3921 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3922 break; 3892 break;
3923#endif 3893#endif
3924 3894
3925 case Rxvt_Pixmap: 3895 case Rxvt_Pixmap:
3896 {
3926 if (*str != ';') 3897 if (*str != ';')
3927 { 3898 {
3928#if XPM_BACKGROUND 3899#if XPM_BACKGROUND
3929 scale_pixmap (""); /* reset to default scaling */ 3900 scale_pixmap (""); /* reset to default scaling */
3930 set_bgPixmap (str); /* change pixmap */ 3901 set_bgPixmap (str); /* change pixmap */
3931 scr_touch (true); 3902 scr_touch (true);
3932#endif 3903#endif
3933 } 3904 }
3934 3905
3906 int changed = 0;
3907
3935 while ((str = strchr (str, ';')) != NULL) 3908 while ((str = strchr (str, ';')) != NULL)
3936 { 3909 {
3937 str++; 3910 str++;
3938#if XPM_BACKGROUND 3911#if XPM_BACKGROUND
3939 changed += scale_pixmap (str); 3912 changed += scale_pixmap (str);
3940#endif 3913#endif
3941 } 3914 }
3942 3915
3943 if (changed) 3916 if (changed)
3944 { 3917 {
3945#ifdef XPM_BACKGROUND 3918#ifdef XPM_BACKGROUND
3946 resize_pixmap (); 3919 resize_pixmap ();
3947 scr_touch (true); 3920 scr_touch (true);
3948#endif 3921#endif
3949 } 3922 }
3923 }
3950 break; 3924 break;
3951 3925
3952 case Rxvt_restoreFG: 3926 case Rxvt_restoreFG:
3953 set_window_color (Color_fg, str); 3927 set_window_color (Color_fg, str);
3954 break; 3928 break;
… …
3958 3932
3959 case XTerm_logfile: 3933 case XTerm_logfile:
3960 // TODO, when secure mode? 3934 // TODO, when secure mode?
3961 break; 3935 break;
3962 3936
3963#ifdef MENUBAR
3964 case URxvt_Menu:
3965 if (OPTION (Opt_insecure))
3966 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967 break;
3968#endif
3969#if 0 3937#if 0
3970 case Rxvt_dumpscreen: /* no error notices */ 3938 case Rxvt_dumpscreen: /* no error notices */
3971 { 3939 {
3972 int fd; 3940 int fd;
3973 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3941 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4006 if (query) 3974 if (query)
4007 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3975 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4008 else 3976 else
4009 { 3977 {
4010 set_locale (str); 3978 set_locale (str);
4011 pty.set_utf8_mode (enc_utf8); 3979 pty->set_utf8_mode (enc_utf8);
4012 init_xlocale (); 3980 init_xlocale ();
4013 } 3981 }
4014 break; 3982 break;
4015 3983
4016 case URxvt_view_up: 3984 case URxvt_view_up:
… …
4090 { 5, PrivMode_rVideo }, 4058 { 5, PrivMode_rVideo },
4091 { 6, PrivMode_relOrigin }, 4059 { 6, PrivMode_relOrigin },
4092 { 7, PrivMode_Autowrap }, 4060 { 7, PrivMode_Autowrap },
4093 // 8, bi-directional support mode 4061 // 8, bi-directional support mode
4094 { 9, PrivMode_MouseX10 }, 4062 { 9, PrivMode_MouseX10 },
4095#ifdef menuBar_esc
4096 { menuBar_esc, PrivMode_menuBar },
4097#endif
4098 // 18, 19 printing-related 4063 // 18, 19 printing-related
4099 { 25, PrivMode_VisibleCursor }, 4064 { 25, PrivMode_VisibleCursor },
4100#ifdef scrollBar_esc 4065#ifdef scrollBar_esc
4101 { scrollBar_esc, PrivMode_scrollBar }, 4066 { scrollBar_esc, PrivMode_scrollBar },
4102#endif 4067#endif
… …
4197 /* case 8: - auto repeat, can't do on a per window basis */ 4162 /* case 8: - auto repeat, can't do on a per window basis */
4198 case 9: /* X10 mouse reporting */ 4163 case 9: /* X10 mouse reporting */
4199 if (state) /* orthogonal */ 4164 if (state) /* orthogonal */
4200 priv_modes &= ~PrivMode_MouseX11; 4165 priv_modes &= ~PrivMode_MouseX11;
4201 break; 4166 break;
4202#ifdef menuBar_esc
4203 case menuBar_esc:
4204#ifdef MENUBAR
4205 map_menuBar (state);
4206#endif
4207 break;
4208#endif
4209#ifdef scrollBar_esc 4167#ifdef scrollBar_esc
4210 case scrollBar_esc: 4168 case scrollBar_esc:
4211 if (scrollbar_mapping (state)) 4169 if (scrollbar_mapping (state))
4212 { 4170 {
4213 resize_all_windows (0, 0, 0); 4171 resize_all_windows (0, 0, 0);
… …
4458rxvt_term::tt_write (const char *data, unsigned int len) 4416rxvt_term::tt_write (const char *data, unsigned int len)
4459{ 4417{
4460 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4418 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461 return; 4419 return;
4462 4420
4463 if (pty.pty < 0) 4421 if (pty->pty < 0)
4464 return; 4422 return;
4465 4423
4466 if (v_buflen == 0) 4424 if (v_buflen == 0)
4467 { 4425 {
4468 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4426 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4469 4427
4470 if ((unsigned int)written == len) 4428 if ((unsigned int)written == len)
4471 return; 4429 return;
4472 4430
4473 data += written; 4431 data += written;
… …
4482 pty_ev.set (EVENT_READ | EVENT_WRITE); 4440 pty_ev.set (EVENT_READ | EVENT_WRITE);
4483} 4441}
4484 4442
4485void rxvt_term::pty_write () 4443void rxvt_term::pty_write ()
4486{ 4444{
4487 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4445 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4488 4446
4489 if (written > 0) 4447 if (written > 0)
4490 { 4448 {
4491 v_buflen -= written; 4449 v_buflen -= written;
4492 4450

Diff Legend

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