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.231 by root, Wed Jan 4 00:13:22 2006 UTC vs.
Revision 1.334 by ayin, Tue Jun 26 13:05:05 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
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>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 55# include "keyboard.h"
60#endif 56#endif
61 57
62#include <csignal> 58#include <csignal>
63 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
64/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
65 65
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 67
71#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
72 69
73#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 144 return;
148 145
149 for (;;) 146 for (;;)
150 { 147 {
151 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
152 149
153 text_t t = l.t[x]; 150 text_t t = l.t[x];
154 151
155 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
156 { 153 {
… …
229# if !UNICODE3 226# if !UNICODE3
230 if (ch >= 0x10000) 227 if (ch >= 0x10000)
231 ch = 0xfffd; 228 ch = 0xfffd;
232# endif 229# endif
233 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
235 } 234 }
236 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
237 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
239 243
240 free (fname); 244 free (fname);
241 245
… …
267 mb[0] = ch[0]; 271 mb[0] = ch[0];
268 len = 1; 272 len = 1;
269 } 273 }
270 274
271 if (len > 0) 275 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
273 else 277 else
274 scr_bell (); 278 scr_bell ();
275 } 279 }
276 280
277 iso14755buf = 0; 281 iso14755buf = 0;
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 309 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
311 316
312 /* 317 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
315 * 320 *
… …
333 Status status_return; 338 Status status_return;
334 339
335#if 0 340#if 0
336#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
340 else 345 else
341#endif 346#endif
342#endif 347#endif
343 { 348 {
… …
380 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
381 } 386 }
382 else 387 else
383#endif 388#endif
384 { 389 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
387 } 392 }
388 393
389 if (valid_keysym) 394 if (valid_keysym)
390 { 395 {
… …
442 scr_move_to (0, 1); 447 scr_move_to (0, 1);
443 return; 448 return;
444 } 449 }
445 else if (keysym == XK_End) 450 else if (keysym == XK_End)
446 { 451 {
447 scr_move_to (1, 0); 452 scr_move_to (1, 1);
448 return; 453 return;
449 } 454 }
450 } 455 }
451#endif 456#endif
452 } 457 }
… …
463 { 468 {
464 switch (keysym) 469 switch (keysym)
465 { 470 {
466 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
469 return; 474 return;
470#if TODO 475#if TODO
471 /* rxvt extras */ 476 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
492 { 497 {
493 commit_iso14755 (); 498 commit_iso14755 ();
494 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
495# if ISO_14755 500# if ISO_14755
496 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
497# endif 510# endif
498 return; 511 return;
499 } 512 }
500 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
501 { 514 {
… …
523 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
524 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
525# endif 538# endif
526 } 539 }
527#endif 540#endif
528 541
529#ifdef PRINTPIPE 542#ifdef PRINTPIPE
530 if (keysym == XK_Print) 543 if (keysym == XK_Print)
531 { 544 {
532 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
533 return; 546 return;
… …
854 { 867 {
855#ifdef META8_OPTION 868#ifdef META8_OPTION
856 /* set 8-bit on */ 869 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
858 { 871 {
859 unsigned char *ch; 872 char *ch;
860 873
861 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 875 *ch |= 0x80;
863 876
864 meta = 0; 877 meta = 0;
… …
866#endif 879#endif
867 /* nil */ ; 880 /* nil */ ;
868 } 881 }
869 } 882 }
870 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
… …
897#ifdef META8_OPTION 913#ifdef META8_OPTION
898 && meta_char == C0_ESC 914 && meta_char == C0_ESC
899#endif 915#endif
900 ) 916 )
901 { 917 {
902 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */
908 unsigned char *p;
909 int i;
910
911 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
912 for (i = 0, p = kbuf; i < len; i++, p++)
913 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
914 fprintf (stderr, "'\n");
915#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
917} 923}
918/*}}} */
919 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 1003unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 1005{
926 unsigned int n, s; 1006 unsigned int n, s;
927 1007
928 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
955void 1035void
956rxvt_term::flush () 1036rxvt_term::flush ()
957{ 1037{
958 flush_ev.stop (); 1038 flush_ev.stop ();
959 1039
960#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
961 if (want_full_refresh) 1041 if (want_full_refresh)
962 { 1042 {
963 want_full_refresh = 0; 1043 want_full_refresh = 0;
964 scr_clear (); 1044 scr_clear ();
965 scr_touch (false); 1045 scr_touch (false);
966 } 1046 }
967#endif 1047#endif
968 1048
969 if (want_refresh) 1049 if (want_refresh)
970 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
971 scr_refresh (refresh_type); 1089 scr_refresh ();
972 scrollbar_show (1); 1090 scrollbar_show (1);
973#ifdef USE_XIM 1091#ifdef USE_XIM
974 IMSendSpot (); 1092 IMSendSpot ();
975#endif 1093#endif
976 } 1094 }
… …
979} 1097}
980 1098
981void 1099void
982rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
983{ 1101{
984 SET_R (this); 1102 make_current ();
985 SET_LOCALE (locale);
986 1103
987 display->flush (); 1104 display->flush ();
988 1105
989 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1108}
992 1109
993void 1110void
994rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
995{ 1112{
996 SET_R (this); 1113 make_current ();
997 SET_LOCALE (locale);
998 1114
999 refresh_limit = 1;
1000 refresh_count = 0; 1115 refresh_count = 0;
1001 flush (); 1116 flush ();
1002} 1117}
1003 1118
1004#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1122{
1008 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1124 want_refresh = 1;
1010 1125
1011 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1127}
1013#endif 1128#endif
1014 1129
1015#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1016void 1131void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1146{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1149 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1150 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1152 }
1039} 1153}
1040#endif 1154#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1159{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1161 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1163 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1165 }
1053} 1166}
1054#endif 1167#endif
… …
1059{ 1172{
1060 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1176 {
1064 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1067 1179
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1180 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1182 }
1072} 1183}
1073#endif 1184#endif
1074 1185
1075#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1076static struct event_handler 1187static struct event_handler
1077{ 1188{
1078 check_watcher cw_yield; 1189 check_watcher yield_ev;
1079 1190
1080 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1081 { 1192 {
1082 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1083 w.stop (); 1201 w.stop ();
1084 } 1202 }
1085 1203
1086 event_handler () 1204 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1088 { 1206 {
1089 } 1207 }
1090} event_handler; 1208} event_handler;
1091#endif 1209#endif
1092 1210
… …
1095{ 1213{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1215
1098 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
1099 { 1217 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1219 n = 0;
1102 } 1220 }
1103 1221
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1107 1225
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1227
1110 if (r > 0) 1228 if (r > 0)
1111 { 1229 {
1112 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1113 return true; 1231 return true;
1114 } 1232 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1234 {
1117#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1118 if (display->is_local) 1236 if (display->is_local)
1119 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1120#endif 1238#endif
1121 } 1239 }
1122 else 1240 else
1123 { 1241 {
1124 pty_ev.stop (); 1242 pty_ev.stop ();
1125 1243
1126 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1127 destroy (); 1245 destroy ();
1128 } 1246 }
1129 1247
1130 return false; 1248 return false;
1131} 1249}
1132 1250
1133void 1251void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1253{
1136 SET_R (this); 1254 make_current ();
1137 SET_LOCALE (locale);
1138 1255
1139 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1258 while (pty_fill ())
1142 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1147} 1264}
1148 1265
1149void 1266void
1150rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1151{ 1268{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1153 recolour_cursor (); 1270 recolour_cursor ();
1154 1271
1155#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1273 hidden_pointer = 0;
1157 1274
1158 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1159 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1160#endif 1277#endif
1161} 1278}
1162 1279
1163#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1164void 1281void
1165rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1166{ 1283{
1167 if (! OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1168 return; 1285 return;
1169 1286
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1171 XFlush (display->display); 1288 XFlush (dpy);
1172 1289
1173 hidden_pointer = 1; 1290 hidden_pointer = 1;
1174} 1291}
1175 1292
1176void 1293void
1177rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1178{ 1295{
1179 SET_R (this); 1296 make_current ();
1180 SET_LOCALE (locale);
1181 1297
1182 pointer_blank (); 1298 pointer_blank ();
1183} 1299}
1184#endif 1300#endif
1185 1301
… …
1250 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1251 (32 + x + 1), 1367 (32 + x + 1),
1252 (32 + y + 1)); 1368 (32 + y + 1));
1253} 1369}
1254 1370
1255#ifdef USING_W11LIB
1256void
1257rxvt_W11_process_x_event (XEvent *ev)
1258{
1259 rxvt_t *r = rxvt_get_r ();
1260
1261 x_cb (*ev);
1262}
1263#endif
1264
1265/*{{{ process an X event */ 1371/*{{{ process an X event */
1266void 1372void
1267rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1268{ 1374{
1269 dDisp; 1375 make_current ();
1270 1376
1271 SET_R (this); 1377 dLocal (Display *, dpy);
1272 SET_LOCALE (locale);
1273 1378
1274#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1382 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1383
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // for XQueryPointer
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1387 unsigned int unused_mask;
1304 1388
1305 switch (ev.type) 1389 switch (ev.type)
1306 { 1390 {
1307 case KeyPress: 1391 case KeyPress:
1308#if ISO_14755 1392 key_press (ev.xkey);
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1311 lookup_key (ev.xkey);
1312
1313 break; 1393 break;
1314 1394
1315 case KeyRelease: 1395 case KeyRelease:
1316 { 1396 key_release (ev.xkey);
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1318 KeySym ks;
1319
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif
1322
1323#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support
1325 if (iso14755buf)
1326 if (iso14755buf & ISO_14755_52)
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331# if ISO_14755
1332 // iso14755 part 5.2 handling: release time
1333 // first: controls
1334 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f)))
1337 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1339 commit_iso14755 ();
1340 return; // case-break;
1341 }
1342
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks)
1345 {
1346 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 ();
1348 return; // case-break;
1349 }
1350
1351 scr_bell ();
1352# endif
1353 iso14755buf = 0;
1354 break;
1355 }
1356 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1357 {
1358# if ENABLE_OVERLAY
1359 scr_overlay_off ();
1360# endif
1361 if (iso14755buf & ISO_14755_51)
1362 commit_iso14755 ();
1363#if ISO_14755
1364 else if (iso14755buf & ISO_14755_STARTED)
1365 {
1366 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1367
1368 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1369 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1370 }
1371# endif
1372 else
1373 iso14755buf = 0;
1374 }
1375#endif
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1397 break;
1384 }
1385 1398
1386 case ButtonPress: 1399 case ButtonPress:
1387 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1388 break; 1401 break;
1389 1402
… …
1391 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1392 break; 1405 break;
1393 1406
1394 case ClientMessage: 1407 case ClientMessage:
1395 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy (); 1418 destroy ();
1419 }
1400#if ENABLE_EWMH 1420#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1405#endif 1436#endif
1406 } 1437 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1416#ifdef OFFIX_DND
1417 /* OffiX Dnd (drag 'n' drop) protocol */
1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1419 && (ev.xclient.data.l[0] == DndFile
1420 || ev.xclient.data.l[0] == DndDir
1421 || ev.xclient.data.l[0] == DndLink))
1422 {
1423 /* Get Dnd data */
1424 Atom ActualType;
1425 int ActualFormat;
1426 unsigned char *data;
1427 unsigned long Size, RemainingBytes;
1428
1429 XGetWindowProperty (disp, display->root,
1430 xa[XA_DNDSELECTION],
1431 0L, 1000000L,
1432 False, AnyPropertyType,
1433 &ActualType, &ActualFormat,
1434 &Size, &RemainingBytes,
1435 &data);
1436 set_string_property (XA_CUT_BUFFER0, data);
1437 XFree (data);
1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1440 }
1441#endif /* OFFIX_DND */
1442 break; 1438 break;
1443 1439
1444 case MappingNotify: 1440 case MappingNotify:
1445 XRefreshKeyboardMapping (&ev.xmapping); 1441 XRefreshKeyboardMapping (&ev.xmapping);
1446 break; 1442 break;
… …
1469 break; 1465 break;
1470 } 1466 }
1471 break; 1467 break;
1472 1468
1473 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1474 focus_in (); 1473 focus_in ();
1475 break; 1474 break;
1476 1475
1477 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1478 focus_out (); 1480 focus_out ();
1479 break; 1481 break;
1480 1482
1481 case ConfigureNotify: 1483 case ConfigureNotify:
1482 if (ev.xconfigure.window == parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1483 { 1485 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1487 ;
1486 1488
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1490 {
1489 seen_resize = 1; 1491 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1491 } 1500 }
1492 1501
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1494 if (OPTION (Opt_transparent)) 1505 if (option (Opt_transparent))
1495 check_our_parents (); 1506 check_our_parents ();
1496#endif 1507#endif
1497 } 1508 }
1498 break; 1509 break;
1499 1510
1500 case PropertyNotify: 1511 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1514 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1516
1505 break; 1517 break;
1506 1518
1507 case SelectionClear: 1519 case SelectionClear:
1508 selection_clear (); 1520 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1525 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1526 break;
1515 1527
1516 case SelectionRequest: 1528 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1530 break;
1531
1532 case MapNotify:
1533 mapped = 1;
1534#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1536#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1538 break;
1519 1539
1520 case UnmapNotify: 1540 case UnmapNotify:
1521 mapped = 0; 1541 mapped = 0;
1522#ifdef TEXT_BLINK 1542#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1524#endif 1544#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 break; 1546 break;
1526 1547
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break;
1533
1534#ifdef TRANSPARENT 1548#ifdef ENABLE_TRANSPARENCY
1535 case ReparentNotify: 1549 case ReparentNotify:
1536 rootwin_cb (ev); 1550 rootwin_cb (ev);
1537 break; 1551 break;
1538#endif /* TRANSPARENT */ 1552#endif /* ENABLE_TRANSPARENCY */
1539 1553
1540 case GraphicsExpose: 1554 case GraphicsExpose:
1541 case Expose: 1555 case Expose:
1542 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1543 { 1557 {
1544 do 1558 do
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1562
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1564
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1554 1568
1555 scr_refresh (refresh_type); 1569 want_refresh = 1;
1556 } 1570 }
1557 else 1571 else
1558 { 1572 {
1559 XEvent unused_event; 1573 XEvent unused_event;
1560 1574
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1576 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1578 ;
1565 1579
1566 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1567 { 1581 {
1568 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1569 scrollbar_show (0); 1583 scrollbar_show (0);
1570 } 1584 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575 1585
1576#ifdef TRANSPARENT 1586#ifdef ENABLE_TRANSPARENCY
1577 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1579#endif 1589#endif
1580 } 1590 }
1581 break; 1591 break;
1582 1592
1583 case MotionNotify: 1593 case MotionNotify:
1584#ifdef POINTER_BLANK 1594#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1595 if (hidden_pointer)
1586 pointer_unblank (); 1596 pointer_unblank ();
1587#endif 1597#endif
1588#if MENUBAR
1589 if (isMenuBarWindow (ev.xany.window))
1590 {
1591 menubar_control (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1599 break;
1597 1600
1598 if (ev.xany.window == vt) 1601 if (ev.xany.window == vt)
1599 { 1602 {
1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1605 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1607 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1603 ; 1609 ;
1604 1610
1605 XQueryPointer (disp, vt, 1611 XQueryPointer (dpy, vt,
1606 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1615 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
… …
1674#endif 1680#endif
1675 } 1681 }
1676 } 1682 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1684 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1681 ; 1687 ;
1682 1688
1683 XQueryPointer (disp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1684 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1693 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1695 scrollbar_size ());
1690 scr_refresh (refresh_type);
1691 refresh_limit = 0; 1696 want_refresh = 1;
1692 scrollbar_show (1); 1697 scrollbar_show (1);
1693 } 1698 }
1694 break; 1699 break;
1695 } 1700 }
1701
1702#if defined(CURSOR_BLINK)
1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1704 {
1705 if (hidden_cursor)
1706 {
1707 hidden_cursor = 0;
1708 want_refresh = 1;
1709 }
1710
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1712 }
1713#endif
1714
1715#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1717 {
1718 if (ev.type == MotionNotify
1719 || ev.type == ButtonPress
1720 || ev.type == ButtonRelease)
1721 if (hidden_pointer)
1722 pointer_unblank ();
1723
1724 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank ();
1726 }
1727#endif
1696} 1728}
1697 1729
1698void 1730void
1699rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1700{ 1732{
1701 if (!focus) 1733 if (!focus)
1702 { 1734 {
1703 focus = 1; 1735 focus = 1;
1704 want_refresh = 1; 1736 want_refresh = 1;
1705 1737
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1707 1739
1708#if USE_XIM 1740#if USE_XIM
1709 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1710 { 1742 {
1711 IMSetStatusPosition (); 1743 IMSetPosition ();
1712 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1713 } 1745 }
1714#endif 1746#endif
1715#if CURSOR_BLINK 1747#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1750#endif
1719#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1721 { 1753 {
1722 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1723 scr_recolour (); 1755 scr_recolour ();
1724 } 1756 }
1725#endif 1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif
1726 } 1771 }
1727} 1772}
1728 1773
1729void 1774void
1730rxvt_term::focus_out () 1775rxvt_term::focus_out ()
… …
1732 if (focus) 1777 if (focus)
1733 { 1778 {
1734 focus = 0; 1779 focus = 0;
1735 want_refresh = 1; 1780 want_refresh = 1;
1736 1781
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1783
1739#if ENABLE_FRILLS || ISO_14755 1784#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1785 if (iso14755buf)
1741 { 1786 {
1742 iso14755buf = 0; 1787 iso14755buf = 0;
… …
1748#if USE_XIM 1793#if USE_XIM
1749 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1750 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1751#endif 1796#endif
1752#if CURSOR_BLINK 1797#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1798 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1755 hidden_cursor = 0; 1800 hidden_cursor = 0;
1756#endif 1801#endif
1757#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
… …
1762 } 1807 }
1763#endif 1808#endif
1764 } 1809 }
1765} 1810}
1766 1811
1767#if TRANSPARENT 1812void
1813rxvt_term::update_fade_color (unsigned int idx)
1814{
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 rgba c;
1819 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 }
1822#endif
1823}
1824
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1768void 1826void
1769rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1828{
1771 SET_R (this); 1829 make_current ();
1772 SET_LOCALE (locale);
1773 1830
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return;
1834
1835# if ENABLE_TRANSPARENCY
1774 switch (ev.type) 1836 switch (ev.type)
1775 { 1837 {
1776 case PropertyNotify: 1838 case PropertyNotify:
1777 /* 1839 /*
1778 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
… …
1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1783 return; 1845 return;
1784 1846
1785 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1786 case ReparentNotify: 1848 case ReparentNotify:
1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1788 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1789 break; 1851 break;
1790 } 1852 }
1853# endif
1791} 1854}
1792#endif 1855#endif
1793 1856
1794void 1857void
1795rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
1804 /* 1867 /*
1805 * VT window processing of button press 1868 * VT window processing of button press
1806 */ 1869 */
1807 if (ev.window == vt) 1870 if (ev.window == vt)
1808 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1809#if ISO_14755 1875#if ISO_14755
1810 // 5.4 1876 // 5.4
1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1812 { 1878 {
1813 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1827 { 1893 {
1828 /* same button, within alloted time */ 1894 /* same button, within alloted time */
1829 MEvent.clicks++; 1895 MEvent.clicks++;
1896
1830 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1831 { 1898 {
1832 /* only report double clicks */ 1899 /* only report double clicks */
1833 MEvent.clicks = 2; 1900 MEvent.clicks = 2;
1834 mouse_report (ev); 1901 mouse_report (ev);
… …
1854 else 1921 else
1855 { 1922 {
1856 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1924 MEvent.clicks = 0;
1858 1925
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1926 switch (ev.button)
1861 { 1927 {
1862 case Button1: 1928 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1929 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1930 /* should be done in screen.C */
1865#if ENABLE_FRILLS 1931#if ENABLE_FRILLS
1866 selection.rect = !!(ev.state & ModMetaMask); 1932 selection.rect = !!(ev.state & ModMetaMask);
1867#else 1933#else
1868 selection.rect = false; 1934 selection.rect = false;
1869#endif 1935#endif
1870 1936
1871 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1939 {
1874 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1876 else 1942 else
1877 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
1878 } 1944 }
1879 else 1945 else
1880 { 1946 {
1881 if (MEvent.button == Button1 && clickintime) 1947 if (MEvent.button == Button1 && clickintime)
1882 MEvent.clicks++; 1948 MEvent.clicks++;
1883 else 1949 else
1884 MEvent.clicks = 1; 1950 MEvent.clicks = 1;
1885 1951
1886 selection_click (MEvent.clicks, ev.x, ev.y); 1952 selection_click (MEvent.clicks, ev.x, ev.y);
1887 } 1953 }
1888 1954
1889 MEvent.button = Button1; 1955 MEvent.button = Button1;
1890 break; 1956 break;
1891 1957
1892 case Button3: 1958 case Button3:
1893 if (MEvent.button == Button3 && clickintime) 1959 if (MEvent.button == Button3 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1895 else 1961 else
1896 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1897 1963
1898 MEvent.button = Button3; 1964 MEvent.button = Button3;
1899 break; 1965 break;
1900 } 1966 }
1901 } 1967 }
1902 1968
1903 MEvent.time = ev.time; 1969 MEvent.time = ev.time;
1904 return; 1970 return;
1905 } 1971 }
1906 1972
… …
2042 } 2108 }
2043 2109
2044 break; 2110 break;
2045 } 2111 }
2046 } 2112 }
2113
2047 return; 2114 return;
2048 } 2115 }
2049#if MENUBAR
2050 /*
2051 * Menubar window processing of button press
2052 */
2053 if (isMenuBarWindow (ev.window))
2054 menubar_control (ev);
2055#endif
2056} 2116}
2057 2117
2058void 2118void
2059rxvt_term::button_release (XButtonEvent &ev) 2119rxvt_term::button_release (XButtonEvent &ev)
2060{ 2120{
… …
2066 2126
2067 if (scrollbar_isUpDn ()) 2127 if (scrollbar_isUpDn ())
2068 { 2128 {
2069 scrollBar.setIdle (); 2129 scrollBar.setIdle ();
2070 scrollbar_show (0); 2130 scrollbar_show (0);
2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 refresh_type &= ~SMOOTH_REFRESH;
2073#endif
2074 } 2131 }
2075 2132
2076#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active) 2134 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2135 sel_scroll_ev.stop();
2079#endif 2136#endif
2080 2137
2081 if (ev.window == vt) 2138 if (ev.window == vt)
2082 { 2139 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2141 return;
2142
2083#if ISO_14755 2143#if ISO_14755
2084 // 5.4 2144 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return; 2146 return;
2087#endif 2147#endif
2148
2088 if (reportmode) 2149 if (reportmode)
2089 { 2150 {
2090 /* mouse report from vt window */ 2151 /* mouse report from vt window */
2091 /* don't report release of wheel "buttons" */ 2152 /* don't report release of wheel "buttons" */
2092 if (ev.button >= 4) 2153 if (ev.button >= 4)
… …
2122 { 2183 {
2123 case Button1: 2184 case Button1:
2124 case Button3: 2185 case Button3:
2125 selection_make (ev.time); 2186 selection_make (ev.time);
2126 break; 2187 break;
2188
2127 case Button2: 2189 case Button2:
2128 selection_request (ev.time, ev.x, ev.y); 2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2192 break;
2193
2130#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2131 case Button4: 2195 case Button4:
2132 case Button5: 2196 case Button5:
2133 { 2197 {
2134 int i; 2198 int i;
… …
2136 2200
2137 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2138 2202
2139 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2140 i = 1; 2204 i = 1;
2141 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2142 i = nrow - 1; 2206 i = nrow - 1;
2143 else 2207 else
2144 i = 5; 2208 i = 5;
2145 2209
2146# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
… …
2156 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2157 } 2221 }
2158 else 2222 else
2159 { 2223 {
2160# endif 2224# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2225 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2226 scrollbar_show (1);
2165# else
2166 while (i--)
2167 {
2168 scr_page (v, 1);
2169 scr_refresh (SMOOTH_REFRESH);
2170 scrollbar_show (1);
2171 }
2172# endif
2173# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2174 } 2228 }
2175#endif 2229# endif
2176 } 2230 }
2177 break; 2231 break;
2178#endif 2232#endif
2179 } 2233 }
2180 } 2234 }
2181#ifdef MENUBAR
2182 else if (isMenuBarWindow (ev.window))
2183 menubar_control (ev);
2184#endif
2185} 2235}
2186
2187#ifdef TRANSPARENT
2188#if TINTING
2189/* taken from aterm-0.4.2 */
2190
2191typedef uint32_t RUINT32T;
2192
2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2194{
2195 int sh_r, sh_g, sh_b;
2196 RUINT32T mask_r, mask_g, mask_b;
2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2198 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2199 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2200 int i;
2201
2202 Visual *visual = display->visual;
2203
2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2205
2206 /* for convenience */
2207 mask_r = visual->red_mask;
2208 mask_g = visual->green_mask;
2209 mask_b = visual->blue_mask;
2210
2211 /* boring lookup table pre-initialization */
2212 switch (srcImage->bits_per_pixel) {
2213 case 15:
2214 if ((mask_r != 0x7c00) ||
2215 (mask_g != 0x03e0) ||
2216 (mask_b != 0x001f))
2217 return;
2218 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2219 lookup_r = lookup;
2220 lookup_g = lookup+32;
2221 lookup_b = lookup+32+32;
2222 sh_r = 10;
2223 sh_g = 5;
2224 sh_b = 0;
2225 break;
2226 case 16:
2227 if ((mask_r != 0xf800) ||
2228 (mask_g != 0x07e0) ||
2229 (mask_b != 0x001f))
2230 return;
2231 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2232 lookup_r = lookup;
2233 lookup_g = lookup+32;
2234 lookup_b = lookup+32+64;
2235 sh_r = 11;
2236 sh_g = 5;
2237 sh_b = 0;
2238 break;
2239 case 24:
2240 if ((mask_r != 0xff0000) ||
2241 (mask_g != 0x00ff00) ||
2242 (mask_b != 0x0000ff))
2243 return;
2244 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2245 lookup_r = lookup;
2246 lookup_g = lookup+256;
2247 lookup_b = lookup+256+256;
2248 sh_r = 16;
2249 sh_g = 8;
2250 sh_b = 0;
2251 break;
2252 case 32:
2253 if ((mask_r != 0xff0000) ||
2254 (mask_g != 0x00ff00) ||
2255 (mask_b != 0x0000ff))
2256 return;
2257 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2258 lookup_r = lookup;
2259 lookup_g = lookup+256;
2260 lookup_b = lookup+256+256;
2261 sh_r = 16;
2262 sh_g = 8;
2263 sh_b = 0;
2264 break;
2265 default:
2266 return; /* we do not support this color depth */
2267 }
2268
2269 /* prepare limits for color transformation (each channel is handled separately) */
2270 if (shade < 0) {
2271 shade = -shade;
2272 if (shade < 0) shade = 0;
2273 if (shade > 100) shade = 100;
2274
2275 lower_lim_r = 65535-rm;
2276 lower_lim_g = 65535-gm;
2277 lower_lim_b = 65535-bm;
2278
2279 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2280 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2281 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2282
2283 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2284 } else {
2285 if (shade < 0) shade = 0;
2286 if (shade > 100) shade = 100;
2287
2288 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2289
2290 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2291 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2292 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2293 }
2294
2295 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2296 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2297 {
2298 unsigned int tmp;
2299
2300 tmp = lower_lim_r;
2301 lower_lim_r = lower_lim_b;
2302 lower_lim_b = tmp;
2303
2304 tmp = upper_lim_r;
2305 upper_lim_r = upper_lim_b;
2306 upper_lim_b = tmp;
2307 }
2308
2309 /* fill our lookup tables */
2310 for (i = 0; i <= mask_r>>sh_r; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2314 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2315 lookup_r[i] = (tmp/65535)<<sh_r;
2316 }
2317 for (i = 0; i <= mask_g>>sh_g; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2321 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2322 lookup_g[i] = (tmp/65535)<<sh_g;
2323 }
2324 for (i = 0; i <= mask_b>>sh_b; i++)
2325 {
2326 RUINT32T tmp;
2327 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2328 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2329 lookup_b[i] = (tmp/65535)<<sh_b;
2330 }
2331
2332 /* apply table to input image (replacing colors by newly calculated ones) */
2333 switch (srcImage->bits_per_pixel)
2334 {
2335 case 15:
2336 {
2337 unsigned short *p1, *pf, *p, *pl;
2338 p1 = (unsigned short *) srcImage->data;
2339 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2340 while (p1 < pf)
2341 {
2342 p = p1;
2343 pl = p1 + srcImage->width;
2344 for (; p < pl; p++)
2345 {
2346 *p = lookup_r[(*p & 0x7c00)>>10] |
2347 lookup_g[(*p & 0x03e0)>> 5] |
2348 lookup_b[(*p & 0x001f)];
2349 }
2350 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2351 }
2352 break;
2353 }
2354 case 16:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0xf800)>>11] |
2366 lookup_g[(*p & 0x07e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 24:
2374 {
2375 unsigned char *p1, *pf, *p, *pl;
2376 p1 = (unsigned char *) srcImage->data;
2377 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width * 3;
2382 for (; p < pl; p += 3)
2383 {
2384 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2385 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2386 p[2] = lookup_r[(p[2] & 0x0000ff)];
2387 }
2388 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 32:
2393 {
2394 RUINT32T *p1, *pf, *p, *pl;
2395 p1 = (RUINT32T *) srcImage->data;
2396 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width;
2402 for (; p < pl; p++)
2403 {
2404 *p = lookup_r[(*p & 0xff0000)>>16] |
2405 lookup_g[(*p & 0x00ff00)>> 8] |
2406 lookup_b[(*p & 0x0000ff)] |
2407 (*p & ~0xffffff);
2408 }
2409 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2410 }
2411 break;
2412 }
2413 }
2414
2415 free (lookup);
2416}
2417#endif
2418
2419/*
2420 * Check our parents are still who we think they are.
2421 * Do transparency updates if required
2422 */
2423int
2424rxvt_term::check_our_parents ()
2425{
2426 int i, pchanged, aformat, have_pixmap, rootdepth;
2427 unsigned long nitems, bytes_after;
2428 Atom atype;
2429 unsigned char *prop = NULL;
2430 Window root, oldp, *list;
2431 Pixmap rootpixmap = None;
2432 XWindowAttributes wattr, wrootattr;
2433 dDisp;
2434
2435 pchanged = 0;
2436
2437 if (!OPTION (Opt_transparent))
2438 return pchanged; /* Don't try any more */
2439
2440 XGetWindowAttributes (disp, display->root, &wrootattr);
2441 rootdepth = wrootattr.depth;
2442
2443 XGetWindowAttributes (disp, parent[0], &wattr);
2444
2445 if (rootdepth != wattr.depth)
2446 {
2447 if (am_transparent)
2448 {
2449 pchanged = 1;
2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2451 am_transparent = am_pixmap_trans = 0;
2452 }
2453
2454 return pchanged; /* Don't try any more */
2455 }
2456
2457 /* Get all X ops out of the queue so that our information is up-to-date. */
2458 XSync (disp, False);
2459
2460 /*
2461 * Make the frame window set by the window manager have
2462 * the root background. Some window managers put multiple nested frame
2463 * windows for each client, so we have to take care about that.
2464 */
2465 i = (xa[XA_XROOTPMAP_ID]
2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success);
2469
2470 if (!i || prop == NULL)
2471 i = (xa[XA_ESETROOT_PMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success);
2475
2476 if (!i || prop == NULL
2477#if TINTING
2478 || !rs[Rs_color + Color_tint]
2479#endif
2480 )
2481 have_pixmap = 0;
2482 else
2483 {
2484 have_pixmap = 1;
2485 rootpixmap = *(Pixmap *)prop;
2486 XFree (prop);
2487 }
2488
2489 if (have_pixmap)
2490 {
2491 /*
2492 * Copy display->root pixmap transparency
2493 */
2494 int sx, sy, nx, ny;
2495 unsigned int nw, nh;
2496 Window cr;
2497 XImage *image;
2498 GC gc;
2499 XGCValues gcvalue;
2500
2501 XTranslateCoordinates (disp, parent[0], display->root,
2502 0, 0, &sx, &sy, &cr);
2503 nw = (unsigned int)szHint.width;
2504 nh = (unsigned int)szHint.height;
2505 nx = ny = 0;
2506
2507 if (sx < 0)
2508 {
2509 nw += sx;
2510 nx = -sx;
2511 sx = 0;
2512 }
2513
2514 if (sy < 0)
2515 {
2516 nh += sy;
2517 ny = -sy;
2518 sy = 0;
2519 }
2520
2521 min_it (nw, (unsigned int) (wrootattr.width - sx));
2522 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523
2524 XSync (disp, False);
2525 allowedxerror = -1;
2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2527
2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2529 /* XXX: may need a delay here? */
2530 allowedxerror = 0;
2531
2532 if (image == NULL)
2533 {
2534 if (am_transparent && am_pixmap_trans)
2535 {
2536 pchanged = 1;
2537 if (pixmap != None)
2538 {
2539 XFreePixmap (disp, pixmap);
2540 pixmap = None;
2541 }
2542 }
2543
2544 am_pixmap_trans = 0;
2545 }
2546 else
2547 {
2548 if (pixmap != None)
2549 XFreePixmap (disp, pixmap);
2550
2551#if TINTING
2552 if (ISSET_PIXCOLOR (Color_tint))
2553 {
2554 unsigned short rm, gm, bm;
2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2556
2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2558
2559 ShadeXImage (display, image, shade, rm, gm, bm);
2560 }
2561#endif
2562
2563 pixmap = XCreatePixmap (disp, vt,
2564 szHint.width, szHint.height, image->depth);
2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2566 XPutImage (disp, pixmap, gc, image, 0, 0,
2567 nx, ny, image->width, image->height);
2568 XFreeGC (disp, gc);
2569 XDestroyImage (image);
2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2571 XClearWindow (disp, parent[0]);
2572
2573 if (!am_transparent || !am_pixmap_trans)
2574 pchanged = 1;
2575
2576 am_transparent = am_pixmap_trans = 1;
2577 }
2578 }
2579
2580 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2582 else
2583 {
2584 unsigned int n;
2585 /*
2586 * InheritPixmap transparency
2587 */
2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 {
2590 oldp = parent[i];
2591 XQueryTree (disp, parent[i - 1], &root,
2592 &parent[i], &list, &n);
2593 XFree (list);
2594
2595 if (parent[i] == display->root)
2596 {
2597 if (oldp != None)
2598 pchanged = 1;
2599
2600 break;
2601 }
2602
2603 if (oldp != parent[i])
2604 pchanged = 1;
2605 }
2606
2607 n = 0;
2608
2609 if (pchanged)
2610 {
2611 for (; n < (unsigned int)i; n++)
2612 {
2613 XGetWindowAttributes (disp, parent[n], &wattr);
2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2615 {
2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2617 break;
2618 }
2619 }
2620 }
2621
2622 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2623 {
2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2626 am_transparent = 0;
2627 /* XXX: also turn off Opt_transparent? */
2628 }
2629 else
2630 {
2631#if WAIT_FOR_WM
2632 /* wait (an arbitrary period) for the WM to do its thing
2633 * needed for fvwm2.2.2 (and before?) */
2634 sleep (1);
2635#endif
2636 for (n = 0; n < (unsigned int)i; n++)
2637 {
2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2639 XClearWindow (disp, parent[n]);
2640 }
2641
2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2643 am_transparent = 1;
2644 }
2645
2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2647 parent[i] = None;
2648 }
2649
2650 if (scrollBar.win)
2651 {
2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2653 scrollBar.setIdle ();
2654 scrollbar_show (0);
2655 }
2656
2657 if (am_transparent)
2658 {
2659 want_refresh = want_full_refresh = 1;
2660 if (am_pixmap_trans)
2661 flush ();
2662 }
2663
2664 return pchanged;
2665}
2666#endif
2667 2236
2668/*}}} */ 2237/*}}} */
2669 2238
2670bool 2239bool
2671rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2672{ 2241{
2673 bool flag = false; 2242 bool flag = false;
2674 unicode_t ch = NOCHAR; 2243 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2244 char *seq_begin; // remember start of esc-sequence here
2676 2245
2677 for (;;) 2246 for (;;)
2678 { 2247 {
2679 if (ch == NOCHAR) 2248 if (ch == NOCHAR)
2680 { 2249 {
2681 seq_begin = cmdbuf_ptr; 2250 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2251 ch = next_char ();
2683 }
2684 2252
2685 if (ch == NOCHAR) // TODO: improve 2253 if (ch == NOCHAR)
2686 break; 2254 break;
2255 }
2687 2256
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2258 {
2690 if (!seen_input) 2259 if (!seen_input)
2691 { 2260 {
… …
2700 if (seen_resize && cmd_pid) 2269 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2270 kill (-cmd_pid, SIGWINCH);
2702 } 2271 }
2703 2272
2704 /* Read a text string from the input buffer */ 2273 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2274 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2275 bool refreshnow = false;
2707 int nlines = 0; 2276 int nlines = 0;
2708 unicode_t *str = buf; 2277 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2278 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2279
2711 for (;;) 2280 for (;;)
2712 { 2281 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2283 break;
… …
2720 if (ch == C0_LF) 2289 if (ch == C0_LF)
2721 nlines++; 2290 nlines++;
2722 2291
2723 refresh_count++; 2292 refresh_count++;
2724 2293
2725 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2727 { 2295 {
2728 refreshnow = true;
2729 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2300 refreshnow = true;
2730 ch = NOCHAR; 2301 ch = NOCHAR;
2731 break; 2302 break;
2303 }
2732 } 2304 }
2733 2305
2734 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2736 { 2308 {
2309 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2310 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2737 scr_add_lines (buf, nlines, str - buf); 2311 scr_add_lines (buf, str - buf, nlines);
2312
2738 nlines = 0; 2313 nlines = 0;
2739 str = buf; 2314 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2315 eol = str + min (ncol, UBUFSIZ);
2741 } 2316 }
2742 2317
… …
2755 2330
2756 seq_begin = cmdbuf_ptr; 2331 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2332 ch = next_char ();
2758 } 2333 }
2759 2334
2335 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2760 scr_add_lines (buf, nlines, str - buf); 2337 scr_add_lines (buf, str - buf, nlines);
2761 2338
2762 /* 2339 /*
2763 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2764 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2765 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2766 * is incremented here because we must be doing flat-out scrolling.
2767 */ 2343 */
2768 if (refreshnow) 2344 if (refreshnow)
2769 { 2345 {
2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2771 refresh_limit++;
2772 else
2773 {
2774 flag = true; 2346 flag = true;
2775 scr_refresh (refresh_type); 2347 scr_refresh ();
2776 flush_ev.stop (); 2348 want_refresh = 1;
2777 }
2778 } 2349 }
2779 2350
2780 } 2351 }
2781 else 2352 else
2782 { 2353 {
… …
2796 } 2367 }
2797 2368
2798 return flag; 2369 return flag;
2799} 2370}
2800 2371
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2810// read the next character 2372// read the next character
2811unicode_t 2373wchar_t
2812rxvt_term::next_char () 2374rxvt_term::next_char () NOTHROW
2813{ 2375{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2376 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2377 {
2816 // assume 7-bit to be ascii ALWAYS 2378 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2380 return *cmdbuf_ptr++;
2819 2381
2820 wchar_t wc; 2382 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2384
2823 if (len == (size_t)-2) 2385 if (len == (size_t)-2)
2824 { 2386 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2387 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2388 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2389 break;
2828 } 2390 }
2829 2391
2830 if (len == (size_t)-1) 2392 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2393 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2394
2833 // assume wchar == unicode 2395 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2836 } 2398 }
2837 2399
2838 return NOCHAR; 2400 return NOCHAR;
2839} 2401}
2402
2403// read the next octet
2404uint32_t
2405rxvt_term::next_octet () NOTHROW
2406{
2407 return cmdbuf_ptr < cmdbuf_endp
2408 ? (unsigned char)*cmdbuf_ptr++
2409 : NOCHAR;
2410}
2411
2412static class out_of_input out_of_input;
2840 2413
2841/* rxvt_cmd_getc () - Return next input character */ 2414/* rxvt_cmd_getc () - Return next input character */
2842/* 2415/*
2843 * Return the next input character after first passing any keyboard input 2416 * Return the next input character after first passing any keyboard input
2844 * to the command. 2417 * to the command.
2845 */ 2418 */
2846unicode_t 2419wchar_t
2847rxvt_term::cmd_getc () 2420rxvt_term::cmd_getc () THROW ((class out_of_input))
2848{ 2421{
2849 unicode_t c = next_char (); 2422 wchar_t c = next_char ();
2850 2423
2851 if (c == NOCHAR) 2424 if (c == NOCHAR)
2852 throw out_of_input; 2425 throw out_of_input;
2853 2426
2854 return c; 2427 return c;
2855} 2428}
2856 2429
2857unicode_t 2430uint32_t
2858rxvt_term::cmd_get8 () 2431rxvt_term::cmd_get8 () THROW ((class out_of_input))
2859{ 2432{
2860 unicode_t c = next_octet (); 2433 uint32_t c = next_octet ();
2861 2434
2862 if (c == NOCHAR) 2435 if (c == NOCHAR)
2863 throw out_of_input; 2436 throw out_of_input;
2864 2437
2865 return c; 2438 return c;
… …
2929 { 2502 {
2930 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2931 break; /* done = 1 */ 2504 break; /* done = 1 */
2932 } 2505 }
2933 } 2506 }
2934 2507
2935 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2936 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2937 { 2510 {
2938 done = 1; 2511 done = 1;
2939 break; 2512 break;
… …
2965 case C0_ESC: 2538 case C0_ESC:
2966 process_escape_seq (); 2539 process_escape_seq ();
2967 break; 2540 break;
2968 case C0_ENQ: /* terminal Status */ 2541 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 2542 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2543 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 2544 else
2973 tt_write ((unsigned char *)VT100_ANS, 2545 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 2546 break;
2976 case C0_BEL: /* bell */ 2547 case C0_BEL: /* bell */
2977 scr_bell (); 2548 scr_bell ();
2978 break; 2549 break;
2979 case C0_BS: /* backspace */ 2550 case C0_BS: /* backspace */
… …
3003 process_dcs_seq (); 2574 process_dcs_seq ();
3004 break; 2575 break;
3005 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
3006 process_csi_seq (); 2577 process_csi_seq ();
3007 break; 2578 break;
3008 case 0x9d: /* CSI */ 2579 case 0x9d: /* OSC */
3009 process_osc_seq (); 2580 process_osc_seq ();
3010 break; 2581 break;
3011#endif 2582#endif
3012 } 2583 }
3013} 2584}
… …
3103 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
3104 break; 2675 break;
3105 case '+': 2676 case '+':
3106 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3107 break; 2678 break;
3108#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3109 case '6': 2680 case '6':
3110 scr_backindex (); 2681 scr_backindex ();
3111 break; 2682 break;
3112#endif 2683#endif
3113 case '7': 2684 case '7':
3114 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3115 break; 2686 break;
3116 case '8': 2687 case '8':
3117 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3118 break; 2689 break;
3119#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3120 case '9': 2691 case '9':
3121 scr_forwardindex (); 2692 scr_forwardindex ();
3122 break; 2693 break;
3123#endif 2694#endif
3124 case '=': 2695 case '=':
… …
3134 break; 2705 break;
3135 2706
3136 /* 8.3.87: NEXT LINE */ 2707 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 2708 case C1_NEL: /* ESC E */
3138 { 2709 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 2711 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 2712 }
3142 break; 2713 break;
3143 2714
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 2715 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 2716 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 2738 process_dcs_seq ();
3168 break; 2739 break;
3169 2740
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 2742 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 2744 break; /* steal obsolete ESC [ c */
3175 2745
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 2747 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 2748 process_csi_seq ();
… …
3287 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
3288 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
3289 if (arg[p] == -1) 2859 if (arg[p] == -1)
3290 arg[p] = ndef; 2860 arg[p] = ndef;
3291 2861
3292#ifdef DEBUG_CMD
3293 fprintf (stderr, "CSI ");
3294 for (p = 0; p < nargs; p++)
3295 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3296 fprintf (stderr, "%c\n", ch);
3297#endif
3298
3299 /* 2862 /*
3300 * private mode handling 2863 * private mode handling
3301 */ 2864 */
3302 if (priv) 2865 if (priv)
3303 { 2866 {
3304 switch (priv) 2867 switch (priv)
3305 { 2868 {
3306 case '>': 2869 case '>':
3307 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2871 {
2872 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2877 // that we do not support xterm mouse reporting (should be 95 when we do).
2878 //
2879 tt_printf ("\033[>%d;94;0c", 'U');
2880 }
3309 break; 2881 break;
3310 case '?': 2882 case '?':
3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3312 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3313 break; 2885 break;
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2994 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2995 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 2996 break;
3425 2997
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2998 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 2999 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 3000 break;
3430 3001
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3002 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 3003 process_sgr_mode (nargs, arg);
3433 break; 3004 break;
… …
3440 break; 3011 break;
3441 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3442 scr_report_position (); 3013 scr_report_position ();
3443 break; 3014 break;
3444 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3445 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3446 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3447 break; 3018 break;
3448 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3450 break; 3021 break;
… …
3517 break; 3088 break;
3518 case CSI_75: 3089 case CSI_75:
3519 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3520 break; 3091 break;
3521 3092
3522#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3523 case CSI_74: 3094 case CSI_74:
3524 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3525 break; 3096 break;
3526#endif 3097#endif
3527 3098
… …
3534 break; 3105 break;
3535 } 3106 }
3536} 3107}
3537/*}}} */ 3108/*}}} */
3538 3109
3539#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3111/* ARGSUSED */
3541void 3112void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3114{
3544 int x, y; 3115 int x, y;
3545 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3546 Window wdummy; 3117 Window wdummy;
3547 dDisp; 3118
3119 dLocal (Display *, dpy);
3548 3120
3549 if (nargs == 0) 3121 if (nargs == 0)
3550 return; 3122 return;
3551 3123
3552 switch (args[0]) 3124 switch (args[0])
3553 { 3125 {
3554 /* 3126 /*
3555 * commands 3127 * commands
3556 */ 3128 */
3557 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3559 break; 3131 break;
3560 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3562 break; 3134 break;
3563 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3565 break; 3137 break;
3566 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3140 break;
3569 case 5: /* raise window */ 3141 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3571 break; 3143 break;
3572 case 6: /* lower window */ 3144 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3574 break; 3146 break;
3575 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3576 scr_touch (true); 3148 scr_touch (true);
3577 break; 3149 break;
3578 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3158 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3159 (unsigned int) (args[1] * fheight));
3588 break; 3160 break;
3589 3161
3590
3591 /* 3162 /*
3592 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3593 */ 3164 */
3594 case 11: /* report window state */ 3165 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3168 break;
3598 case 13: /* report window position */ 3169 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3175 break;
3605 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3179 break;
3609 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3182 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3185 break;
3615 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3616 { 3187 {
3617 char *s; 3188 char *s;
3618 XGetIconName (disp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3191 XFree (s);
3621 } 3192 }
3622 break; 3193 break;
3623 case 21: /* report window title */ 3194 case 21: /* report window title */
3624 { 3195 {
3625 char *s; 3196 char *s;
3626 XFetchName (disp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3199 XFree (s);
3629 } 3200 }
3630 break; 3201 break;
3631 } 3202 }
3632} 3203}
… …
3635/*----------------------------------------------------------------------*/ 3206/*----------------------------------------------------------------------*/
3636/* 3207/*
3637 * get input up until STRING TERMINATOR (or BEL) 3208 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3209 * ends_how is terminator used. returned input must be free()'d
3639 */ 3210 */
3640unsigned char * 3211char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3212rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3213{
3643 unicode_t ch; 3214 unicode_t ch;
3644 bool seen_esc = false; 3215 bool seen_esc = false;
3645 unsigned int n = 0; 3216 unsigned int n = 0;
… …
3659 seen_esc = true; 3230 seen_esc = true;
3660 continue; 3231 continue;
3661 } 3232 }
3662 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3663 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3664 else if (ch < 0x20) 3237 else if (ch < 0x20)
3665 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3666 3239
3667 seen_esc = false; 3240 seen_esc = false;
3668 3241
3669 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3670 // stop at some sane length 3243 // stop at some sane length
3671 return NULL; 3244 return NULL;
3672 3245
3673 if (ch == C0_SYN)
3674 string[n++] = cmd_get8 ();
3675 else
3676 string[n++] = ch; 3246 string[n++] = ch;
3677 } 3247 }
3678 3248
3679 string[n++] = '\0'; 3249 string[n++] = '\0';
3680 3250
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3252
3683 return (unsigned char *)rxvt_wcstombs (string); 3253 return rxvt_wcstombs (string);
3684} 3254}
3685 3255
3686/*----------------------------------------------------------------------*/ 3256/*----------------------------------------------------------------------*/
3687/* 3257/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3258 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3259 */
3690void 3260void
3691rxvt_term::process_dcs_seq () 3261rxvt_term::process_dcs_seq ()
3692{ 3262{
3693 unsigned char *s; 3263 char *s;
3694 unicode_t eh; 3264 unicode_t eh;
3695 3265
3696 /* 3266 /*
3697 * Not handled yet 3267 * Not handled yet
3698 */ 3268 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3719 3289
3720 if (ch == ';') 3290 if (ch == ';')
3721 { 3291 {
3722 unsigned char *s = get_to_st (eh); 3292 char *s = get_to_st (eh);
3723 3293
3724 if (s) 3294 if (s)
3725 { 3295 {
3726 process_xterm_seq (arg, (char *)s, eh); 3296 process_xterm_seq (arg, s, eh);
3727 free (s); 3297 free (s);
3728 } 3298 }
3729 } 3299 }
3730} 3300}
3731 3301
3732void 3302void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3304{
3735 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3736 { 3306 {
3737 unsigned short r, g, b; 3307 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3308 pix_colors_focused[color].get (c);
3309
3310#if XFT
3311 if (c.a != rgba::MAX_CC)
3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3313 else
3314#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3316 }
3741 else 3317 else
3742 set_window_color (color, str); 3318 set_window_color (color, str);
3743} 3319}
3744 3320
3745/* 3321/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3323 */
3748void 3324void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3325rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3326{
3751 int changed = 0;
3752 int color; 3327 int color;
3753 char *buf, *name; 3328 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3330 int saveop = op;
3756 dDisp; 3331
3332 dLocal (Display *, dpy);
3757 3333
3758 assert (str != NULL); 3334 assert (str != NULL);
3335
3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3337 return;
3338
3759 switch (op) 3339 switch (op)
3760 { 3340 {
3761 case XTerm_name: 3341 case XTerm_name:
3762 set_title (str); 3342 set_title (str);
3763 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3357 unsigned long bytes_after;
3778 unsigned char *value = 0; 3358 unsigned char *value = 0;
3779 const char *str = ""; 3359 const char *str = "";
3780 3360
3781 if (prop 3361 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3366 && actual_type != None
3787 && actual_format == 8) 3367 && actual_format == 8)
3788 str = (const char *)(value); 3368 str = (const char *)(value);
3789 3369
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3371
3792 XFree (value); 3372 XFree (value);
3793 } 3373 }
3794 else 3374 else
3795 { 3375 {
… …
3799 { 3379 {
3800 *eq = 0; 3380 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3802 } 3382 }
3803 else 3383 else
3804 XDeleteProperty (disp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3385 display->atom (str));
3806 } 3386 }
3807 break; 3387 break;
3808 3388
3809 case XTerm_Color: 3389 case XTerm_Color:
… …
3811 { 3391 {
3812 if ((name = strchr (buf, ';')) == NULL) 3392 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3393 break;
3814 3394
3815 *name++ = '\0'; 3395 *name++ = '\0';
3816 color = atoi (buf); 3396 color = atoi (buf) + minCOLOR;
3817 3397
3818 if (color < 0 || color >= TOTAL_COLORS) 3398 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3399 break;
3820 3400
3821 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3402 *buf++ = '\0';
3823 3403
3824 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color + minCOLOR, name);
3832 } 3405 }
3833 break; 3406 break;
3834 case XTerm_Color00: 3407 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3836 break; 3409 break;
3837 case XTerm_Color01: 3410 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3839 break; 3412 break;
3840#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3416 break;
3844#endif 3417#endif
3845 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3420 break;
3848 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3423 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
3427 break;
3428 case Rxvt_Color_BD:
3429 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp);
3431 break;
3432 case Rxvt_Color_UL:
3433 case URxvt_Color_UL:
3434 process_color_seq (op, Color_UL, str, resp);
3860 break; 3435 break;
3861 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3863 break; 3438 break;
3864#endif 3439#endif
3865#if TRANSPARENT && TINTING 3440#if ENABLE_TRANSPARENCY && TINTING
3866 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3868 check_our_parents (); 3444 check_our_parents ();
3445
3869 if (am_transparent) 3446 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3871 break;
3872#endif
3873 3448
3449 break;
3450#endif
3451
3874 case XTerm_Pixmap: 3452 case Rxvt_Pixmap:
3453 {
3875 if (*str != ';') 3454 if (*str != ';')
3876 { 3455 {
3877#if XPM_BACKGROUND 3456#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3457 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3458 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3459 scr_touch (true);
3460#endif
3882 } 3461 }
3462
3463 int changed = 0;
3464
3883 while ((str = strchr (str, ';')) != NULL) 3465 while ((str = strchr (str, ';')) != NULL)
3884 { 3466 {
3885 str++; 3467 str++;
3886#if XPM_BACKGROUND 3468#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3469 changed += scale_pixmap (str);
3888#endif 3470#endif
3889 } 3471 }
3890 3472
3891 if (changed) 3473 if (changed)
3892 { 3474 {
3893#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3476 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3477 scr_touch (true);
3478#endif
3897 } 3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3898 break; 3485 break;
3899 3486
3900 case XTerm_restoreFG: 3487 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3902 break; 3489 break;
3903 case XTerm_restoreBG: 3490 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3491 set_window_color (Color_bg, str);
3905 break; 3492 break;
3906 3493
3907 case XTerm_logfile: 3494 case XTerm_logfile:
3908 // TODO, when secure mode? 3495 // TODO, when secure mode?
3909 break; 3496 break;
3910 3497
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3498#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3499 case Rxvt_dumpscreen: /* no error notices */
3919 { 3500 {
3920 int fd; 3501 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3502 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3503 {
3923 scr_dump (fd); 3504 scr_dump (fd);
… …
3934 case URxvt_italicFont: 3515 case URxvt_italicFont:
3935 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3936#endif 3517#endif
3937 if (query) 3518 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3940 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3941 resp); 3522 resp);
3942 else 3523 else
3943 { 3524 {
3944 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3948 set_fonts (); 3529 set_fonts ();
3949 } 3530 }
3950 break; 3531 break;
3951 3532
3952#if ENABLE_FRILLS 3533 case URxvt_version:
3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3542 case URxvt_locale:
3954 if (query) 3543 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3956 else 3545 else
3957 { 3546 {
3958 set_locale (str); 3547 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3549 init_xlocale ();
3961 } 3550 }
3962 break; 3551 break;
3963 3552
3964 case URxvt_view_up: 3553 case URxvt_view_up:
… …
3975 break; 3564 break;
3976#endif 3565#endif
3977 3566
3978#if ENABLE_PERL 3567#if ENABLE_PERL
3979 case URxvt_perl: 3568 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3981 ; // no responses yet 3570 ; // no responses yet
3982 break; 3571 break;
3983#endif 3572#endif
3984 } 3573 }
3985} 3574}
… …
4017 return state; 3606 return state;
4018} 3607}
4019 3608
4020/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
4021void 3610void
4022rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4023{ 3612{
4024 unsigned int i, j; 3613 unsigned int i, j;
4025 int state; 3614 int state;
4026 3615
4027 static const struct 3616 static const struct
… …
4038 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 3630 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 3632 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 3633 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 3634#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 3635 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 3636#endif
… …
4097 /* extra handling for values with state unkept */ 3683 /* extra handling for values with state unkept */
4098 switch (arg[i]) 3684 switch (arg[i])
4099 { 3685 {
4100#if ENABLE_STYLES 3686#if ENABLE_STYLES
4101 case 1021: 3687 case 1021:
4102 if (mode) 3688 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 3689
4107 scr_touch (true); 3690 scr_touch (true);
4108 break; 3691 break;
4109#endif 3692#endif
4110 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4111 case 1049: 3694 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3696 if (mode == 0)
4114 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4115 else if (mode == 1) 3698 else if (mode == 1)
4116 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4117 break; 3700 break;
… …
4132 case 3: /* 80/132 */ 3715 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3716 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3717 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 3718 break;
4136 case 4: /* smooth scrolling */ 3719 case 4: /* smooth scrolling */
4137 if (!state) 3720 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 3721 break;
4142 case 5: /* reverse video */ 3722 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 3723 scr_rvideo_mode (state);
4144 break; 3724 break;
4145 case 6: /* relative/absolute origins */ 3725 case 6: /* relative/absolute origins */
… …
4151 /* case 8: - auto repeat, can't do on a per window basis */ 3731 /* case 8: - auto repeat, can't do on a per window basis */
4152 case 9: /* X10 mouse reporting */ 3732 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 3734 priv_modes &= ~PrivMode_MouseX11;
4155 break; 3735 break;
4156#ifdef menuBar_esc
4157 case menuBar_esc:
4158#ifdef MENUBAR
4159 map_menuBar (state);
4160#endif
4161 break;
4162#endif
4163#ifdef scrollBar_esc 3736#ifdef scrollBar_esc
4164 case scrollBar_esc: 3737 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 3738 if (scrollbar_mapping (state))
4166 { 3739 {
4167 resize_all_windows (0, 0, 0); 3740 resize_all_windows (0, 0, 0);
… …
4186#if 0 3759#if 0
4187 case 1001: 3760 case 1001:
4188 break; /* X11 mouse highlighting */ 3761 break; /* X11 mouse highlighting */
4189#endif 3762#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 3763 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 3764 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 3765 break;
4196 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4197 if (state) 3767 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 3768 break;
4202 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 3772 scr_erase_screen (2);
4206 scr_change_screen (state); 3773 scr_change_screen (state);
4207 break; 3774 break;
4208 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4209 scr_change_screen (state); 3776 scr_change_screen (state);
4210 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3779 scr_erase_screen (2);
4213 break; 3780 break;
4214 default: 3781 default:
4215 break; 3782 break;
… …
4343 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4344 break; 3911 break;
4345 3912
4346 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4347 3914
4348#ifndef NO_BRIGHTCOLOR 3915#if !ENABLE_MINIMAL
4349 case 90: 3916 case 90:
4350 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4351 case 92: 3918 case 92:
4352 case 93: 3919 case 93:
4353 case 94: 3920 case 94:
… …
4398 */ 3965 */
4399void 3966void
4400rxvt_term::tt_printf (const char *fmt,...) 3967rxvt_term::tt_printf (const char *fmt,...)
4401{ 3968{
4402 va_list arg_ptr; 3969 va_list arg_ptr;
4403 unsigned char buf[256]; 3970 char buf[256];
4404 3971
4405 va_start (arg_ptr, fmt); 3972 va_start (arg_ptr, fmt);
4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3973 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4407 va_end (arg_ptr); 3974 va_end (arg_ptr);
4408 tt_write (buf, strlen (buf)); 3975 tt_write (buf, strlen (buf));
… …
4413 * or generated by us in response to a query ESC sequence. 3980 * or generated by us in response to a query ESC sequence.
4414 */ 3981 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 3983
4417void 3984void
4418rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3985rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 3986{
3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3988 return;
3989
3990 if (pty->pty < 0)
3991 return;
3992
4420 if (v_buflen == 0) 3993 if (v_buflen == 0)
4421 { 3994 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3995 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4423 3996
4424 if ((unsigned int)written == len) 3997 if ((unsigned int)written == len)
4425 return; 3998 return;
4426 3999
4427 data += written; 4000 data += written;
4428 len -= written; 4001 len -= written;
4429 } 4002 }
4430 4003
4431 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4432 4005
4433 memcpy (v_buffer + v_buflen, data, len); 4006 memcpy (v_buffer + v_buflen, data, len);
4434 v_buflen += len; 4007 v_buflen += len;
4435 4008
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 4009 pty_ev.set (EVENT_READ | EVENT_WRITE);
4437} 4010}
4438 4011
4439void rxvt_term::pty_write () 4012void rxvt_term::pty_write ()
4440{ 4013{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442 4015
4443 if (written > 0) 4016 if (written > 0)
4444 { 4017 {
4445 v_buflen -= written; 4018 v_buflen -= written;
4446 4019

Diff Legend

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