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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.131 by root, Fri Aug 13 22:38:57 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 58
59// exception thrown when the command parser runs out of input data 59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 60class out_of_input { } out_of_input;
61 61
62#ifndef NO_FRILLS
63
64#define ISO_14755_KEYCODE_VALID 0x80000000UL
65#define ISO_14755_ACTIVE 0x40000000UL
66#define ISO_14755_ESCAPE_NEXT 0x20000000UL
67
68static unsigned short iso14755_symtab[] = {
69 // keysym, unicode
70 XK_Left, 0x2190,
71 XK_KP_Left, 0x2190,
72 XK_Up, 0x2191,
73 XK_KP_Up, 0x2191,
74 XK_Right, 0x2192,
75 XK_KP_Right, 0x2192,
76 XK_Down, 0x2193,
77 XK_KP_Down, 0x2193,
78 XK_Linefeed, 0x21b4,
79 XK_Return, 0x21b5,
80 XK_KP_Enter, 0x21b5,
81
82 XK_Prior, 0x21de,
83 XK_Next, 0x21df,
84 XK_Tab, 0x21e5,
85 XK_ISO_Left_Tab, 0x21e6,
86 XK_Shift_L, 0x21e7,
87 XK_Shift_R, 0x21e7,
88
89 XK_Shift_Lock, 0x21eb,
90 XK_ISO_Lock, 0x21eb,
91 XK_ISO_Lock, 0x21eb,
92 XK_Caps_Lock, 0x21ec,
93 XK_Num_Lock, 0x21ed,
94 XK_ISO_Level3_Shift, 0x21ee,
95 XK_ISO_Level3_Lock, 0x21ef,
96 XK_ISO_Group_Lock, 0x21f0,
97 XK_Home, 0x21f1,
98 XK_End, 0x21f2,
99
100 XK_Execute, 0x2318,
101 XK_Begin, 0x2320,
102 XK_Delete, 0x2326,
103 XK_Clear, 0x2327,
104 XK_BackSpace, 0x232b,
105 XK_Insert, 0x2380,
106 XK_Control_L, 0x2388,
107 XK_Control_R, 0x2388,
108 XK_Pause, 0x2389,
109 XK_Break, 0x238a,
110 XK_Escape, 0x238b,
111 XK_Undo, 0x238c,
112 XK_Print, 0x2399,
113
114 XK_space, 0x2423,
115 XK_KP_Space, 0x2422,
116 0,
117};
118
119void
120rxvt_term::commit_iso14755 ()
121{
122 wchar_t ch[2];
123
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask
125 ch[1] = 0;
126
127 if (iso14755buf & ISO_14755_KEYCODE_VALID)
128 {
129 char mb[16];
130 int len;
131
132 // allow verbatim 0-bytes and control-bytes to be entered
133 if (ch[0] >= 0x20)
134 len = wcstombs (mb, ch, 16);
135 else
136 {
137 mb[0] = ch[0];
138 len = 1;
139 }
140
141 if (len > 0)
142 tt_write ((unsigned char *)mb, len);
143 else
144 scr_bell ();
145 }
146
147 iso14755buf = 0;
148}
149
150int
151rxvt_term::hex_keyval (XKeyEvent &ev)
152{
153 // check wether this event corresponds to a hex digit
154 // if the modifiers had not been pressed.
155 for (int index = 0; index < 8; index++)
156 {
157 KeySym k = XLookupKeysym (&ev, index);
158
159 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
160 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
161 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
162 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
163 }
164
165 return -1;
166}
167#endif
168
62/*{{{ Convert the keypress event into a string */ 169/*{{{ Convert the keypress event into a string */
63void 170void
64rxvt_term::lookup_key (XKeyEvent &ev) 171rxvt_term::lookup_key (XKeyEvent &ev)
65{ 172{
66 int ctrl, meta, shft, len; 173 int ctrl, meta, shft, len;
… …
151 { 258 {
152 if (TermWin.saveLines) 259 if (TermWin.saveLines)
153 { 260 {
154#ifdef UNSHIFTED_SCROLLKEYS 261#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 262 if (!ctrl && !meta)
156 {
157#else 263#else
158 if (IS_SCROLL_MOD) 264 if (IS_SCROLL_MOD)
265#endif
159 { 266 {
160#endif
161 int lnsppg; 267 int lnsppg;
162 268
163#ifdef PAGING_CONTEXT_LINES 269#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 270 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 271#else
… …
222 { 328 {
223 /* normal XTerm key bindings */ 329 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 330 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 331 selection_request (ev.time, 0, 0);
226 return; 332 return;
333#if TODO // TODO
227 /* rxvt extras */ 334 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 335 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 336 change_font (FONT_UP);
230 return; 337 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 339 change_font (FONT_DN);
233 return; 340 return;
341#endif
234 } 342 }
235 } 343 }
236 } 344 }
345
346#ifndef NO_FRILLS
347 // ISO 14755 support
348 if (shft && ctrl)
349 {
350 int hv;
351
352 if (keysym == XK_space || keysym == XK_KP_Space
353 || keysym == XK_Return || keysym == XK_KP_Enter)
354 {
355 commit_iso14755 ();
356 return;
357 }
358 else if ((hv = hex_keyval (ev)) >= 0)
359 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID;
361 return;
362 }
363 else
364 iso14755buf = 0;
365 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
368 iso14755buf |= ISO_14755_ACTIVE;
369#endif
370
237#ifdef PRINTPIPE 371#ifdef PRINTPIPE
238 if (keysym == XK_Print) 372 if (keysym == XK_Print)
239 { 373 {
240 scr_printscreen (ctrl | shft); 374 scr_printscreen (ctrl | shft);
241 return; 375 return;
… …
306 newlen = 0; 440 newlen = 0;
307 } 441 }
308 break; 442 break;
309 443
310#ifdef XK_KP_Left 444#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 445 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 446 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 447 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 448 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
316 { 450 {
… …
661 if (want_full_refresh) 795 if (want_full_refresh)
662 { 796 {
663 want_full_refresh = 0; 797 want_full_refresh = 0;
664 scr_clear (); 798 scr_clear ();
665 scr_touch (false); 799 scr_touch (false);
666 want_refresh = 1;
667 } 800 }
668#endif 801#endif
669 802
670 if (want_refresh) 803 if (want_refresh)
671 { 804 {
672 scr_refresh (refresh_type); 805 scr_refresh (refresh_type);
673 scrollbar_show (1); 806 scrollbar_show (1);
674#ifdef USE_XIM 807#ifdef USE_XIM
675 IMSendSpot (); 808 IMSendSpot ();
676#endif 809#endif
677
678 } 810 }
679 811
680 display->flush (); 812 display->flush ();
813
814 flush_ev.stop ();
681} 815}
682 816
683void 817void
684rxvt_term::check_cb (check_watcher &w) 818rxvt_term::check_cb (check_watcher &w)
685{ 819{
686 SET_R (this); 820 SET_R (this);
687 SET_LOCALE (locale); 821 SET_LOCALE (locale);
688 822
823 display->flush ();
824
825 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01);
827}
828
829void
830rxvt_term::flush_cb (time_watcher &w)
831{
832 SET_R (this);
833 SET_LOCALE (locale);
834
835 refresh_limit = 1;
836 refresh_count = 0;
689 flush (); 837 flush ();
690} 838}
691 839
692#ifdef CURSOR_BLINK 840#ifdef CURSOR_BLINK
693void 841void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 859 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 860 }
713} 861}
714#endif 862#endif
715 863
864#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
865void
866rxvt_term::cont_scroll_cb (time_watcher &w)
867{
868 if ((scrollbar_isUp() || scrollbar_isDn()) &&
869 scr_page (scrollbar_isUp() ? UP : DN, 1))
870 {
871 refresh_type |= SMOOTH_REFRESH;
872 want_refresh = 1;
873 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
874 }
875}
876#endif
877
878#ifdef SELECTION_SCROLLING
879void
880rxvt_term::sel_scroll_cb (time_watcher &w)
881{
882 if (scr_page (scroll_selection_dir, scroll_selection_lines))
883 {
884 selection_extend (selection_save_x, selection_save_y, selection_save_state);
885 refresh_type |= SMOOTH_REFRESH;
886 want_refresh = 1;
887 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
888 }
889}
890#endif
891
892#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
893void
894rxvt_term::slip_wheel_cb (time_watcher &w)
895{
896 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed))
899 {
900 refresh_type |= SMOOTH_REFRESH;
901 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 }
904}
905#endif
906
716bool 907bool
717rxvt_term::pty_fill () 908rxvt_term::pty_fill ()
718{ 909{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 910 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911
912 if (CBUFSIZ == n)
913 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
915 n = 0;
916 }
720 917
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 918 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 919 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 920 cmdbuf_endp = cmdbuf_ptr + n;
724 921
… …
742 SET_LOCALE (locale); 939 SET_LOCALE (locale);
743 940
744 if (revents & EVENT_WRITE) 941 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 942 tt_write (0, 0);
746 else if (revents & EVENT_READ) 943 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 944 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ()) 945 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759
760 if (cmd_parse ()) 946 if (cmd_parse ())
761 break; 947 break;
762 }
763 }
764} 948}
765 949
766#ifdef POINTER_BLANK
767void 950void
768rxvt_term::pointer_unblank () 951rxvt_term::pointer_unblank ()
769{ 952{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor (); 954 recolour_cursor ();
772 955
956#ifdef POINTER_BLANK
773 hidden_pointer = 0; 957 hidden_pointer = 0;
774 958
775 if (Options & Opt_pointerBlank) 959 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay); 960 pointer_ev.start (NOW + pointerBlankDelay);
961#endif
777} 962}
778 963
964#ifdef POINTER_BLANK
779void 965void
780rxvt_term::pointer_blank () 966rxvt_term::pointer_blank ()
781{ 967{
782 if (! (Options & Opt_pointerBlank)) 968 if (! (Options & Opt_pointerBlank))
783 return; 969 return;
… …
973#endif 1159#endif
974 1160
975 switch (ev.type) 1161 switch (ev.type)
976 { 1162 {
977 case KeyPress: 1163 case KeyPress:
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT))
978 lookup_key (ev.xkey); 1165 lookup_key (ev.xkey);
1166
1167 break;
1168
1169 case KeyRelease:
1170 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS)
1172 KeySym ks;
1173
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif
1176
1177#ifndef NO_FRILLS
1178 // ISO 14755 support
1179 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT)
1181 {
1182 // iso14755 part 5.2 handling: release time
1183 // first: controls
1184 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f)))
1187 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 ();
1190 return; // case-break;
1191 }
1192
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks)
1195 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1];
1197 commit_iso14755 ();
1198 return; // case-break;
1199 }
1200
1201 iso14755buf = 0;
1202 scr_bell ();
979 break; 1203 break;
1204 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 {
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID)
1208 commit_iso14755 ();
1209 else if (iso14755buf & ISO_14755_ACTIVE)
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair
1211 }
1212#endif
980 1213
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1215 if (!(ev.xkey.state & ControlMask))
1216 slip_wheel_ev.stop ();
1217 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1218 mouse_slip_wheel_speed = 0;
986 else 1219#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1220 break;
995 } 1221 }
996#endif
997 1222
998 case ButtonPress: 1223 case ButtonPress:
999 button_press (ev.xbutton); 1224 button_press (ev.xbutton);
1000 break; 1225 break;
1001 1226
… …
1013 && (ev.xclient.data.l[0] == DndFile 1238 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1239 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1240 || ev.xclient.data.l[0] == DndLink))
1016 { 1241 {
1017 /* Get Dnd data */ 1242 /* Get Dnd data */
1018 Atom ActualType; 1243 Atom ActualType;
1019 int ActualFormat; 1244 int ActualFormat;
1020 unsigned char *data; 1245 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1246 unsigned long Size, RemainingBytes;
1022 1247
1023 XGetWindowProperty (display->display, display->root, 1248 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1249 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1250 0L, 1000000L,
1026 False, AnyPropertyType, 1251 False, AnyPropertyType,
… …
1029 &data); 1254 &data);
1030 XChangeProperty (display->display, display->root, 1255 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1256 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1257 8, PropModeReplace,
1033 data, STRLEN (data)); 1258 data, STRLEN (data));
1259 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1260 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1262 }
1037#endif /* OFFIX_DND */ 1263#endif /* OFFIX_DND */
1038 break; 1264 break;
1039 1265
1040 case MappingNotify: 1266 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1267 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1268 break;
1043 1269
1044 /* 1270 /*
1045 * XXX: this is not the _current_ arrangement 1271 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1272 * Here's my conclusion:
… …
1077#endif 1303#endif
1078#ifdef CURSOR_BLINK 1304#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1305 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif 1307#endif
1308#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade])
1310 {
1311 PixColors = PixColorsFocused;
1312 set_colorfgbg ();
1313 scr_clear ();
1314 scr_touch (true);
1315 }
1316#endif
1082 1317
1083 } 1318 }
1084 break; 1319 break;
1085 1320
1086 case FocusOut: 1321 case FocusOut:
… …
1095#ifdef CURSOR_BLINK 1330#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1331 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1332 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1333 hidden_cursor = 0;
1099#endif 1334#endif
1335#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade])
1337 {
1338 PixColors = PixColorsUnFocused;
1339 set_colorfgbg ();
1340 scr_clear ();
1341 scr_touch (true);
1342 }
1343#endif
1100 1344
1101 } 1345 }
1102 break; 1346 break;
1103 1347
1104 case ConfigureNotify: 1348 case ConfigureNotify:
… …
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1358 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1360
1117 if (szHint.width != width || szHint.height != height) 1361 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1); 1362 resize_all_windows (width, height, 1);
1121 } 1363
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1365 if (Options & Opt_transparent)
1130 { 1366 {
1131 check_our_parents (); 1367 check_our_parents ();
1132 if (am_transparent) 1368 if (am_transparent)
1133 want_full_refresh = 1; 1369 want_refresh = want_full_refresh = 1;
1134 } 1370 }
1135#endif 1371#endif
1136
1137 } 1372 }
1373 break;
1374
1375 case PropertyNotify:
1376 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1377 && ev.xproperty.state == PropertyNewValue)
1378 selection_property (ev.xproperty.window, ev.xproperty.atom);
1379
1138 break; 1380 break;
1139 1381
1140 case SelectionClear: 1382 case SelectionClear:
1141 selection_clear (); 1383 selection_clear ();
1142 break; 1384 break;
… …
1173 1415
1174 case GraphicsExpose: 1416 case GraphicsExpose:
1175 case Expose: 1417 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1418 if (ev.xany.window == TermWin.vt)
1177 { 1419 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1420 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1421 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1422 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1424
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1428 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1429 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1430
1186 // ev.xexpose.width, TermWin.height, False); 1431 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1432 }
1190 else 1433 else
1191 { 1434 {
1192 XEvent unused_event; 1435 XEvent unused_event;
1193 1436
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1195 Expose, 1438 ;
1196 &unused_event)) ;
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1198 GraphicsExpose, 1440 ;
1199 &unused_event)) ; 1441
1200 if (isScrollbarWindow (ev.xany.window)) 1442 if (isScrollbarWindow (ev.xany.window))
1201 { 1443 {
1202 scrollBar.setIdle (); 1444 scrollBar.setIdle ();
1203 scrollbar_show (0); 1445 scrollbar_show (0);
1204 } 1446 }
1205#ifdef MENUBAR 1447#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1449 menubar_expose ();
1450#endif
1451
1452#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0])
1454 XClearWindow (display->display, ev.xany.window);
1208#endif 1455#endif
1209 } 1456 }
1210 break; 1457 break;
1211 1458
1212 case MotionNotify: 1459 case MotionNotify:
… …
1247 if (ev.xbutton.y < TermWin.int_bwidth 1494 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1496 {
1250 int dist; 1497 int dist;
1251 1498
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1499 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1500 * already in the middle of scrolling.
1256 */ 1501 */
1257 if (scroll_selection_delay<=0) 1502 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1504
1260 /* save the event params so we can highlight 1505 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1506 * the selection in the pending-scroll loop
1262 */ 1507 */
1263 selection_save_x=ev.xbutton.x; 1508 selection_save_x=ev.xbutton.x;
… …
1285 else 1530 else
1286 { 1531 {
1287 /* we are within the text window, so we 1532 /* we are within the text window, so we
1288 * shouldn't be scrolling 1533 * shouldn't be scrolling
1289 */ 1534 */
1290 pending_scroll_selection = 0; 1535 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop();
1291 } 1537 }
1292#endif 1538#endif
1293#ifdef MOUSE_THRESHOLD 1539#ifdef MOUSE_THRESHOLD
1294 1540
1295 } 1541 }
… …
1314 } 1560 }
1315 break; 1561 break;
1316 } 1562 }
1317} 1563}
1318 1564
1565#if TRANSPARENT
1319void 1566void
1320rxvt_term::rootwin_cb (XEvent &ev) 1567rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1568{
1322 SET_R (this); 1569 SET_R (this);
1323 SET_LOCALE (locale); 1570 SET_LOCALE (locale);
1324 1571
1325 switch (ev.type) 1572 switch (ev.type)
1326 { 1573 {
1327 case PropertyNotify: 1574 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1575 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1576 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1577 * use the property to determine the pixmap. We use it later on.
1340 */ 1578 */
1341 if (xa[XA_XROOTPMAPID] == 0) 1579 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343 1581
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1345 return; 1583 return;
1346 }
1347 1584
1348 /* FALLTHROUGH */ 1585 /* FALLTHROUGH */
1349 case ReparentNotify: 1586 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1588 want_refresh = want_full_refresh = 1;
1353 break; 1589 break;
1354#endif
1355 } 1590 }
1356} 1591}
1592#endif
1357 1593
1358void 1594void
1359rxvt_term::button_press (XButtonEvent &ev) 1595rxvt_term::button_press (XButtonEvent &ev)
1360{ 1596{
1361 int reportmode = 0, clickintime; 1597 int reportmode = 0, clickintime;
… …
1513 upordown = 1; /* down */ 1749 upordown = 1; /* down */
1514 } 1750 }
1515 if (upordown) 1751 if (upordown)
1516 { 1752 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1754 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1755#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1756 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1757 {
1522 if (upordown < 0) 1758 if (upordown < 0)
1523 scrollBar.setUp (); 1759 scrollBar.setUp ();
… …
1539 break; 1775 break;
1540 case R_SB_ALIGN_BOTTOM: 1776 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 1777 csrO = scrollBar.bot - scrollBar.top;
1542 break; 1778 break;
1543 } 1779 }
1780
1544 if (scrollBar.style == R_SB_XTERM 1781 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 1782 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 1783 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 1784 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 1785
1549 scrollBar.setMotion (); 1786 scrollBar.setMotion ();
1550 break; 1787 break;
1551 1788
1552 case Button1: 1789 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1790 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1577 scr_page ((ev.button == Button1 ? DN : UP), 1814 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 1815 (TermWin.nrow
1579 * scrollbar_position (ev.y) 1816 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 1817 / scrollbar_size ()));
1581 } 1818 }
1819
1582 break; 1820 break;
1583 } 1821 }
1584 } 1822 }
1585 return; 1823 return;
1586 } 1824 }
… …
1610 refresh_type &= ~SMOOTH_REFRESH; 1848 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 1849#endif
1612 1850
1613 } 1851 }
1614#ifdef SELECTION_SCROLLING 1852#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 1853 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop();
1616#endif 1855#endif
1617 if (ev.window == TermWin.vt) 1856 if (ev.window == TermWin.vt)
1618 { 1857 {
1619 if (reportmode) 1858 if (reportmode)
1620 { 1859 {
… …
1662 case Button5: 1901 case Button5:
1663 { 1902 {
1664 int i; 1903 int i;
1665 page_dirn v; 1904 page_dirn v;
1666 1905
1667 v = (ev.button == Button4) ? UP : DN; 1906 v = ev.button == Button4 ? UP : DN;
1907
1668 if (ev.state & ShiftMask) 1908 if (ev.state & ShiftMask)
1669 i = 1; 1909 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 1910 else if (Options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 1911 i = TermWin.nrow - 1;
1672 else 1912 else
1673 i = 5; 1913 i = 5;
1914
1674# ifdef MOUSE_SLIP_WHEELING 1915# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 1916 if (ev.state & ControlMask)
1676 { 1917 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 1918 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1920 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1921
1922 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924
1925 slip_wheel_ev.start ();
1679 } 1926 }
1927 else
1928 {
1680# endif 1929# endif
1681# ifdef JUMP_MOUSE_WHEEL 1930# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1); 1931 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 1932 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 1933 scrollbar_show (1);
1934# else
1935 while (i--)
1936 {
1937 scr_page (v, 1);
1938 scr_refresh (SMOOTH_REFRESH);
1939 scrollbar_show (1);
1940 }
1941# endif
1942# ifdef MOUSE_SLIP_WHEELING
1691 } 1943 }
1692# endif 1944#endif
1693
1694 } 1945 }
1695 break; 1946 break;
1696#endif 1947#endif
1697
1698 } 1948 }
1699 } 1949 }
1700#ifdef MENUBAR 1950#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 1951 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 1952 menubar_control (ev);
1703#endif 1953#endif
1704} 1954}
1705 1955
1706
1707#ifdef TRANSPARENT 1956#ifdef TRANSPARENT
1957#if TINTING
1958/* taken from aterm-0.4.2 */
1959
1960typedef uint32_t RUINT32T;
1961
1962void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1963{
1964 int sh_r, sh_g, sh_b;
1965 RUINT32T mask_r, mask_g, mask_b;
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i;
1970
1971 Visual* visual = display->visual;
1972
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974
1975 /* for convenience */
1976 mask_r = visual->red_mask;
1977 mask_g = visual->green_mask;
1978 mask_b = visual->blue_mask;
1979
1980 /* boring lookup table pre-initialization */
1981 switch (srcImage->bits_per_pixel) {
1982 case 15:
1983 if ((mask_r != 0x7c00) ||
1984 (mask_g != 0x03e0) ||
1985 (mask_b != 0x001f))
1986 return;
1987 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1988 lookup_r = lookup;
1989 lookup_g = lookup+32;
1990 lookup_b = lookup+32+32;
1991 sh_r = 10;
1992 sh_g = 5;
1993 sh_b = 0;
1994 break;
1995 case 16:
1996 if ((mask_r != 0xf800) ||
1997 (mask_g != 0x07e0) ||
1998 (mask_b != 0x001f))
1999 return;
2000 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2001 lookup_r = lookup;
2002 lookup_g = lookup+32;
2003 lookup_b = lookup+32+64;
2004 sh_r = 11;
2005 sh_g = 5;
2006 sh_b = 0;
2007 break;
2008 case 24:
2009 if ((mask_r != 0xff0000) ||
2010 (mask_g != 0x00ff00) ||
2011 (mask_b != 0x0000ff))
2012 return;
2013 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2014 lookup_r = lookup;
2015 lookup_g = lookup+256;
2016 lookup_b = lookup+256+256;
2017 sh_r = 16;
2018 sh_g = 8;
2019 sh_b = 0;
2020 break;
2021 case 32:
2022 if ((mask_r != 0xff0000) ||
2023 (mask_g != 0x00ff00) ||
2024 (mask_b != 0x0000ff))
2025 return;
2026 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2027 lookup_r = lookup;
2028 lookup_g = lookup+256;
2029 lookup_b = lookup+256+256;
2030 sh_r = 16;
2031 sh_g = 8;
2032 sh_b = 0;
2033 break;
2034 default:
2035 return; /* we do not support this color depth */
2036 }
2037
2038 /* prepare limits for color transformation (each channel is handled separately) */
2039 if (shade < 0) {
2040 shade = -shade;
2041 if (shade < 0) shade = 0;
2042 if (shade > 100) shade = 100;
2043
2044 lower_lim_r = 65535-rm;
2045 lower_lim_g = 65535-gm;
2046 lower_lim_b = 65535-bm;
2047
2048 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2049 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2050 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2051
2052 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2053 } else {
2054 if (shade < 0) shade = 0;
2055 if (shade > 100) shade = 100;
2056
2057 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2058
2059 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2060 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2061 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2062 }
2063
2064 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2065 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2066 {
2067 unsigned int tmp;
2068
2069 tmp = lower_lim_r;
2070 lower_lim_r = lower_lim_b;
2071 lower_lim_b = tmp;
2072
2073 tmp = upper_lim_r;
2074 upper_lim_r = upper_lim_b;
2075 upper_lim_b = tmp;
2076 }
2077
2078 /* fill our lookup tables */
2079 for (i = 0; i <= mask_r>>sh_r; i++)
2080 {
2081 RUINT32T tmp;
2082 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2083 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2084 lookup_r[i] = (tmp/65535)<<sh_r;
2085 }
2086 for (i = 0; i <= mask_g>>sh_g; i++)
2087 {
2088 RUINT32T tmp;
2089 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2090 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2091 lookup_g[i] = (tmp/65535)<<sh_g;
2092 }
2093 for (i = 0; i <= mask_b>>sh_b; i++)
2094 {
2095 RUINT32T tmp;
2096 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2097 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2098 lookup_b[i] = (tmp/65535)<<sh_b;
2099 }
2100
2101 /* apply table to input image (replacing colors by newly calculated ones) */
2102 switch (srcImage->bits_per_pixel)
2103 {
2104 case 15:
2105 {
2106 unsigned short *p1, *pf, *p, *pl;
2107 p1 = (unsigned short *) srcImage->data;
2108 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2109 while (p1 < pf)
2110 {
2111 p = p1;
2112 pl = p1 + srcImage->width;
2113 for (; p < pl; p++)
2114 {
2115 *p = lookup_r[(*p & 0x7c00)>>10] |
2116 lookup_g[(*p & 0x03e0)>> 5] |
2117 lookup_b[(*p & 0x001f)];
2118 }
2119 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2120 }
2121 break;
2122 }
2123 case 16:
2124 {
2125 unsigned short *p1, *pf, *p, *pl;
2126 p1 = (unsigned short *) srcImage->data;
2127 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2128 while (p1 < pf)
2129 {
2130 p = p1;
2131 pl = p1 + srcImage->width;
2132 for (; p < pl; p++)
2133 {
2134 *p = lookup_r[(*p & 0xf800)>>11] |
2135 lookup_g[(*p & 0x07e0)>> 5] |
2136 lookup_b[(*p & 0x001f)];
2137 }
2138 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2139 }
2140 break;
2141 }
2142 case 24:
2143 {
2144 unsigned char *p1, *pf, *p, *pl;
2145 p1 = (unsigned char *) srcImage->data;
2146 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2147 while (p1 < pf)
2148 {
2149 p = p1;
2150 pl = p1 + srcImage->width * 3;
2151 for (; p < pl; p += 3)
2152 {
2153 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2154 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2155 p[2] = lookup_r[(p[2] & 0x0000ff)];
2156 }
2157 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2158 }
2159 break;
2160 }
2161 case 32:
2162 {
2163 RUINT32T *p1, *pf, *p, *pl;
2164 p1 = (RUINT32T *) srcImage->data;
2165 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2166
2167 while (p1 < pf)
2168 {
2169 p = p1;
2170 pl = p1 + srcImage->width;
2171 for (; p < pl; p++)
2172 {
2173 *p = lookup_r[(*p & 0xff0000)>>16] |
2174 lookup_g[(*p & 0x00ff00)>> 8] |
2175 lookup_b[(*p & 0x0000ff)] |
2176 (*p & ~0xffffff);
2177 }
2178 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2179 }
2180 break;
2181 }
2182 }
2183
2184 free (lookup);
2185}
2186#endif
2187
1708/* 2188/*
1709 * Check our parents are still who we think they are. 2189 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2190 * Do transparency updates if required
1711 */ 2191 */
1712int 2192int
1713rxvt_term::check_our_parents () 2193rxvt_term::check_our_parents ()
1714{ 2194{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2195 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2196 unsigned long nitems, bytes_after;
1717 Atom atype; 2197 Atom atype;
1718 unsigned char *prop = NULL; 2198 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2199 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2200 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2201 XWindowAttributes wattr, wrootattr;
1722 2202
1723 pchanged = 0; 2203 pchanged = 0;
1724 2204
1725 if (! (Options & Opt_transparent)) 2205 if (!(Options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2206 return pchanged; /* Don't try any more */
1727 2207
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2208 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2209 rootdepth = wrootattr.depth;
1730 2210
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2212
1732 if (rootdepth != wattr.depth) 2213 if (rootdepth != wattr.depth)
1733 { 2214 {
1734 if (am_transparent) 2215 if (am_transparent)
1735 { 2216 {
1736 pchanged = 1; 2217 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2219 am_transparent = am_pixmap_trans = 0;
1740 } 2220 }
2221
1741 return pchanged; /* Don't try any more */ 2222 return pchanged; /* Don't try any more */
1742 } 2223 }
1743 2224
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2225 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2226 XSync (display->display, False);
… …
1747 /* 2228 /*
1748 * Make the frame window set by the window manager have 2229 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2230 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2231 * windows for each client, so we have to take care about that.
1751 */ 2232 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2233 i = (xa[XA_XROOTPMAPID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2236 &nitems, &bytes_after, &prop) == Success);
2237
1756 if (!i || prop == NULL) 2238 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success);
2243
2244 if (!i || prop == NULL
2245#if TINTING
2246 || !rs[Rs_color + Color_tint]
2247#endif
2248 )
1757 have_pixmap = 0; 2249 have_pixmap = 0;
1758 else 2250 else
1759 { 2251 {
1760 have_pixmap = 1; 2252 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2253 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2254 XFree (prop);
1763 } 2255 }
2256
1764 if (have_pixmap) 2257 if (have_pixmap)
1765 { 2258 {
1766 /* 2259 /*
1767 * Copy display->root pixmap transparency 2260 * Copy display->root pixmap transparency
1768 */ 2261 */
… …
1772 XImage *image; 2265 XImage *image;
1773 GC gc; 2266 GC gc;
1774 XGCValues gcvalue; 2267 XGCValues gcvalue;
1775 2268
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2270 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2271 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2272 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2273 nx = ny = 0;
1781 2274
1782 if (sx < 0) 2275 if (sx < 0)
… …
1794 } 2287 }
1795 2288
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1; 2291 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2293
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2295 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2296 allowedxerror = 0;
2297
1804 if (image == NULL) 2298 if (image == NULL)
1805 { 2299 {
1806 if (am_transparent && am_pixmap_trans) 2300 if (am_transparent && am_pixmap_trans)
1807 { 2301 {
1808 pchanged = 1; 2302 pchanged = 1;
… …
1810 { 2304 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2305 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None; 2306 TermWin.pixmap = None;
1813 } 2307 }
1814 } 2308 }
2309
1815 am_pixmap_trans = 0; 2310 am_pixmap_trans = 0;
1816 } 2311 }
1817 else 2312 else
1818 { 2313 {
1819 if (TermWin.pixmap != None) 2314 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2315 XFreePixmap (display->display, TermWin.pixmap);
2316
2317#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint))
2319 {
2320 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2324
2325 ShadeXImage (display, image, shade, rm, gm, bm);
2326 }
2327#endif
2328
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2330 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2333 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2334 XFreeGC (display->display, gc);
1830 XDestroyImage (image); 2335 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2337 XClearWindow (display->display, TermWin.parent[0]);
2338
1833 if (!am_transparent || !am_pixmap_trans) 2339 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2340 pchanged = 1;
2341
1835 am_transparent = am_pixmap_trans = 1; 2342 am_transparent = am_pixmap_trans = 1;
1836 } 2343 }
1837 } 2344 }
1838 2345
1839 if (!am_pixmap_trans) 2346 if (!am_pixmap_trans)
1840 { 2347 {
1841 unsigned int n; 2348 unsigned int n;
1842 /* 2349 /*
1843 * InheritPixmap transparency 2350 * InheritPixmap transparency
1844 */ 2351 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2354 {
1849 oldp = TermWin.parent[i]; 2355 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2356 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2357 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2358 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360
1854 if (TermWin.parent[i] == display->root) 2361 if (TermWin.parent[i] == display->root)
1855 { 2362 {
1856 if (oldp != None) 2363 if (oldp != None)
1857 pchanged = 1; 2364 pchanged = 1;
2365
1858 break; 2366 break;
1859 } 2367 }
2368
1860 if (oldp != TermWin.parent[i]) 2369 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2370 pchanged = 1;
1862 } 2371 }
1863 2372
1864 n = 0; 2373 n = 0;
… …
1875 break; 2384 break;
1876 } 2385 }
1877 } 2386 }
1878 } 2387 }
1879 2388
1880 if (n > (int) (sizeof (TermWin.parent) 2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2390 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2391 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt, 2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2394 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2395 /* XXX: also turn off Opt_transparent? */
1890 } 2396 }
1891 else 2397 else
1892 { 2398 {
2399#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2400 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2401 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2402 sleep (1);
1903# endif 2403#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2405 for (n = 0; n < (unsigned int)i; n++)
2406 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2408 XClearWindow (display->display, TermWin.parent[n]);
2409 }
2410
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2412 am_transparent = 1;
1911 } 2413 }
1912 2414
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2416 TermWin.parent[i] = None;
1915 } 2417 }
2418
2419 // this is experimental
2420 if (scrollBar.win)
2421 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle ();
2425 scrollbar_show (0);
2426 }
2427
1916 return pchanged; 2428 return pchanged;
1917} 2429}
1918#endif 2430#endif
1919 2431
1920/*}}} */ 2432/*}}} */
… …
1935 } 2447 }
1936 2448
1937 if (ch == NOCHAR) // TODO: improve 2449 if (ch == NOCHAR) // TODO: improve
1938 break; 2450 break;
1939 2451
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
1941 { 2453 {
1942 /* Read a text string from the input buffer */ 2454 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2455 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2456 bool refreshnow = false;
1945 int nlines = 0; 2457 int nlines = 0;
1946 unicode_t *str = buf; 2458 unicode_t *str = buf;
1947 2459
1948 *str++ = ch;
1949
1950 for (;;) 2460 for (;;)
1951 { 2461 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2463 break;
1957 2464
1958 *str++ = ch; 2465 *str++ = ch;
1959 2466
1960 if (ch == '\n') 2467 if (ch == C0_LF)
1961 { 2468 {
1962 nlines++; 2469 nlines++;
1963 refresh_count++; 2470 refresh_count++;
1964 2471
1965 if (! (Options & Opt_jumpScroll) 2472 if (!(Options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2474 {
1968 refreshnow = true; 2475 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2476 ch = NOCHAR;
1971 break; 2477 break;
1972 } 2478 }
1973 2479
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2481 if (nlines >= TermWin.nrow - 1)
1976 { 2482 {
1977 scr_add_lines (buf, nlines, str - buf); 2483 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2484 nlines = 0;
1979 str = buf; 2485 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2489 if (str >= buf + UBUFSIZ)
1984 { 2490 {
1985 ch = NOCHAR; 2491 ch = NOCHAR;
1986 break; 2492 break;
1987 } 2493 }
2494
2495 seq_begin = cmdbuf_ptr;
2496 ch = next_char ();
1988 } 2497 }
1989 2498
1990 scr_add_lines (buf, nlines, str - buf); 2499 scr_add_lines (buf, nlines, str - buf);
1991 2500
1992 /* 2501 /*
1993 * If there have been a lot of new lines, then update the screen 2502 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2503 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2504 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2505 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2506 */
2001 if (refreshnow) 2507 if (refreshnow)
2002 { 2508 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2510 refresh_limit++;
2005 2511 else
2512 {
2513 flag = true;
2006 scr_refresh (refresh_type); 2514 scr_refresh (refresh_type);
2515 }
2007 } 2516 }
2008 2517
2009 } 2518 }
2010 else 2519 else
2011 { 2520 {
… …
2025 } 2534 }
2026 2535
2027 return flag; 2536 return flag;
2028} 2537}
2029 2538
2539// read the next octet
2540unicode_t
2541rxvt_term::next_octet ()
2542{
2543 return cmdbuf_ptr < cmdbuf_endp
2544 ? *cmdbuf_ptr++
2545 : NOCHAR;
2546}
2547
2030// read the next character 2548// read the next character
2031unicode_t 2549unicode_t
2032rxvt_term::next_char () 2550rxvt_term::next_char ()
2033{ 2551{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2552 while (cmdbuf_ptr < cmdbuf_endp)
… …
2065 */ 2583 */
2066unicode_t 2584unicode_t
2067rxvt_term::cmd_getc () 2585rxvt_term::cmd_getc ()
2068{ 2586{
2069 unicode_t c = next_char (); 2587 unicode_t c = next_char ();
2588
2589 if (c == NOCHAR)
2590 throw out_of_input;
2591
2592 return c;
2593}
2594
2595unicode_t
2596rxvt_term::cmd_get8 ()
2597{
2598 unicode_t c = next_octet ();
2070 2599
2071 if (c == NOCHAR) 2600 if (c == NOCHAR)
2072 throw out_of_input; 2601 throw out_of_input;
2073 2602
2074 return c; 2603 return c;
… …
2156/*}}} */ 2685/*}}} */
2157 2686
2158/* *INDENT-OFF* */ 2687/* *INDENT-OFF* */
2159enum { 2688enum {
2160 C1_40 = 0x40, 2689 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2690 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2691 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2692 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2693 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2694};
2166/* *INDENT-ON* */ 2695/* *INDENT-ON* */
2167 2696
2168/*{{{ process non-printing single characters */ 2697/*{{{ process non-printing single characters */
2169void 2698void
… …
2174 case C0_ESC: 2703 case C0_ESC:
2175 process_escape_seq (); 2704 process_escape_seq ();
2176 break; 2705 break;
2177 case C0_ENQ: /* terminal Status */ 2706 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2707 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2710 else
2183 tt_write ((unsigned char *)VT100_ANS, 2711 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2712 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2713 break;
2186 case C0_BEL: /* bell */ 2714 case C0_BEL: /* bell */
2187 scr_bell (); 2715 scr_bell ();
2188 break; 2716 break;
2189 case C0_BS: /* backspace */ 2717 case C0_BS: /* backspace */
… …
2205 break; 2733 break;
2206 case C0_SI: /* shift in - acs */ 2734 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2735 scr_charset_choose (0);
2208 break; 2736 break;
2209 2737
2738#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2739 // 8-bit controls
2211 case 0x90: /* DCS */ 2740 case 0x90: /* DCS */
2212 process_dcs_seq (); 2741 process_dcs_seq ();
2213 break; 2742 break;
2214 case 0x9b: /* CSI */ 2743 case 0x9b: /* CSI */
2215 process_csi_seq (); 2744 process_csi_seq ();
2216 break; 2745 break;
2217 case 0x9d: /* CSI */ 2746 case 0x9d: /* CSI */
2218 process_osc_seq (); 2747 process_osc_seq ();
2219 break; 2748 break;
2749#endif
2220 } 2750 }
2221} 2751}
2222/*}}} */ 2752/*}}} */
2223 2753
2224 2754
… …
2342 break; 2872 break;
2343 2873
2344 /* 8.3.87: NEXT LINE */ 2874 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2875 case C1_NEL: /* ESC E */
2346 { 2876 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2877 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2878 scr_add_lines (nlcr, 1, 2);
2349 } 2879 }
2350 break; 2880 break;
2351 2881
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2882 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 2893 case C1_RI: /* ESC M */
2364 scr_index (DN); 2894 scr_index (DN);
2365 break; 2895 break;
2366 2896
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2897 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2898 /*case C1_SS2: scr_single_shift (2); break; */
2369 2899
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2900 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2901 /*case C1_SS3: scr_single_shift (3); break; */
2372 2902
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2903 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2904 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2905 process_dcs_seq ();
2376 break; 2906 break;
… …
2391 process_osc_seq (); 2921 process_osc_seq ();
2392 break; 2922 break;
2393 2923
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2924 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 2925 case 'c':
2926 mbstate.reset ();
2396 scr_poweron (); 2927 scr_poweron ();
2397 scrollbar_show (1); 2928 scrollbar_show (1);
2398 break; 2929 break;
2399 2930
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2931 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 2943
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2944/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2945/* *INDENT-OFF* */
2415enum { 2946enum {
2416 CSI_ICH = 0x40, 2947 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2948 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2949 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2950 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2951 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2952 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2953 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2968 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2969 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2970 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2971 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2972 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2973 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2974 };
2444/* *INDENT-ON* */ 2975/* *INDENT-ON* */
2445 2976
2446void 2977void
2447rxvt_term::process_csi_seq () 2978rxvt_term::process_csi_seq ()
… …
2646 tt_printf ("\033[0n"); 3177 tt_printf ("\033[0n");
2647 break; 3178 break;
2648 case 6: /* CPR requested */ 3179 case 6: /* CPR requested */
2649 scr_report_position (); 3180 scr_report_position ();
2650 break; 3181 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3182 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3184 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2654 break; 3185 break;
2655#endif
2656 case 8: /* unofficial extension */ 3186 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3188 break;
2659 } 3189 }
2660 break; 3190 break;
2661 3191
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3192 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3331 break;
2802 case 13: /* report window position */ 3332 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3335 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3336 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3337 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3338 break;
2809 case 14: /* report window size (pixels) */ 3339 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
… …
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3345 break;
2816 case 19: /* report window size (chars) */ 3346 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3348 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3349 case 20: /* report icon label */
3350 {
3351 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3352 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s);
3355 }
2823 break; 3356 break;
2824 case 21: /* report window title */ 3357 case 21: /* report window title */
3358 {
3359 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3360 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s);
3363 }
2827 break; 3364 break;
2828#endif
2829 } 3365 }
2830} 3366}
2831#endif 3367#endif
2832 3368
2833/*----------------------------------------------------------------------*/ 3369/*----------------------------------------------------------------------*/
2834/* 3370/*
2835 * get input up until STRING TERMINATOR (or BEL) 3371 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3372 * ends_how is terminator used. returned input must be free()'d
2837 */ 3373 */
2838unsigned char * 3374unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3375rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3376{
2841 int seen_esc = 0; /* seen escape? */ 3377 unicode_t prev = 0, ch;
2842 unsigned int n = 0; 3378 unsigned int n = 0;
2843 unsigned char *s; 3379 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3380 unsigned char string[STRING_MAX];
2846 3381
2847 while ((ch = cmd_getc ())) 3382 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3383 {
2849 if (ch == C0_BEL
2850 || ch == CHAR_ST
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2852 break;
2853
2854 if (ch == C0_ESC) 3384 if (prev == C0_ESC)
2855 {
2856 seen_esc = 1;
2857 continue;
2858 } 3385 {
2859 else if (ch == '\t') 3386 if (ch == 0x5c) /* 7bit ST */
2860 ch = ' '; /* translate '\t' to space */ 3387 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3388 else
3389 return NULL;
3390 }
3391 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break;
3393 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3394 return NULL; /* other control character - exit */
2863 3395
2864 if (n < sizeof (string) - 1) 3396 if (n >= sizeof (string) - 1)
3397 // stop at some sane length
3398 return NULL;
3399
3400 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else
2865 string[n++] = ch; 3406 string[n++] = prev = ch;
2866
2867 seen_esc = 0;
2868 } 3407 }
2869 3408
2870 string[n++] = '\0'; 3409 string[n++] = '\0';
2871 3410
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
… …
2915 { 3454 {
2916 unsigned char *s = get_to_st (eh); 3455 unsigned char *s = get_to_st (eh);
2917 3456
2918 if (s) 3457 if (s)
2919 { 3458 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3459 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3460 free (s);
2934 } 3461 }
2935 } 3462 }
2936} 3463}
3464
3465void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{
3468 if (str[0] == '?' && !str[1])
3469 {
3470 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 }
3474 else
3475 set_window_color (color, str);
3476}
3477
2937/* 3478/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3480 * 0 = change iconName/title
2940 * 1 = change iconName 3481 * 1 = change iconName
2941 * 2 = change title 3482 * 2 = change title
2942 * 4 = change color 3483 * 4 = change color
3484 * 10 = change fg color
3485 * 11 = change bg color
2943 * 12 = change text color 3486 * 12 = change text color
2944 * 13 = change mouse foreground color 3487 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3488 * 17 = change highlight character colour
2946 * 18 = change bold character color 3489 * 18 = change bold character color
2947 * 19 = change underlined character color 3490 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3491 * 46 = change logfile (not implemented)
2949 * 50 = change font 3492 * 50 = change font
2950 * 3493 *
2951 * rxvt extensions: 3494 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3495 * 20 = bg pixmap
2954 * 39 = change default fg color 3496 * 39 = change default fg color
2955 * 49 = change default bg color 3497 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3498 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3499 * 701 = change locale
2958 * 702 = find font 3500 * 702 = find font
3501 * 703 = menu
2959 */ 3502 */
2960void 3503void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3505{
2963 int changed = 0; 3506 int changed = 0;
2964 int color; 3507 int color;
2965 char *buf, *name; 3508 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1];
2966 3510
2967 assert (str != NULL); 3511 assert (str != NULL);
2968 switch (op) 3512 switch (op)
2969 { 3513 {
2970 case XTerm_name: 3514 case XTerm_name:
… …
2974 set_icon_name (str); 3518 set_icon_name (str);
2975 break; 3519 break;
2976 case XTerm_title: 3520 case XTerm_title:
2977 set_title (str); 3521 set_title (str);
2978 break; 3522 break;
3523 case XTerm_property:
3524 if (str[0] == '?')
3525 {
3526 Atom prop = XInternAtom (display->display, str + 1, True);
3527 Atom actual_type;
3528 int actual_format;
3529 unsigned long nitems;
3530 unsigned long bytes_after;
3531 unsigned char *value = 0;
3532 const char *str = "";
3533
3534 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None
3540 && actual_format == 8)
3541 str = (const char *)(value);
3542
3543 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3544
3545 XFree (value);
3546 }
3547 else
3548 {
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550
3551 if (eq)
3552 {
3553 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0],
3555 display->atom (str), XA_STRING, 8,
3556 PropModeReplace, (unsigned char *)eq + 1,
3557 strlen (eq + 1));
3558 }
3559 else
3560 XDeleteProperty (display->display, TermWin.parent[0],
3561 display->atom (str));
3562 }
3563 break;
3564
2979 case XTerm_Color: 3565 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3566 for (buf = (char *)str; buf && *buf;)
2981 { 3567 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3568 if ((name = STRCHR (buf, ';')) == NULL)
2983 break; 3569 break;
… …
2989 break; 3575 break;
2990 3576
2991 if ((buf = STRCHR (name, ';')) != NULL) 3577 if ((buf = STRCHR (name, ';')) != NULL)
2992 *buf++ = '\0'; 3578 *buf++ = '\0';
2993 3579
3580 if (name[0] == '?' && !name[1])
3581 {
3582 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 }
3586 else
2994 set_window_color (color + minCOLOR, name); 3587 set_window_color (color + minCOLOR, name);
2995 } 3588 }
3589 break;
3590 case XTerm_Color00:
3591 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3592 break;
3593 case XTerm_Color01:
3594 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3595 break;
2997#ifndef NO_CURSORCOLOR 3596#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3597 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3598 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3599 break;
3001#endif 3600#endif
3002 case XTerm_Color_pointer: 3601 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3602 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3603 break;
3604 case XTerm_Color_pointer_bg:
3605 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3606 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3607#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3608 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3609 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3610 break;
3009 case XTerm_Color_UL: 3611 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3613 break;
3012 case XTerm_Color_RV: 3614 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3616 break;
3015#endif 3617#endif
3016 3618
3017 case XTerm_Menu:
3018 /*
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break;
3023 case XTerm_Pixmap: 3619 case XTerm_Pixmap:
3024 if (*str != ';') 3620 if (*str != ';')
3025 { 3621 {
3026#if XPM_BACKGROUND 3622#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3623 scale_pixmap (""); /* reset to default scaling */
… …
3050 set_window_color (Color_fg, str); 3646 set_window_color (Color_fg, str);
3051 break; 3647 break;
3052 case XTerm_restoreBG: 3648 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3649 set_window_color (Color_bg, str);
3054 break; 3650 break;
3651
3055 case XTerm_logfile: 3652 case XTerm_logfile:
3056 // TODO, when secure mode? 3653 // TODO, when secure mode?
3057 break; 3654 break;
3655
3058 case XTerm_font: 3656 case XTerm_font:
3657 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc
3660 ? TermWin.fontset->fontdesc : "",
3661 resp);
3662 else
3059 change_font (str); 3663 change_font (str);
3060 break; 3664 break;
3665
3061#ifndef NO_FRILLS 3666#ifndef NO_FRILLS
3062 case XTerm_locale: 3667 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3668 if (query)
3064 tt_printf ("%-.250s\n", locale); 3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3065 else 3670 else
3066 { 3671 {
3067 set_locale (str); 3672 set_locale (str);
3068# ifdef USE_XIM 3673# ifdef USE_XIM
3069 im_cb (); 3674 im_cb ();
3070# endif 3675# endif
3071 } 3676 }
3072 break; 3677 break;
3678
3073 case XTerm_findfont: 3679 case XTerm_findfont:
3074 { 3680 {
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3681 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3077 } 3686 }
3687 break;
3688#endif
3689
3690#ifdef MENUBAR
3691 case XTerm_Menu:
3692 if (Options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3078 break; 3694 break;
3079#endif 3695#endif
3080#if 0 3696#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3697 case XTerm_dumpscreen: /* no error notices */
3082 { 3698 {
3083 int fd; 3699 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3701 {
3086 scr_dump (fd); 3702 scr_dump (fd);
3087 close (fd); 3703 close (fd);
3088 } 3704 }
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3791 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3792 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3793 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3794 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3795 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3796 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3797 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3798 };
3183 3799
3184 if (nargs == 0) 3800 if (nargs == 0)
3185 return; 3801 return;
… …
3204 3820
3205 /* extra handling for values with state unkept */ 3821 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3822 switch (arg[i])
3207 { 3823 {
3208 case 1048: /* alternative cursor save */ 3824 case 1048: /* alternative cursor save */
3209 case 1049: 3825 if (Options & Opt_secondaryScreen)
3210 if (mode == 0) 3826 if (mode == 0)
3211 scr_cursor (RESTORE); 3827 scr_cursor (RESTORE);
3212 else if (mode == 1) 3828 else if (mode == 1)
3213 scr_cursor (SAVE); 3829 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3830 break;
3215 } 3831 }
3216 3832
3217 if (state >= 0) 3833 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3834 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3835 switch (arg[i])
… …
3243 scr_relative_origin (state); 3859 scr_relative_origin (state);
3244 break; 3860 break;
3245 case 7: /* autowrap */ 3861 case 7: /* autowrap */
3246 scr_autowrap (state); 3862 scr_autowrap (state);
3247 break; 3863 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3864 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3865 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3867 PrivateModes &= ~PrivMode_MouseX11;
3252 break; 3868 break;
3253#ifdef menuBar_esc 3869#ifdef menuBar_esc
… …
3267 break; 3883 break;
3268#endif 3884#endif
3269 case 25: /* visible/invisible cursor */ 3885 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3886 scr_cursor_visible (state);
3271 break; 3887 break;
3272 /* case 35: - shift keys */ 3888 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3889 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3890 case 47: /* secondary screen */
3275 scr_change_screen (state); 3891 scr_change_screen (state);
3276 break; 3892 break;
3277 /* case 66: - application key pad */ 3893 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3894 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3895 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3896 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3897 PrivateModes &= ~PrivMode_MouseX10;
3282 break; 3898 break;
3283#if 0 3899#if 0
… …
3294 if (state) 3910 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3911 Options |= Opt_scrollTtyKeypress;
3296 else 3912 else
3297 Options &= ~Opt_scrollTtyKeypress; 3913 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3914 break;
3299 case 1047: /* secondary screen w/ clearing */ 3915 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3916 if (Options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 3917 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 3918 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 3919 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3920 break;
3921 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY)
3925 scr_erase_screen (2);
3926 break;
3306 default: 3927 default:
3307 break; 3928 break;
3308 } 3929 }
3309 } 3930 }
3310} 3931}
… …
3333 rendset = 0, rendstyle = ~RS_None; 3954 rendset = 0, rendstyle = ~RS_None;
3334 break; 3955 break;
3335 case 1: 3956 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3957 rendset = 1, rendstyle = RS_Bold;
3337 break; 3958 break;
3959 //case 2: // faint or second colour
3338 case 4: 3960 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3961 rendset = 1, rendstyle = RS_Uline;
3340 break; 3962 break;
3341 case 5: 3963 case 5: // slowly blinking
3964 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3965 rendset = 1, rendstyle = RS_Blink;
3343 break; 3966 break;
3967 //case 6: // scoansi light background
3344 case 7: 3968 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3969 rendset = 1, rendstyle = RS_RVid;
3346 break; 3970 break;
3347 case 8: 3971 case 8:
3348 // invisible. NYI 3972 // invisible. NYI
3349 break; 3973 break;
3974 //case 9: // crossed out
3975 //case 10: // scoansi acs off, primary font
3976 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font
3978 //...
3979 //case 19: // ninth alt font
3980 //case 20: // gothic
3981 case 21: // disable bold, faint
3982 rendset = 0, rendstyle = RS_Bold;
3983 break;
3350 case 22: 3984 case 22:
3351 rendset = 0, rendstyle = RS_Bold; 3985 rendset = 0, rendstyle = RS_Bold;
3352 break; 3986 break;
3987 //case 23: disable italic
3353 case 24: 3988 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3989 rendset = 0, rendstyle = RS_Uline;
3355 break; 3990 break;
3356 case 25: 3991 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3992 rendset = 0, rendstyle = RS_Blink;
3358 break; 3993 break;
3359 case 27: 3994 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3995 rendset = 0, rendstyle = RS_RVid;
3361 break; 3996 break;
3362 case 28:
3363 // visible. NYI 3997 //case 28: // visible. NYI
3364 break; 3998 //case 29: // not crossed-out
3365 } 3999 }
3366 4000
3367 if (rendset != -1) 4001 if (rendset != -1)
3368 { 4002 {
3369 scr_rendition (rendset, rendstyle); 4003 scr_rendition (rendset, rendstyle);
… …
3446 } 4080 }
3447 } 4081 }
3448} 4082}
3449/*}}} */ 4083/*}}} */
3450 4084
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4085/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4086void
3453rxvt_term::process_graphics () 4087rxvt_term::process_graphics ()
3454{ 4088{
3455 unicode_t ch, cmd = cmd_getc (); 4089 unicode_t ch, cmd = cmd_getc ();
3456 4090

Diff Legend

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