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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.131 by root, Fri Aug 13 22:38:57 2004 UTC

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 {
675 IMSendSpot (); 808 IMSendSpot ();
676#endif 809#endif
677 } 810 }
678 811
679 display->flush (); 812 display->flush ();
813
814 flush_ev.stop ();
680} 815}
681 816
682void 817void
683rxvt_term::check_cb (check_watcher &w) 818rxvt_term::check_cb (check_watcher &w)
684{ 819{
685 SET_R (this); 820 SET_R (this);
686 SET_LOCALE (locale); 821 SET_LOCALE (locale);
687 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;
688 flush (); 837 flush ();
689} 838}
690 839
691#ifdef CURSOR_BLINK 840#ifdef CURSOR_BLINK
692void 841void
706 if (scr_refresh_rend (RS_Blink, RS_Blink)) 855 if (scr_refresh_rend (RS_Blink, RS_Blink))
707 { 856 {
708 hidden_text = !hidden_text; 857 hidden_text = !hidden_text;
709 want_refresh = 1; 858 want_refresh = 1;
710 w.start (w.at + TEXT_BLINK_INTERVAL); 859 w.start (w.at + TEXT_BLINK_INTERVAL);
860 }
861}
862#endif
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);
711 } 903 }
712} 904}
713#endif 905#endif
714 906
715bool 907bool
753 while (pty_fill ()) 945 while (pty_fill ())
754 if (cmd_parse ()) 946 if (cmd_parse ())
755 break; 947 break;
756} 948}
757 949
758#ifdef POINTER_BLANK
759void 950void
760rxvt_term::pointer_unblank () 951rxvt_term::pointer_unblank ()
761{ 952{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor (); 954 recolour_cursor ();
764 955
956#ifdef POINTER_BLANK
765 hidden_pointer = 0; 957 hidden_pointer = 0;
766 958
767 if (Options & Opt_pointerBlank) 959 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay); 960 pointer_ev.start (NOW + pointerBlankDelay);
961#endif
769} 962}
770 963
964#ifdef POINTER_BLANK
771void 965void
772rxvt_term::pointer_blank () 966rxvt_term::pointer_blank ()
773{ 967{
774 if (! (Options & Opt_pointerBlank)) 968 if (! (Options & Opt_pointerBlank))
775 return; 969 return;
965#endif 1159#endif
966 1160
967 switch (ev.type) 1161 switch (ev.type)
968 { 1162 {
969 case KeyPress: 1163 case KeyPress:
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT))
970 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 ();
971 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
972 1213
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 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)
977 mouse_slip_wheel_speed = 0; 1218 mouse_slip_wheel_speed = 0;
978 else 1219#endif
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1220 break;
987 } 1221 }
988#endif
989 1222
990 case ButtonPress: 1223 case ButtonPress:
991 button_press (ev.xbutton); 1224 button_press (ev.xbutton);
992 break; 1225 break;
993 1226
1029 } 1262 }
1030#endif /* OFFIX_DND */ 1263#endif /* OFFIX_DND */
1031 break; 1264 break;
1032 1265
1033 case MappingNotify: 1266 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1267 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1268 break;
1036 1269
1037 /* 1270 /*
1038 * XXX: this is not the _current_ arrangement 1271 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1272 * Here's my conclusion:
1070#endif 1303#endif
1071#ifdef CURSOR_BLINK 1304#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink) 1305 if (Options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074#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
1075 1317
1076 } 1318 }
1077 break; 1319 break;
1078 1320
1079 case FocusOut: 1321 case FocusOut:
1088#ifdef CURSOR_BLINK 1330#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink) 1331 if (Options & Opt_cursorBlink)
1090 cursor_blink_ev.stop (); 1332 cursor_blink_ev.stop ();
1091 hidden_cursor = 0; 1333 hidden_cursor = 0;
1092#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
1093 1344
1094 } 1345 }
1095 break; 1346 break;
1096 1347
1097 case ConfigureNotify: 1348 case ConfigureNotify:
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 } 1358 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109 1360
1110 if (szHint.width != width || szHint.height != height) 1361 if (szHint.width != width || szHint.height != height)
1111 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1113 resize_all_windows (width, height, 1); 1362 resize_all_windows (width, height, 1);
1114 } 1363
1115#ifdef DEBUG_SIZE
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent) 1365 if (Options & Opt_transparent)
1123 { 1366 {
1124 check_our_parents (); 1367 check_our_parents ();
1125 if (am_transparent) 1368 if (am_transparent)
1126 want_full_refresh = 1; 1369 want_refresh = want_full_refresh = 1;
1127 } 1370 }
1128#endif 1371#endif
1129 } 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
1130 break; 1380 break;
1131 1381
1132 case SelectionClear: 1382 case SelectionClear:
1133 selection_clear (); 1383 selection_clear ();
1134 break; 1384 break;
1165 1415
1166 case GraphicsExpose: 1416 case GraphicsExpose:
1167 case Expose: 1417 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1418 if (ev.xany.window == TermWin.vt)
1169 { 1419 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1420 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1421 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1422 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1174 // I don't understand this, so I changed it :) 1424
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1428 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1429 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1430
1178 // ev.xexpose.width, TermWin.height, False); 1431 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1432 }
1182 else 1433 else
1183 { 1434 {
1184 XEvent unused_event; 1435 XEvent unused_event;
1185 1436
1194 scrollbar_show (0); 1445 scrollbar_show (0);
1195 } 1446 }
1196#ifdef MENUBAR 1447#ifdef MENUBAR
1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1198 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);
1199#endif 1455#endif
1200 } 1456 }
1201 break; 1457 break;
1202 1458
1203 case MotionNotify: 1459 case MotionNotify:
1238 if (ev.xbutton.y < TermWin.int_bwidth 1494 if (ev.xbutton.y < TermWin.int_bwidth
1239 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1240 { 1496 {
1241 int dist; 1497 int dist;
1242 1498
1243 pending_scroll_selection=1;
1244
1245 /* don't clobber the current delay if we are 1499 /* don't clobber the current delay if we are
1246 * already in the middle of scrolling. 1500 * already in the middle of scrolling.
1247 */ 1501 */
1248 if (scroll_selection_delay<=0) 1502 if (!sel_scroll_ev.active)
1249 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1250 1504
1251 /* save the event params so we can highlight 1505 /* save the event params so we can highlight
1252 * the selection in the pending-scroll loop 1506 * the selection in the pending-scroll loop
1253 */ 1507 */
1254 selection_save_x=ev.xbutton.x; 1508 selection_save_x=ev.xbutton.x;
1276 else 1530 else
1277 { 1531 {
1278 /* we are within the text window, so we 1532 /* we are within the text window, so we
1279 * shouldn't be scrolling 1533 * shouldn't be scrolling
1280 */ 1534 */
1281 pending_scroll_selection = 0; 1535 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop();
1282 } 1537 }
1283#endif 1538#endif
1284#ifdef MOUSE_THRESHOLD 1539#ifdef MOUSE_THRESHOLD
1285 1540
1286 } 1541 }
1305 } 1560 }
1306 break; 1561 break;
1307 } 1562 }
1308} 1563}
1309 1564
1565#if TRANSPARENT
1310void 1566void
1311rxvt_term::rootwin_cb (XEvent &ev) 1567rxvt_term::rootwin_cb (XEvent &ev)
1312{ 1568{
1313 SET_R (this); 1569 SET_R (this);
1314 SET_LOCALE (locale); 1570 SET_LOCALE (locale);
1315 1571
1316 switch (ev.type) 1572 switch (ev.type)
1317 { 1573 {
1318 case PropertyNotify: 1574 case PropertyNotify:
1319 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1320 {
1321 if (ev.xproperty.state == PropertyNewValue)
1322 selection_property (ev.xproperty.window, ev.xproperty.atom);
1323 break;
1324 }
1325#ifdef TRANSPARENT
1326 else
1327 {
1328 /* 1575 /*
1329 * 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,
1330 * 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.
1331 */ 1578 */
1332 if (xa[XA_XROOTPMAPID] == 0) 1579 if (xa[XA_XROOTPMAPID] == 0)
1333 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1334 1581
1335 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1336 return; 1583 return;
1337 }
1338 1584
1339 /* FALLTHROUGH */ 1585 /* FALLTHROUGH */
1340 case ReparentNotify: 1586 case ReparentNotify:
1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1342 want_full_refresh = 1; 1588 want_refresh = want_full_refresh = 1;
1343 break; 1589 break;
1344#endif
1345 } 1590 }
1346} 1591}
1592#endif
1347 1593
1348void 1594void
1349rxvt_term::button_press (XButtonEvent &ev) 1595rxvt_term::button_press (XButtonEvent &ev)
1350{ 1596{
1351 int reportmode = 0, clickintime; 1597 int reportmode = 0, clickintime;
1503 upordown = 1; /* down */ 1749 upordown = 1; /* down */
1504 } 1750 }
1505 if (upordown) 1751 if (upordown)
1506 { 1752 {
1507#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1508 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1754 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1509#endif 1755#endif
1510 if (scr_page (upordown < 0 ? UP : DN, 1)) 1756 if (scr_page (upordown < 0 ? UP : DN, 1))
1511 { 1757 {
1512 if (upordown < 0) 1758 if (upordown < 0)
1513 scrollBar.setUp (); 1759 scrollBar.setUp ();
1529 break; 1775 break;
1530 case R_SB_ALIGN_BOTTOM: 1776 case R_SB_ALIGN_BOTTOM:
1531 csrO = scrollBar.bot - scrollBar.top; 1777 csrO = scrollBar.bot - scrollBar.top;
1532 break; 1778 break;
1533 } 1779 }
1780
1534 if (scrollBar.style == R_SB_XTERM 1781 if (scrollBar.style == R_SB_XTERM
1535 || scrollbar_above_slider (ev.y) 1782 || scrollbar_above_slider (ev.y)
1536 || scrollbar_below_slider (ev.y)) 1783 || scrollbar_below_slider (ev.y))
1537 scr_move_to ( scrollbar_position (ev.y) - csrO, 1784 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1538 scrollbar_size ()); 1785
1539 scrollBar.setMotion (); 1786 scrollBar.setMotion ();
1540 break; 1787 break;
1541 1788
1542 case Button1: 1789 case Button1:
1543 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1790 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1567 scr_page ((ev.button == Button1 ? DN : UP), 1814 scr_page ((ev.button == Button1 ? DN : UP),
1568 (TermWin.nrow 1815 (TermWin.nrow
1569 * scrollbar_position (ev.y) 1816 * scrollbar_position (ev.y)
1570 / scrollbar_size ())); 1817 / scrollbar_size ()));
1571 } 1818 }
1819
1572 break; 1820 break;
1573 } 1821 }
1574 } 1822 }
1575 return; 1823 return;
1576 } 1824 }
1600 refresh_type &= ~SMOOTH_REFRESH; 1848 refresh_type &= ~SMOOTH_REFRESH;
1601#endif 1849#endif
1602 1850
1603 } 1851 }
1604#ifdef SELECTION_SCROLLING 1852#ifdef SELECTION_SCROLLING
1605 pending_scroll_selection=0; 1853 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop();
1606#endif 1855#endif
1607 if (ev.window == TermWin.vt) 1856 if (ev.window == TermWin.vt)
1608 { 1857 {
1609 if (reportmode) 1858 if (reportmode)
1610 { 1859 {
1652 case Button5: 1901 case Button5:
1653 { 1902 {
1654 int i; 1903 int i;
1655 page_dirn v; 1904 page_dirn v;
1656 1905
1657 v = (ev.button == Button4) ? UP : DN; 1906 v = ev.button == Button4 ? UP : DN;
1907
1658 if (ev.state & ShiftMask) 1908 if (ev.state & ShiftMask)
1659 i = 1; 1909 i = 1;
1660 else if ((Options & Opt_mouseWheelScrollPage)) 1910 else if (Options & Opt_mouseWheelScrollPage)
1661 i = TermWin.nrow - 1; 1911 i = TermWin.nrow - 1;
1662 else 1912 else
1663 i = 5; 1913 i = 5;
1914
1664# ifdef MOUSE_SLIP_WHEELING 1915# ifdef MOUSE_SLIP_WHEELING
1665 if (ev.state & ControlMask) 1916 if (ev.state & ControlMask)
1666 { 1917 {
1667 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)
1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924
1925 slip_wheel_ev.start ();
1669 } 1926 }
1927 else
1928 {
1670# endif 1929# endif
1671# ifdef JUMP_MOUSE_WHEEL 1930# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1678 scr_page (v, 1); 1931 scr_page (v, i);
1679 scr_refresh (SMOOTH_REFRESH); 1932 scr_refresh (SMOOTH_REFRESH);
1680 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
1681 } 1943 }
1682# endif 1944#endif
1683
1684 } 1945 }
1685 break; 1946 break;
1686#endif 1947#endif
1687
1688 } 1948 }
1689 } 1949 }
1690#ifdef MENUBAR 1950#ifdef MENUBAR
1691 else if (isMenuBarWindow (ev.window)) 1951 else if (isMenuBarWindow (ev.window))
1692 menubar_control (ev); 1952 menubar_control (ev);
1693#endif 1953#endif
1694} 1954}
1695 1955
1696#ifdef TRANSPARENT 1956#ifdef TRANSPARENT
1697#if TINTING 1957#if TINTING
1698/* shading taken from eterm-0.9.2 */ 1958/* taken from aterm-0.4.2 */
1699/* RGB 15 */
1700 1959
1701static void 1960typedef uint32_t RUINT32T;
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706 1961
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 1962void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 1963{
1709 /* No saturation */ 1964 int sh_r, sh_g, sh_b;
1710 for (y = h; --y >= 0;) { 1965 RUINT32T mask_r, mask_g, mask_b;
1711 for (x = -w; x < 0; x++) { 1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1712 int r, g, 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;
1713 1970
1714 b = ((uint16_t *) ptr)[x]; 1971 Visual* visual = display->visual;
1715 r = (b & 0x7c00) * rm; 1972
1716 g = (b & 0x3e0) * gm; 1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1717 b = (b & 0x1f) * bm; 1974
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 1975 /* for convenience */
1719 | ((g >> 8) & 0x3e0) 1976 mask_r = visual->red_mask;
1720 | ((b >> 8) & 0x1f); 1977 mask_g = visual->green_mask;
1721 } 1978 mask_b = visual->blue_mask;
1722 ptr += bpl; 1979
1723 } 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;
1724 } else { 2053 } else {
1725 for (y = h; --y >= 0;) { 2054 if (shade < 0) shade = 0;
1726 for (x = -w; x < 0; x++) { 2055 if (shade > 100) shade = 100;
1727 int r, g, b;
1728 2056
1729 b = ((uint16_t *) ptr)[x]; 2057 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1730 r = (b & 0x7c00) * rm; 2058
1731 g = (b & 0x3e0) * gm; 2059 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1732 b = (b & 0x1f) * bm; 2060 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1733 r |= (!(r >> 15) - 1); 2061 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1734 g |= (!(g >> 10) - 1); 2062 }
1735 b |= (!(b >> 5) - 1); 2063
1736 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2064 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1737 | ((g >> 8) & 0x3e0) 2065 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1738 | ((b >> 8) & 0x1f); 2066 {
1739 } 2067 unsigned int tmp;
1740 ptr += bpl; 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++)
1741 } 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);
1742 } 2120 }
1743} 2121 break;
1744 2122 }
1745/* RGB 16 */ 2123 case 16:
1746static void 2124 {
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2125 unsigned short *p1, *pf, *p, *pl;
1748{ 2126 p1 = (unsigned short *) srcImage->data;
1749 unsigned char *ptr; 2127 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1750 int x, y; 2128 while (p1 < pf)
1751 2129 {
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2130 p = p1;
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2131 pl = p1 + srcImage->width;
1754 /* No saturation */ 2132 for (; p < pl; p++)
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 } 2133 {
1769 } else { 2134 *p = lookup_r[(*p & 0xf800)>>11] |
1770 for (y = h; --y >= 0;) { 2135 lookup_g[(*p & 0x07e0)>> 5] |
1771 for (x = -w; x < 0; x++) { 2136 lookup_b[(*p & 0x001f)];
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 } 2137 }
1785 ptr += bpl; 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)
1786 } 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);
1787 } 2158 }
1788} 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);
1789 2166
1790/* RGB 24 */ 2167 while (p1 < pf)
1791static void 2168 {
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2169 p = p1;
1793{ 2170 pl = p1 + srcImage->width;
1794 unsigned char *ptr; 2171 for (; p < pl; p++)
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 } 2172 {
1822 } else { 2173 *p = lookup_r[(*p & 0xff0000)>>16] |
1823 for (y = h; --y >= 0;) { 2174 lookup_g[(*p & 0x00ff00)>> 8] |
1824 for (x = -(w * 3); x < 0; x += 3) { 2175 lookup_b[(*p & 0x0000ff)] |
1825 int r, g, b; 2176 (*p & ~0xffffff);
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 } 2177 }
1853 ptr += bpl; 2178 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1854 } 2179 }
2180 break;
2181 }
1855 } 2182 }
1856}
1857 2183
1858/* RGB 32 */ 2184 free (lookup);
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928} 2185}
1929
1930#endif 2186#endif
1931 2187
1932/* 2188/*
1933 * Check our parents are still who we think they are. 2189 * Check our parents are still who we think they are.
1934 * Do transparency updates if required 2190 * Do transparency updates if required
1957 if (rootdepth != wattr.depth) 2213 if (rootdepth != wattr.depth)
1958 { 2214 {
1959 if (am_transparent) 2215 if (am_transparent)
1960 { 2216 {
1961 pchanged = 1; 2217 pchanged = 1;
1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1963 am_transparent = am_pixmap_trans = 0; 2219 am_transparent = am_pixmap_trans = 0;
1964 } 2220 }
1965 2221
1966 return pchanged; /* Don't try any more */ 2222 return pchanged; /* Don't try any more */
1967 } 2223 }
1983 i = (xa[XA_XSETROOTID] 2239 i = (xa[XA_XSETROOTID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success); 2242 &nitems, &bytes_after, &prop) == Success);
1987 2243
1988 if (!i || prop == NULL) 2244 if (!i || prop == NULL
2245#if TINTING
2246 || !rs[Rs_color + Color_tint]
2247#endif
2248 )
1989 have_pixmap = 0; 2249 have_pixmap = 0;
1990 else 2250 else
1991 { 2251 {
1992 have_pixmap = 1; 2252 have_pixmap = 1;
1993 rootpixmap = *(Pixmap *)prop; 2253 rootpixmap = *(Pixmap *)prop;
2055 XFreePixmap (display->display, TermWin.pixmap); 2315 XFreePixmap (display->display, TermWin.pixmap);
2056 2316
2057#if TINTING 2317#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint)) 2318 if (ISSET_PIXCOLOR (Color_tint))
2059 { 2319 {
2060 unsigned short shade, rm, gm, bm; 2320 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2061 2322
2062 PixColors[Color_tint].get (display, rm, gm, bm); 2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2063 2324
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2325 ShadeXImage (display, image, shade, rm, gm, bm);
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 } 2326 }
2075#endif 2327#endif
2076 2328
2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2078 szHint.width, szHint.height, image->depth); 2330 szHint.width, szHint.height, image->depth);
2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2081 nx, ny, image->width, image->height); 2333 nx, ny, image->width, image->height);
2082 XFreeGC (display->display, gc); 2334 XFreeGC (display->display, gc);
2083 XDestroyImage (image); 2335 XDestroyImage (image);
2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2085 TermWin.pixmap); 2337 XClearWindow (display->display, TermWin.parent[0]);
2086 2338
2087 if (!am_transparent || !am_pixmap_trans) 2339 if (!am_transparent || !am_pixmap_trans)
2088 pchanged = 1; 2340 pchanged = 1;
2089 2341
2090 am_transparent = am_pixmap_trans = 1; 2342 am_transparent = am_pixmap_trans = 1;
2135 } 2387 }
2136 2388
2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2138 { 2390 {
2139 D_X ((stderr, "InheritPixmap Turning off")); 2391 D_X ((stderr, "InheritPixmap Turning off"));
2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2142 am_transparent = 0; 2394 am_transparent = 0;
2143 /* XXX: also turn off Opt_transparent? */ 2395 /* XXX: also turn off Opt_transparent? */
2144 } 2396 }
2145 else 2397 else
2146 { 2398 {
2149 * needed for fvwm2.2.2 (and before?) */ 2401 * needed for fvwm2.2.2 (and before?) */
2150 sleep (1); 2402 sleep (1);
2151#endif 2403#endif
2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2153 for (n = 0; n < (unsigned int)i; n++) 2405 for (n = 0; n < (unsigned int)i; n++)
2406 {
2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]);
2409 }
2155 2410
2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2157 am_transparent = 1; 2412 am_transparent = 1;
2158 } 2413 }
2159 2414
2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2161 TermWin.parent[i] = None; 2416 TermWin.parent[i] = None;
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);
2162 } 2426 }
2163 2427
2164 return pchanged; 2428 return pchanged;
2165} 2429}
2166#endif 2430#endif
2191 unicode_t buf[UBUFSIZ]; 2455 unicode_t buf[UBUFSIZ];
2192 bool refreshnow = false; 2456 bool refreshnow = false;
2193 int nlines = 0; 2457 int nlines = 0;
2194 unicode_t *str = buf; 2458 unicode_t *str = buf;
2195 2459
2196 *str++ = ch;
2197
2198 for (;;) 2460 for (;;)
2199 { 2461 {
2200 seq_begin = cmdbuf_ptr;
2201 ch = next_char ();
2202
2203 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break; 2463 break;
2205 2464
2206 *str++ = ch; 2465 *str++ = ch;
2207 2466
2208 if (ch == C0_LF) 2467 if (ch == C0_LF)
2209 { 2468 {
2210 nlines++; 2469 nlines++;
2211 refresh_count++; 2470 refresh_count++;
2212 2471
2213 if (! (Options & Opt_jumpScroll) 2472 if (!(Options & Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2215 { 2474 {
2216 refreshnow = true; 2475 refreshnow = true;
2217 flag = true;
2218 ch = NOCHAR; 2476 ch = NOCHAR;
2219 break; 2477 break;
2220 } 2478 }
2221 2479
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2223 if (nlines >= TermWin.nrow - 1) 2481 if (nlines >= TermWin.nrow - 1)
2224 { 2482 {
2225 scr_add_lines (buf, nlines, str - buf); 2483 scr_add_lines (buf, nlines, str - buf);
2226 nlines = 0; 2484 nlines = 0;
2227 str = buf; 2485 str = buf;
2231 if (str >= buf + UBUFSIZ) 2489 if (str >= buf + UBUFSIZ)
2232 { 2490 {
2233 ch = NOCHAR; 2491 ch = NOCHAR;
2234 break; 2492 break;
2235 } 2493 }
2494
2495 seq_begin = cmdbuf_ptr;
2496 ch = next_char ();
2236 } 2497 }
2237 2498
2238 scr_add_lines (buf, nlines, str - buf); 2499 scr_add_lines (buf, nlines, str - buf);
2239 2500
2240 /* 2501 /*
2241 * 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
2242 * 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.
2243 * the number of pages between refreshes is refresh_limit, which 2504 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling. 2505 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */ 2506 */
2249 if (refreshnow) 2507 if (refreshnow)
2250 { 2508 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++; 2510 refresh_limit++;
2253 else 2511 else
2512 {
2513 flag = true;
2254 scr_refresh (refresh_type); 2514 scr_refresh (refresh_type);
2515 }
2255 } 2516 }
2256 2517
2257 } 2518 }
2258 else 2519 else
2259 { 2520 {
2273 } 2534 }
2274 2535
2275 return flag; 2536 return flag;
2276} 2537}
2277 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
2278// read the next character 2548// read the next character
2279unicode_t 2549unicode_t
2280rxvt_term::next_char () 2550rxvt_term::next_char ()
2281{ 2551{
2282 while (cmdbuf_ptr < cmdbuf_endp) 2552 while (cmdbuf_ptr < cmdbuf_endp)
2313 */ 2583 */
2314unicode_t 2584unicode_t
2315rxvt_term::cmd_getc () 2585rxvt_term::cmd_getc ()
2316{ 2586{
2317 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 ();
2318 2599
2319 if (c == NOCHAR) 2600 if (c == NOCHAR)
2320 throw out_of_input; 2601 throw out_of_input;
2321 2602
2322 return c; 2603 return c;
2452 break; 2733 break;
2453 case C0_SI: /* shift in - acs */ 2734 case C0_SI: /* shift in - acs */
2454 scr_charset_choose (0); 2735 scr_charset_choose (0);
2455 break; 2736 break;
2456 2737
2738#ifdef EIGHT_BIT_CONTROLS
2457 // 8-bit controls 2739 // 8-bit controls
2458 case 0x90: /* DCS */ 2740 case 0x90: /* DCS */
2459 process_dcs_seq (); 2741 process_dcs_seq ();
2460 break; 2742 break;
2461 case 0x9b: /* CSI */ 2743 case 0x9b: /* CSI */
2462 process_csi_seq (); 2744 process_csi_seq ();
2463 break; 2745 break;
2464 case 0x9d: /* CSI */ 2746 case 0x9d: /* CSI */
2465 process_osc_seq (); 2747 process_osc_seq ();
2466 break; 2748 break;
2749#endif
2467 } 2750 }
2468} 2751}
2469/*}}} */ 2752/*}}} */
2470 2753
2471 2754
3062 break; 3345 break;
3063 case 19: /* report window size (chars) */ 3346 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3065 break; 3348 break;
3066 case 20: /* report icon label */ 3349 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 { 3350 {
3069 char *s; 3351 char *s;
3070 XGetIconName (display->display, TermWin.parent[0], &s); 3352 XGetIconName (display->display, TermWin.parent[0], &s);
3071 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);
3072 } 3355 }
3073 break; 3356 break;
3074 case 21: /* report window title */ 3357 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 { 3358 {
3077 char *s; 3359 char *s;
3078 XFetchName (display->display, TermWin.parent[0], &s); 3360 XFetchName (display->display, TermWin.parent[0], &s);
3079 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);
3080 } 3363 }
3081 break; 3364 break;
3082 } 3365 }
3083} 3366}
3084#endif 3367#endif
3085 3368
3089 * ends_how is terminator used. returned input must be free()'d 3372 * ends_how is terminator used. returned input must be free()'d
3090 */ 3373 */
3091unsigned char * 3374unsigned char *
3092rxvt_term::get_to_st (unicode_t &ends_how) 3375rxvt_term::get_to_st (unicode_t &ends_how)
3093{ 3376{
3094 int seen_esc = 0; /* seen escape? */ 3377 unicode_t prev = 0, ch;
3095 unsigned int n = 0; 3378 unsigned int n = 0;
3096 unsigned char *s; 3379 unsigned char *s;
3097 unicode_t ch;
3098 unsigned char string[STRING_MAX]; 3380 unsigned char string[STRING_MAX];
3099 3381
3100 while ((ch = cmd_getc ())) 3382 while ((ch = cmd_getc ()) != NOCHAR)
3101 { 3383 {
3102 if (ch == C0_BEL || ch == CHAR_ST) 3384 if (prev == C0_ESC)
3103 break; 3385 {
3104
3105 if (seen_esc)
3106 if (ch == 0x5c) /* 7bit ST */ 3386 if (ch == 0x5c) /* 7bit ST */
3107 break; 3387 break;
3108 else 3388 else
3109 return NULL; 3389 return NULL;
3110
3111 if (ch == C0_ESC)
3112 { 3390 }
3113 seen_esc = 1; 3391 else if (ch == C0_BEL || ch == CHAR_ST)
3114 continue; 3392 break;
3115 }
3116 else if (ch == C0_HT) 3393 else if (ch < 0x20)
3117 ch = ' '; /* translate '\t' to space */
3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3119 return NULL; /* other control character - exit */ 3394 return NULL; /* other control character - exit */
3120 3395
3121 if (n >= sizeof (string) - 1) 3396 if (n >= sizeof (string) - 1)
3122 // stop at some sane length 3397 // stop at some sane length
3123 return NULL; 3398 return NULL;
3124 3399
3400 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else
3125 string[n++] = ch; 3406 string[n++] = prev = ch;
3126 seen_esc = 0;
3127 } 3407 }
3128 3408
3129 string[n++] = '\0'; 3409 string[n++] = '\0';
3130 3410
3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3185void 3465void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3187{ 3467{
3188 if (str[0] == '?' && !str[1]) 3468 if (str[0] == '?' && !str[1])
3189 { 3469 {
3190 if (Options & Opt_insecure)
3191 {
3192 unsigned short r, g, b; 3470 unsigned short r, g, b;
3193 PixColors[color].get (display, r, g, b); 3471 PixColorsFocused[color].get (display, r, g, b);
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3195 }
3196 } 3473 }
3197 else 3474 else
3198 set_window_color (color, str); 3475 set_window_color (color, str);
3199} 3476}
3200 3477
3300 if ((buf = STRCHR (name, ';')) != NULL) 3577 if ((buf = STRCHR (name, ';')) != NULL)
3301 *buf++ = '\0'; 3578 *buf++ = '\0';
3302 3579
3303 if (name[0] == '?' && !name[1]) 3580 if (name[0] == '?' && !name[1])
3304 { 3581 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b; 3582 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b); 3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3309 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 } 3585 }
3312 else 3586 else
3313 set_window_color (color + minCOLOR, name); 3587 set_window_color (color + minCOLOR, name);
3314 } 3588 }
3315 break; 3589 break;
3379 // TODO, when secure mode? 3653 // TODO, when secure mode?
3380 break; 3654 break;
3381 3655
3382 case XTerm_font: 3656 case XTerm_font:
3383 if (query) 3657 if (query)
3384 {
3385 if (Options & Opt_insecure)
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc
3387 TermWin.fontset->fontdesc 3660 ? TermWin.fontset->fontdesc : "",
3388 ? TermWin.fontset->fontdesc
3389 : "",
3390 resp); 3661 resp);
3391 }
3392 else 3662 else
3393 change_font (str); 3663 change_font (str);
3394 break; 3664 break;
3395 3665
3396#ifndef NO_FRILLS 3666#ifndef NO_FRILLS
3397 case XTerm_locale: 3667 case XTerm_locale:
3398 if (query) 3668 if (query)
3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3402 }
3403 else 3670 else
3404 { 3671 {
3405 set_locale (str); 3672 set_locale (str);
3406# ifdef USE_XIM 3673# ifdef USE_XIM
3407 im_cb (); 3674 im_cb ();
3408# endif 3675# endif
3409 } 3676 }
3410 break; 3677 break;
3411 3678
3412 case XTerm_findfont: 3679 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3414 { 3680 {
3415 int fid = TermWin.fontset->find_font (atoi (str)); 3681 int fid = TermWin.fontset->find_font (atoi (str));
3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, 3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp); 3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3418 } 3686 }
3419 break; 3687 break;
3420#endif 3688#endif
3421 3689
3422#ifdef MENUBAR 3690#ifdef MENUBAR
3423 case XTerm_Menu: 3691 case XTerm_Menu:
3686 rendset = 0, rendstyle = ~RS_None; 3954 rendset = 0, rendstyle = ~RS_None;
3687 break; 3955 break;
3688 case 1: 3956 case 1:
3689 rendset = 1, rendstyle = RS_Bold; 3957 rendset = 1, rendstyle = RS_Bold;
3690 break; 3958 break;
3959 //case 2: // faint or second colour
3691 case 4: 3960 case 4:
3692 rendset = 1, rendstyle = RS_Uline; 3961 rendset = 1, rendstyle = RS_Uline;
3693 break; 3962 break;
3694 case 5: 3963 case 5: // slowly blinking
3964 case 6: // rapidly blinking
3695 rendset = 1, rendstyle = RS_Blink; 3965 rendset = 1, rendstyle = RS_Blink;
3696 break; 3966 break;
3697 //case 6: // scoansi light background 3967 //case 6: // scoansi light background
3698 case 7: 3968 case 7:
3699 rendset = 1, rendstyle = RS_RVid; 3969 rendset = 1, rendstyle = RS_RVid;
3700 break; 3970 break;
3701 case 8: 3971 case 8:
3702 // invisible. NYI 3972 // invisible. NYI
3703 break; 3973 break;
3974 //case 9: // crossed out
3704 //case 10: // scoansi acs off 3975 //case 10: // scoansi acs off, primary font
3705 //case 11: // scoansi acs on 3976 //case 11: // scoansi acs on, first alt font
3706 //case 12: // scoansi acs on, |0x80 3977 //case 12: // scoansi acs on, |0x80, second alt font
3707 case 21: // disable bold, blink and invis (some terminals use this) 3978 //...
3979 //case 19: // ninth alt font
3980 //case 20: // gothic
3981 case 21: // disable bold, faint
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink; 3982 rendset = 0, rendstyle = RS_Bold;
3709 break; 3983 break;
3710 case 22: 3984 case 22:
3711 rendset = 0, rendstyle = RS_Bold; 3985 rendset = 0, rendstyle = RS_Bold;
3712 break; 3986 break;
3987 //case 23: disable italic
3713 case 24: 3988 case 24:
3714 rendset = 0, rendstyle = RS_Uline; 3989 rendset = 0, rendstyle = RS_Uline;
3715 break; 3990 break;
3716 case 25: 3991 case 25:
3717 rendset = 0, rendstyle = RS_Blink; 3992 rendset = 0, rendstyle = RS_Blink;
3718 break; 3993 break;
3719 case 27: 3994 case 27:
3720 rendset = 0, rendstyle = RS_RVid; 3995 rendset = 0, rendstyle = RS_RVid;
3721 break; 3996 break;
3722 case 28:
3723 // visible. NYI 3997 //case 28: // visible. NYI
3724 break; 3998 //case 29: // not crossed-out
3725 } 3999 }
3726 4000
3727 if (rendset != -1) 4001 if (rendset != -1)
3728 { 4002 {
3729 scr_rendition (rendset, rendstyle); 4003 scr_rendition (rendset, rendstyle);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines