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.248 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.330 by root, Mon Jun 18 12:53:25 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>
… …
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#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 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// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * 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
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 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);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
867#endif 879#endif
868 /* nil */ ; 880 /* nil */ ;
869 } 881 }
870 } 882 }
871 883
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */
923 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
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1003unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1005{
930 unsigned int n, s; 1006 unsigned int n, s;
931 1007
… …
972 1048
973 if (want_refresh) 1049 if (want_refresh)
974 { 1050 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1052 {
977 int row = -view_start; 1053 int row = view_start;
1054 int end_row = row + nrow;
978 1055
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1056 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1057 --row;
981 1058
982 while (row < -view_start + nrow) 1059 do
983 { 1060 {
984 int start_row = row; 1061 int start_row = row;
985 line_t *l; 1062 line_t *l;
986 1063
987 do 1064 do
988 { 1065 {
989 l = &ROW (row); 1066 l = &ROW (row++);
990 1067
991 if (!(l->f & LINE_FILTERED)) 1068 if (!(l->f & LINE_FILTERED))
992 { 1069 {
993 // line not filtered, mark it as filtered 1070 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1071 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1072 while (l->is_longer ())
996 { 1073 {
997 l = &ROW (++row); 1074 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1075 l->f |= LINE_FILTERED;
999 } 1076 }
1000 1077
1001 // and filter it 1078 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1080
1004 break; 1081 break;
1005 } 1082 }
1006 } 1083 }
1007 while (l->is_longer ()); 1084 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1085 }
1086 while (row < end_row);
1011 1087 }
1012 }
1013 1088
1014 scr_refresh (refresh_type); 1089 scr_refresh ();
1015 scrollbar_show (1); 1090 scrollbar_show (1);
1016#ifdef USE_XIM 1091#ifdef USE_XIM
1017 IMSendSpot (); 1092 IMSendSpot ();
1018#endif 1093#endif
1019 } 1094 }
… …
1022} 1097}
1023 1098
1024void 1099void
1025rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
1026{ 1101{
1027 SET_R (this); 1102 make_current ();
1028 SET_LOCALE (locale);
1029 1103
1030 display->flush (); 1104 display->flush ();
1031 1105
1032 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
1033 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
1034} 1108}
1035 1109
1036void 1110void
1037rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1038{ 1112{
1039 SET_R (this); 1113 make_current ();
1040 SET_LOCALE (locale);
1041 1114
1042 refresh_limit = 1;
1043 refresh_count = 0; 1115 refresh_count = 0;
1044 flush (); 1116 flush ();
1045} 1117}
1046 1118
1047#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1122{
1051 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1124 want_refresh = 1;
1053 1125
1054 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1127}
1056#endif 1128#endif
1057 1129
1058#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1059void 1131void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1146{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1149 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1150 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1152 }
1082} 1153}
1083#endif 1154#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1159{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1161 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1163 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1165 }
1096} 1166}
1097#endif 1167#endif
… …
1102{ 1172{
1103 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1104 || 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)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1176 {
1107 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1110 1179
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1180 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1182 }
1115} 1183}
1116#endif 1184#endif
1117 1185
1118#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1119static struct event_handler 1187static struct event_handler
1120{ 1188{
1121 check_watcher cw_yield; 1189 check_watcher yield_ev;
1122 1190
1123 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1124 { 1192 {
1125 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
1126 w.stop (); 1201 w.stop ();
1127 } 1202 }
1128 1203
1129 event_handler () 1204 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1131 { 1206 {
1132 } 1207 }
1133} event_handler; 1208} event_handler;
1134#endif 1209#endif
1135 1210
… …
1146 1221
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1150 1225
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1227
1153 if (r > 0) 1228 if (r > 0)
1154 { 1229 {
1155 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1156 return true; 1231 return true;
1157 } 1232 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1234 {
1160#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1161 if (display->is_local) 1236 if (display->is_local)
1162 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1163#endif 1238#endif
1164 } 1239 }
1165 else 1240 else
1166 { 1241 {
1167 pty_ev.stop (); 1242 pty_ev.stop ();
1168 1243
1169 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1170 destroy (); 1245 destroy ();
1171 } 1246 }
1172 1247
1173 return false; 1248 return false;
1174} 1249}
1175 1250
1176void 1251void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1253{
1179 SET_R (this); 1254 make_current ();
1180 SET_LOCALE (locale);
1181 1255
1182 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1258 while (pty_fill ())
1185 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1190} 1264}
1191 1265
1192void 1266void
1193rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1194{ 1268{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1270 recolour_cursor ();
1197 1271
1198#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1273 hidden_pointer = 0;
1200 1274
1201 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1277#endif
1204} 1278}
1205 1279
1206#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1207void 1281void
1208rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1209{ 1283{
1210 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1211 return; 1285 return;
1212 1286
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1288 XFlush (dpy);
1215 1289
1216 hidden_pointer = 1; 1290 hidden_pointer = 1;
1217} 1291}
1218 1292
1219void 1293void
1220rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1221{ 1295{
1222 SET_R (this); 1296 make_current ();
1223 SET_LOCALE (locale);
1224 1297
1225 pointer_blank (); 1298 pointer_blank ();
1226} 1299}
1227#endif 1300#endif
1228 1301
… …
1293 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1294 (32 + x + 1), 1367 (32 + x + 1),
1295 (32 + y + 1)); 1368 (32 + y + 1));
1296} 1369}
1297 1370
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1371/*{{{ process an X event */
1309void 1372void
1310rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1311{ 1374{
1312 dDisp; 1375 make_current ();
1313 1376
1314 SET_R (this); 1377 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1378
1379 if (ev.xany.window == vt
1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1382 return;
1383
1384 // for XQueryPointer
1317 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1318 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1319 unsigned int unused_mask; 1387 unsigned int unused_mask;
1320 1388
1321 switch (ev.type) 1389 switch (ev.type)
1322 { 1390 {
1323 case KeyPress: 1391 case KeyPress:
1324#if ISO_14755 1392 key_press (ev.xkey);
1325 if (!(iso14755buf & ISO_14755_52))
1326#endif
1327 lookup_key (ev.xkey);
1328
1329 break; 1393 break;
1330 1394
1331 case KeyRelease: 1395 case KeyRelease:
1332 { 1396 key_release (ev.xkey);
1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1334 KeySym ks;
1335
1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337#endif
1338
1339#if ENABLE_FRILLS || ISO_14755
1340 // ISO 14755 support
1341 if (iso14755buf)
1342 if (iso14755buf & ISO_14755_52)
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347# if ISO_14755
1348 // iso14755 part 5.2 handling: release time
1349 // first: controls
1350 if ((ev.xkey.state & ControlMask)
1351 && ((ks >= 0x40 && ks <= 0x5f)
1352 || (ks >= 0x61 && ks <= 0x7f)))
1353 {
1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1355 commit_iso14755 ();
1356 goto skip_switch;
1357 }
1358
1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360 if (i[0] == ks)
1361 {
1362 iso14755buf = ISO_14755_51 | i[1];
1363 commit_iso14755 ();
1364 goto skip_switch;
1365 }
1366
1367 scr_bell ();
1368# endif
1369 iso14755buf = 0;
1370 break;
1371 }
1372 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1373 {
1374# if ENABLE_OVERLAY
1375 scr_overlay_off ();
1376# endif
1377 if (iso14755buf & ISO_14755_51)
1378 commit_iso14755 ();
1379#if ISO_14755
1380 else if (iso14755buf & ISO_14755_STARTED)
1381 {
1382 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1383
1384 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1385 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1386 }
1387# endif
1388 else
1389 iso14755buf = 0;
1390 }
1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1396
1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398 if (!(ev.xkey.state & ControlMask))
1399 slip_wheel_ev.stop ();
1400 else if (ks == XK_Control_L || ks == XK_Control_R)
1401 mouse_slip_wheel_speed = 0;
1402#endif
1403 break; 1397 break;
1404 }
1405 1398
1406 case ButtonPress: 1399 case ButtonPress:
1407 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1408 break; 1401 break;
1409 1402
… …
1411 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1412 break; 1405 break;
1413 1406
1414 case ClientMessage: 1407 case ClientMessage:
1415 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1416 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1417 { 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 {
1418 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)))
1419 destroy (); 1418 destroy ();
1419 }
1420#if ENABLE_EWMH 1420#if ENABLE_EWMH
1421 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])
1422 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1424 &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 }
1425#endif 1436#endif
1426 } 1437 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1436#ifdef OFFIX_DND
1437 /* OffiX Dnd (drag 'n' drop) protocol */
1438 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1439 && (ev.xclient.data.l[0] == DndFile
1440 || ev.xclient.data.l[0] == DndDir
1441 || ev.xclient.data.l[0] == DndLink))
1442 {
1443 /* Get Dnd data */
1444 Atom ActualType;
1445 int ActualFormat;
1446 unsigned char *data;
1447 unsigned long Size, RemainingBytes;
1448
1449 XGetWindowProperty (disp, display->root,
1450 xa[XA_DNDSELECTION],
1451 0L, 1000000L,
1452 False, AnyPropertyType,
1453 &ActualType, &ActualFormat,
1454 &Size, &RemainingBytes,
1455 &data);
1456 set_string_property (XA_CUT_BUFFER0, data);
1457 XFree (data);
1458 selection_paste (display->root, XA_CUT_BUFFER0, true);
1459 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1460 }
1461#endif /* OFFIX_DND */
1462 break; 1438 break;
1463 1439
1464 case MappingNotify: 1440 case MappingNotify:
1465 XRefreshKeyboardMapping (&ev.xmapping); 1441 XRefreshKeyboardMapping (&ev.xmapping);
1466 break; 1442 break;
… …
1489 break; 1465 break;
1490 } 1466 }
1491 break; 1467 break;
1492 1468
1493 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1494 focus_in (); 1473 focus_in ();
1495 break; 1474 break;
1496 1475
1497 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1498 focus_out (); 1480 focus_out ();
1499 break; 1481 break;
1500 1482
1501 case ConfigureNotify: 1483 case ConfigureNotify:
1502 if (ev.xconfigure.window == parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1503 { 1485 {
1504 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1505 ; 1487 ;
1506 1488
1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1508 { 1490 {
1509 seen_resize = 1; 1491 seen_resize = 1;
1510 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
1511 } 1500 }
1512 1501
1513#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 TRANSPARENT
1514 if (OPTION (Opt_transparent)) 1505 if (option (Opt_transparent))
1515 check_our_parents (); 1506 check_our_parents ();
1516#endif 1507#endif
1517 } 1508 }
1518 break; 1509 break;
1519 1510
1520 case PropertyNotify: 1511 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1521 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1522 && ev.xproperty.state == PropertyNewValue) 1514 && ev.xproperty.state == PropertyNewValue)
1523 selection_property (ev.xproperty.window, ev.xproperty.atom); 1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1524 1516
1525 break; 1517 break;
1526 1518
1527 case SelectionClear: 1519 case SelectionClear:
1528 selection_clear (); 1520 selection_clear ();
… …
1564 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1565 { 1557 {
1566 do 1558 do
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1570 1562
1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1572 1564
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1574 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1575 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1576 1568
1577 scr_refresh (refresh_type); 1569 want_refresh = 1;
1578 } 1570 }
1579 else 1571 else
1580 { 1572 {
1581 XEvent unused_event; 1573 XEvent unused_event;
1582 1574
1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1584 ; 1576 ;
1585 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1586 ; 1578 ;
1587 1579
1588 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1589 { 1581 {
1590 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1591 scrollbar_show (0); 1583 scrollbar_show (0);
1592 } 1584 }
1593#ifdef MENUBAR
1594 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1595 menubar_expose ();
1596#endif
1597 1585
1598#ifdef TRANSPARENT 1586#ifdef TRANSPARENT
1599 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1600 XClearWindow (disp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1601#endif 1589#endif
1602 } 1590 }
1603 break; 1591 break;
1604 1592
1605 case MotionNotify: 1593 case MotionNotify:
1606#ifdef POINTER_BLANK 1594#ifdef POINTER_BLANK
1607 if (hidden_pointer) 1595 if (hidden_pointer)
1608 pointer_unblank (); 1596 pointer_unblank ();
1609#endif 1597#endif
1610#if MENUBAR
1611 if (isMenuBarWindow (ev.xany.window))
1612 {
1613 menubar_control (ev.xbutton);
1614 break;
1615 }
1616#endif
1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618 break; 1599 break;
1619 1600
1620 if (ev.xany.window == vt) 1601 if (ev.xany.window == vt)
1621 { 1602 {
1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1605 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1607 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1609 ;
1628 1610
1629 XQueryPointer (disp, vt, 1611 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1615 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
… …
1698#endif 1680#endif
1699 } 1681 }
1700 } 1682 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702 { 1684 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1705 ; 1687 ;
1706 1688
1707 XQueryPointer (disp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1693 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1695 scrollbar_size ());
1714 scr_refresh (refresh_type);
1715 refresh_limit = 0; 1696 want_refresh = 1;
1716 scrollbar_show (1); 1697 scrollbar_show (1);
1717 } 1698 }
1718 break; 1699 break;
1719 } 1700 }
1720 1701
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1702#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1725 { 1704 {
1726 if (hidden_cursor) 1705 if (hidden_cursor)
1727 { 1706 {
1728 hidden_cursor = 0; 1707 hidden_cursor = 0;
1729 want_refresh = 1; 1708 want_refresh = 1;
1730 } 1709 }
1731 1710
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733 } 1712 }
1734#endif 1713#endif
1735 1714
1736#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 { 1717 {
1739 if (ev.type == MotionNotify 1718 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress 1719 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease) 1720 || ev.type == ButtonRelease)
1742 if (hidden_pointer) 1721 if (hidden_pointer)
… …
1754 if (!focus) 1733 if (!focus)
1755 { 1734 {
1756 focus = 1; 1735 focus = 1;
1757 want_refresh = 1; 1736 want_refresh = 1;
1758 1737
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760 1739
1761#if USE_XIM 1740#if USE_XIM
1762 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1763 { 1742 {
1764 IMSetStatusPosition (); 1743 IMSetPosition ();
1765 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1766 } 1745 }
1767#endif 1746#endif
1768#if CURSOR_BLINK 1747#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771#endif 1750#endif
1772#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1774 { 1753 {
1775 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1776 scr_recolour (); 1755 scr_recolour ();
1756 }
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 }
1777 } 1769 }
1778#endif 1770#endif
1779 } 1771 }
1780} 1772}
1781 1773
… …
1801#if USE_XIM 1793#if USE_XIM
1802 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1804#endif 1796#endif
1805#if CURSOR_BLINK 1797#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink)) 1798 if (option (Opt_cursorBlink))
1807 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1808 hidden_cursor = 0; 1800 hidden_cursor = 0;
1809#endif 1801#endif
1810#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
… …
1815 } 1807 }
1816#endif 1808#endif
1817 } 1809 }
1818} 1810}
1819 1811
1820#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 TRANSPARENT || ENABLE_PERL
1821void 1826void
1822rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1828{
1824 SET_R (this); 1829 make_current ();
1825 SET_LOCALE (locale);
1826 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 TRANSPARENT
1827 switch (ev.type) 1836 switch (ev.type)
1828 { 1837 {
1829 case PropertyNotify: 1838 case PropertyNotify:
1830 /* 1839 /*
1831 * 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,
… …
1835 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1836 return; 1845 return;
1837 1846
1838 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1839 case ReparentNotify: 1848 case ReparentNotify:
1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1841 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1842 break; 1851 break;
1843 } 1852 }
1853# endif
1844} 1854}
1845#endif 1855#endif
1846 1856
1847void 1857void
1848rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
1857 /* 1867 /*
1858 * VT window processing of button press 1868 * VT window processing of button press
1859 */ 1869 */
1860 if (ev.window == vt) 1870 if (ev.window == vt)
1861 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1862#if ISO_14755 1875#if ISO_14755
1863 // 5.4 1876 // 5.4
1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1865 { 1878 {
1866 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
… …
1908 else 1921 else
1909 { 1922 {
1910 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
1911 MEvent.clicks = 0; 1924 MEvent.clicks = 0;
1912 1925
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914 switch (ev.button) 1926 switch (ev.button)
1915 { 1927 {
1916 case Button1: 1928 case Button1:
1917 /* allow meta + click to select rectangular areas */ 1929 /* allow meta + click to select rectangular areas */
1918 /* should be done in screen.C */ 1930 /* should be done in screen.C */
1919#if ENABLE_FRILLS 1931#if ENABLE_FRILLS
1920 selection.rect = !!(ev.state & ModMetaMask); 1932 selection.rect = !!(ev.state & ModMetaMask);
1921#else 1933#else
1922 selection.rect = false; 1934 selection.rect = false;
1923#endif 1935#endif
1924 1936
1925 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927 { 1939 {
1928 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1929 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1930 else 1942 else
1931 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
1932 } 1944 }
1933 else 1945 else
1934 { 1946 {
1935 if (MEvent.button == Button1 && clickintime) 1947 if (MEvent.button == Button1 && clickintime)
1936 MEvent.clicks++; 1948 MEvent.clicks++;
1937 else 1949 else
1938 MEvent.clicks = 1; 1950 MEvent.clicks = 1;
1939 1951
1940 selection_click (MEvent.clicks, ev.x, ev.y); 1952 selection_click (MEvent.clicks, ev.x, ev.y);
1941 } 1953 }
1942 1954
1943 MEvent.button = Button1; 1955 MEvent.button = Button1;
1944 break; 1956 break;
1945 1957
1946 case Button3: 1958 case Button3:
1947 if (MEvent.button == Button3 && clickintime) 1959 if (MEvent.button == Button3 && clickintime)
1948 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1949 else 1961 else
1950 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1951 1963
1952 MEvent.button = Button3; 1964 MEvent.button = Button3;
1953 break; 1965 break;
1954 } 1966 }
1955 } 1967 }
1956 1968
1957 MEvent.time = ev.time; 1969 MEvent.time = ev.time;
1958 return; 1970 return;
1959 } 1971 }
1960 1972
… …
2099 } 2111 }
2100 } 2112 }
2101 2113
2102 return; 2114 return;
2103 } 2115 }
2104
2105#if MENUBAR
2106 /*
2107 * Menubar window processing of button press
2108 */
2109 if (isMenuBarWindow (ev.window))
2110 menubar_control (ev);
2111#endif
2112} 2116}
2113 2117
2114void 2118void
2115rxvt_term::button_release (XButtonEvent &ev) 2119rxvt_term::button_release (XButtonEvent &ev)
2116{ 2120{
… …
2122 2126
2123 if (scrollbar_isUpDn ()) 2127 if (scrollbar_isUpDn ())
2124 { 2128 {
2125 scrollBar.setIdle (); 2129 scrollBar.setIdle ();
2126 scrollbar_show (0); 2130 scrollbar_show (0);
2127#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2128 refresh_type &= ~SMOOTH_REFRESH;
2129#endif
2130 } 2131 }
2131 2132
2132#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2133 if (sel_scroll_ev.active) 2134 if (sel_scroll_ev.active)
2134 sel_scroll_ev.stop(); 2135 sel_scroll_ev.stop();
2135#endif 2136#endif
2136 2137
2137 if (ev.window == vt) 2138 if (ev.window == vt)
2138 { 2139 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2141 return;
2142
2139#if ISO_14755 2143#if ISO_14755
2140 // 5.4 2144 // 5.4
2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2142 return; 2146 return;
2143#endif 2147#endif
2148
2144 if (reportmode) 2149 if (reportmode)
2145 { 2150 {
2146 /* mouse report from vt window */ 2151 /* mouse report from vt window */
2147 /* don't report release of wheel "buttons" */ 2152 /* don't report release of wheel "buttons" */
2148 if (ev.button >= 4) 2153 if (ev.button >= 4)
… …
2172 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2173 && bypass_keystate 2178 && bypass_keystate
2174 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2175 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2176 2181
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2179
2180 switch (ev.button) 2182 switch (ev.button)
2181 { 2183 {
2182 case Button1: 2184 case Button1:
2183 case Button3: 2185 case Button3:
2184 selection_make (ev.time); 2186 selection_make (ev.time);
2185 break; 2187 break;
2188
2186 case Button2: 2189 case Button2:
2187 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);
2188 break; 2192 break;
2193
2189#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2190 case Button4: 2195 case Button4:
2191 case Button5: 2196 case Button5:
2192 { 2197 {
2193 int i; 2198 int i;
… …
2195 2200
2196 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2197 2202
2198 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2199 i = 1; 2204 i = 1;
2200 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2201 i = nrow - 1; 2206 i = nrow - 1;
2202 else 2207 else
2203 i = 5; 2208 i = 5;
2204 2209
2205# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
… …
2215 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2216 } 2221 }
2217 else 2222 else
2218 { 2223 {
2219# endif 2224# endif
2220# ifdef JUMP_MOUSE_WHEEL
2221 scr_page (v, i); 2225 scr_page (v, i);
2222 scr_refresh (SMOOTH_REFRESH);
2223 scrollbar_show (1); 2226 scrollbar_show (1);
2224# else
2225 while (i--)
2226 {
2227 scr_page (v, 1);
2228 scr_refresh (SMOOTH_REFRESH);
2229 scrollbar_show (1);
2230 }
2231# endif
2232# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2233 } 2228 }
2234#endif 2229# endif
2235 } 2230 }
2236 break; 2231 break;
2237#endif 2232#endif
2238 } 2233 }
2239 } 2234 }
2240#ifdef MENUBAR
2241 else if (isMenuBarWindow (ev.window))
2242 menubar_control (ev);
2243#endif
2244} 2235}
2245
2246#ifdef TRANSPARENT
2247#if TINTING
2248/* taken from aterm-0.4.2 */
2249
2250typedef uint32_t RUINT32T;
2251
2252void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2253{
2254 int sh_r, sh_g, sh_b;
2255 RUINT32T mask_r, mask_g, mask_b;
2256 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2257 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2258 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2259 int i;
2260
2261 Visual *visual = display->visual;
2262
2263 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2264
2265 /* for convenience */
2266 mask_r = visual->red_mask;
2267 mask_g = visual->green_mask;
2268 mask_b = visual->blue_mask;
2269
2270 /* boring lookup table pre-initialization */
2271 switch (srcImage->bits_per_pixel) {
2272 case 15:
2273 if ((mask_r != 0x7c00) ||
2274 (mask_g != 0x03e0) ||
2275 (mask_b != 0x001f))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2278 lookup_r = lookup;
2279 lookup_g = lookup+32;
2280 lookup_b = lookup+32+32;
2281 sh_r = 10;
2282 sh_g = 5;
2283 sh_b = 0;
2284 break;
2285 case 16:
2286 if ((mask_r != 0xf800) ||
2287 (mask_g != 0x07e0) ||
2288 (mask_b != 0x001f))
2289 return;
2290 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2291 lookup_r = lookup;
2292 lookup_g = lookup+32;
2293 lookup_b = lookup+32+64;
2294 sh_r = 11;
2295 sh_g = 5;
2296 sh_b = 0;
2297 break;
2298 case 24:
2299 if ((mask_r != 0xff0000) ||
2300 (mask_g != 0x00ff00) ||
2301 (mask_b != 0x0000ff))
2302 return;
2303 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2304 lookup_r = lookup;
2305 lookup_g = lookup+256;
2306 lookup_b = lookup+256+256;
2307 sh_r = 16;
2308 sh_g = 8;
2309 sh_b = 0;
2310 break;
2311 case 32:
2312 if ((mask_r != 0xff0000) ||
2313 (mask_g != 0x00ff00) ||
2314 (mask_b != 0x0000ff))
2315 return;
2316 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2317 lookup_r = lookup;
2318 lookup_g = lookup+256;
2319 lookup_b = lookup+256+256;
2320 sh_r = 16;
2321 sh_g = 8;
2322 sh_b = 0;
2323 break;
2324 default:
2325 return; /* we do not support this color depth */
2326 }
2327
2328 /* prepare limits for color transformation (each channel is handled separately) */
2329 if (shade < 0) {
2330 shade = -shade;
2331 if (shade < 0) shade = 0;
2332 if (shade > 100) shade = 100;
2333
2334 lower_lim_r = 65535-rm;
2335 lower_lim_g = 65535-gm;
2336 lower_lim_b = 65535-bm;
2337
2338 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2339 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2340 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2341
2342 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2343 } else {
2344 if (shade < 0) shade = 0;
2345 if (shade > 100) shade = 100;
2346
2347 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2348
2349 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2350 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2351 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2352 }
2353
2354 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2355 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2356 {
2357 unsigned int tmp;
2358
2359 tmp = lower_lim_r;
2360 lower_lim_r = lower_lim_b;
2361 lower_lim_b = tmp;
2362
2363 tmp = upper_lim_r;
2364 upper_lim_r = upper_lim_b;
2365 upper_lim_b = tmp;
2366 }
2367
2368 /* fill our lookup tables */
2369 for (i = 0; i <= mask_r>>sh_r; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2373 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2374 lookup_r[i] = (tmp/65535)<<sh_r;
2375 }
2376 for (i = 0; i <= mask_g>>sh_g; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2380 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2381 lookup_g[i] = (tmp/65535)<<sh_g;
2382 }
2383 for (i = 0; i <= mask_b>>sh_b; i++)
2384 {
2385 RUINT32T tmp;
2386 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2387 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2388 lookup_b[i] = (tmp/65535)<<sh_b;
2389 }
2390
2391 /* apply table to input image (replacing colors by newly calculated ones) */
2392 switch (srcImage->bits_per_pixel)
2393 {
2394 case 15:
2395 {
2396 unsigned short *p1, *pf, *p, *pl;
2397 p1 = (unsigned short *) srcImage->data;
2398 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399 while (p1 < pf)
2400 {
2401 p = p1;
2402 pl = p1 + srcImage->width;
2403 for (; p < pl; p++)
2404 {
2405 *p = lookup_r[(*p & 0x7c00)>>10] |
2406 lookup_g[(*p & 0x03e0)>> 5] |
2407 lookup_b[(*p & 0x001f)];
2408 }
2409 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2410 }
2411 break;
2412 }
2413 case 16:
2414 {
2415 unsigned short *p1, *pf, *p, *pl;
2416 p1 = (unsigned short *) srcImage->data;
2417 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xf800)>>11] |
2425 lookup_g[(*p & 0x07e0)>> 5] |
2426 lookup_b[(*p & 0x001f)];
2427 }
2428 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 case 24:
2433 {
2434 unsigned char *p1, *pf, *p, *pl;
2435 p1 = (unsigned char *) srcImage->data;
2436 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2437 while (p1 < pf)
2438 {
2439 p = p1;
2440 pl = p1 + srcImage->width * 3;
2441 for (; p < pl; p += 3)
2442 {
2443 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2444 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2445 p[2] = lookup_r[(p[2] & 0x0000ff)];
2446 }
2447 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2448 }
2449 break;
2450 }
2451 case 32:
2452 {
2453 RUINT32T *p1, *pf, *p, *pl;
2454 p1 = (RUINT32T *) srcImage->data;
2455 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2456
2457 while (p1 < pf)
2458 {
2459 p = p1;
2460 pl = p1 + srcImage->width;
2461 for (; p < pl; p++)
2462 {
2463 *p = lookup_r[(*p & 0xff0000)>>16] |
2464 lookup_g[(*p & 0x00ff00)>> 8] |
2465 lookup_b[(*p & 0x0000ff)] |
2466 (*p & ~0xffffff);
2467 }
2468 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2469 }
2470 break;
2471 }
2472 }
2473
2474 free (lookup);
2475}
2476#endif
2477
2478/*
2479 * Check our parents are still who we think they are.
2480 * Do transparency updates if required
2481 */
2482int
2483rxvt_term::check_our_parents ()
2484{
2485 int i, pchanged, aformat, have_pixmap, rootdepth;
2486 unsigned long nitems, bytes_after;
2487 Atom atype;
2488 unsigned char *prop = NULL;
2489 Window root, oldp, *list;
2490 Pixmap rootpixmap = None;
2491 XWindowAttributes wattr, wrootattr;
2492 dDisp;
2493
2494 pchanged = 0;
2495
2496 if (!OPTION (Opt_transparent))
2497 return pchanged; /* Don't try any more */
2498
2499 XGetWindowAttributes (disp, display->root, &wrootattr);
2500 rootdepth = wrootattr.depth;
2501
2502 XGetWindowAttributes (disp, parent[0], &wattr);
2503
2504 if (rootdepth != wattr.depth)
2505 {
2506 if (am_transparent)
2507 {
2508 pchanged = 1;
2509 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2510 am_transparent = am_pixmap_trans = 0;
2511 }
2512
2513 return pchanged; /* Don't try any more */
2514 }
2515
2516 /* Get all X ops out of the queue so that our information is up-to-date. */
2517 XSync (disp, False);
2518
2519 /*
2520 * Make the frame window set by the window manager have
2521 * the root background. Some window managers put multiple nested frame
2522 * windows for each client, so we have to take care about that.
2523 */
2524 i = (xa[XA_XROOTPMAP_ID]
2525 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527 &nitems, &bytes_after, &prop) == Success);
2528
2529 if (!i || prop == NULL)
2530 i = (xa[XA_ESETROOT_PMAP_ID]
2531 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2532 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2533 &nitems, &bytes_after, &prop) == Success);
2534
2535 if (!i || prop == NULL
2536#if TINTING
2537 || !rs[Rs_color + Color_tint]
2538#endif
2539 )
2540 have_pixmap = 0;
2541 else
2542 {
2543 have_pixmap = 1;
2544 rootpixmap = *(Pixmap *)prop;
2545 XFree (prop);
2546 }
2547
2548 if (have_pixmap)
2549 {
2550 /*
2551 * Copy display->root pixmap transparency
2552 */
2553 int sx, sy, nx, ny;
2554 unsigned int nw, nh;
2555 Window cr;
2556 XImage *image;
2557 GC gc;
2558 XGCValues gcvalue;
2559
2560 XTranslateCoordinates (disp, parent[0], display->root,
2561 0, 0, &sx, &sy, &cr);
2562 nw = (unsigned int)szHint.width;
2563 nh = (unsigned int)szHint.height;
2564 nx = ny = 0;
2565
2566 if (sx < 0)
2567 {
2568 nw += sx;
2569 nx = -sx;
2570 sx = 0;
2571 }
2572
2573 if (sy < 0)
2574 {
2575 nh += sy;
2576 ny = -sy;
2577 sy = 0;
2578 }
2579
2580 min_it (nw, (unsigned int) (wrootattr.width - sx));
2581 min_it (nh, (unsigned int) (wrootattr.height - sy));
2582
2583 XSync (disp, False);
2584 allowedxerror = -1;
2585 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2586
2587 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2588 /* XXX: may need a delay here? */
2589 allowedxerror = 0;
2590
2591 if (image == NULL)
2592 {
2593 if (am_transparent && am_pixmap_trans)
2594 {
2595 pchanged = 1;
2596 if (pixmap != None)
2597 {
2598 XFreePixmap (disp, pixmap);
2599 pixmap = None;
2600 }
2601 }
2602
2603 am_pixmap_trans = 0;
2604 }
2605 else
2606 {
2607 if (pixmap != None)
2608 XFreePixmap (disp, pixmap);
2609
2610#if TINTING
2611 if (ISSET_PIXCOLOR (Color_tint))
2612 {
2613 unsigned short rm, gm, bm;
2614 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2615
2616 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2617
2618 ShadeXImage (display, image, shade, rm, gm, bm);
2619 }
2620#endif
2621
2622 pixmap = XCreatePixmap (disp, vt,
2623 szHint.width, szHint.height, image->depth);
2624 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2625 XPutImage (disp, pixmap, gc, image, 0, 0,
2626 nx, ny, image->width, image->height);
2627 XFreeGC (disp, gc);
2628 XDestroyImage (image);
2629 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2630 XClearWindow (disp, parent[0]);
2631
2632 if (!am_transparent || !am_pixmap_trans)
2633 pchanged = 1;
2634
2635 am_transparent = am_pixmap_trans = 1;
2636 }
2637 }
2638
2639 if (am_pixmap_trans)
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 else
2642 {
2643 unsigned int n;
2644 /*
2645 * InheritPixmap transparency
2646 */
2647 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 {
2649 oldp = parent[i];
2650 XQueryTree (disp, parent[i - 1], &root,
2651 &parent[i], &list, &n);
2652 XFree (list);
2653
2654 if (parent[i] == display->root)
2655 {
2656 if (oldp != None)
2657 pchanged = 1;
2658
2659 break;
2660 }
2661
2662 if (oldp != parent[i])
2663 pchanged = 1;
2664 }
2665
2666 n = 0;
2667
2668 if (pchanged)
2669 {
2670 for (; n < (unsigned int)i; n++)
2671 {
2672 XGetWindowAttributes (disp, parent[n], &wattr);
2673 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2674 {
2675 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2676 break;
2677 }
2678 }
2679 }
2680
2681 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2682 {
2683 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2684 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2685 am_transparent = 0;
2686 /* XXX: also turn off Opt_transparent? */
2687 }
2688 else
2689 {
2690#if WAIT_FOR_WM
2691 /* wait (an arbitrary period) for the WM to do its thing
2692 * needed for fvwm2.2.2 (and before?) */
2693 sleep (1);
2694#endif
2695 for (n = 0; n < (unsigned int)i; n++)
2696 {
2697 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2698 XClearWindow (disp, parent[n]);
2699 }
2700
2701 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2702 am_transparent = 1;
2703 }
2704
2705 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2706 parent[i] = None;
2707 }
2708
2709 if (scrollBar.win)
2710 {
2711 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2712 scrollBar.setIdle ();
2713 scrollbar_show (0);
2714 }
2715
2716 if (am_transparent)
2717 {
2718 want_refresh = want_full_refresh = 1;
2719 if (am_pixmap_trans)
2720 flush ();
2721 }
2722
2723 return pchanged;
2724}
2725#endif
2726 2236
2727/*}}} */ 2237/*}}} */
2728 2238
2729bool 2239bool
2730rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
… …
2779 if (ch == C0_LF) 2289 if (ch == C0_LF)
2780 nlines++; 2290 nlines++;
2781 2291
2782 refresh_count++; 2292 refresh_count++;
2783 2293
2784 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2785 || (refresh_count >= refresh_limit * (nrow - 1)))
2786 { 2295 {
2787 refreshnow = true;
2788 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + .1)
2299 {
2300 refreshnow = true;
2789 ch = NOCHAR; 2301 ch = NOCHAR;
2790 break; 2302 break;
2303 }
2791 } 2304 }
2792 2305
2793 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2794 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2795 { 2308 {
2309 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2310 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2797 scr_add_lines (buf, str - buf, nlines); 2311 scr_add_lines (buf, str - buf, nlines);
2798 2312
2799 nlines = 0; 2313 nlines = 0;
2800 str = buf; 2314 str = buf;
2801 eol = str + min (ncol, UBUFSIZ); 2315 eol = str + min (ncol, UBUFSIZ);
… …
2816 2330
2817 seq_begin = cmdbuf_ptr; 2331 seq_begin = cmdbuf_ptr;
2818 ch = next_char (); 2332 ch = next_char ();
2819 } 2333 }
2820 2334
2335 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2822 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2823 2338
2824 /* 2339 /*
2825 * 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
2826 * 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.
2827 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2828 * is incremented here because we must be doing flat-out scrolling.
2829 */ 2343 */
2830 if (refreshnow) 2344 if (refreshnow)
2831 { 2345 {
2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833 refresh_limit++;
2834 else
2835 {
2836 flag = true; 2346 flag = true;
2837 scr_refresh (refresh_type); 2347 scr_refresh ();
2838 flush_ev.stop (); 2348 want_refresh = 1;
2839 }
2840 } 2349 }
2841 2350
2842 } 2351 }
2843 else 2352 else
2844 { 2353 {
… …
2860 return flag; 2369 return flag;
2861} 2370}
2862 2371
2863// read the next character 2372// read the next character
2864wchar_t 2373wchar_t
2865rxvt_term::next_char () 2374rxvt_term::next_char () NOTHROW
2866{ 2375{
2867 while (cmdbuf_ptr < cmdbuf_endp) 2376 while (cmdbuf_ptr < cmdbuf_endp)
2868 { 2377 {
2869 // assume 7-bit to be ascii ALWAYS 2378 // assume 7-bit to be ascii ALWAYS
2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2891 return NOCHAR; 2400 return NOCHAR;
2892} 2401}
2893 2402
2894// read the next octet 2403// read the next octet
2895uint32_t 2404uint32_t
2896rxvt_term::next_octet () 2405rxvt_term::next_octet () NOTHROW
2897{ 2406{
2898 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR; 2409 : NOCHAR;
2901} 2410}
2411
2412static class out_of_input out_of_input;
2902 2413
2903/* rxvt_cmd_getc () - Return next input character */ 2414/* rxvt_cmd_getc () - Return next input character */
2904/* 2415/*
2905 * Return the next input character after first passing any keyboard input 2416 * Return the next input character after first passing any keyboard input
2906 * to the command. 2417 * to the command.
2907 */ 2418 */
2908wchar_t 2419wchar_t
2909rxvt_term::cmd_getc () 2420rxvt_term::cmd_getc () THROW ((class out_of_input))
2910{ 2421{
2911 wchar_t c = next_char (); 2422 wchar_t c = next_char ();
2912 2423
2913 if (c == NOCHAR) 2424 if (c == NOCHAR)
2914 throw out_of_input; 2425 throw out_of_input;
2915 2426
2916 return c; 2427 return c;
2917} 2428}
2918 2429
2919uint32_t 2430uint32_t
2920rxvt_term::cmd_get8 () 2431rxvt_term::cmd_get8 () THROW ((class out_of_input))
2921{ 2432{
2922 uint32_t c = next_octet (); 2433 uint32_t c = next_octet ();
2923 2434
2924 if (c == NOCHAR) 2435 if (c == NOCHAR)
2925 throw out_of_input; 2436 throw out_of_input;
… …
2991 { 2502 {
2992 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2993 break; /* done = 1 */ 2504 break; /* done = 1 */
2994 } 2505 }
2995 } 2506 }
2996 2507
2997 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2998 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2999 { 2510 {
3000 done = 1; 2511 done = 1;
3001 break; 2512 break;
… …
3163 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
3164 break; 2675 break;
3165 case '+': 2676 case '+':
3166 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3167 break; 2678 break;
3168#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3169 case '6': 2680 case '6':
3170 scr_backindex (); 2681 scr_backindex ();
3171 break; 2682 break;
3172#endif 2683#endif
3173 case '7': 2684 case '7':
3174 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3175 break; 2686 break;
3176 case '8': 2687 case '8':
3177 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3178 break; 2689 break;
3179#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3180 case '9': 2691 case '9':
3181 scr_forwardindex (); 2692 scr_forwardindex ();
3182 break; 2693 break;
3183#endif 2694#endif
3184 case '=': 2695 case '=':
… …
3346 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
3347 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
3348 if (arg[p] == -1) 2859 if (arg[p] == -1)
3349 arg[p] = ndef; 2860 arg[p] = ndef;
3350 2861
3351#ifdef DEBUG_CMD
3352 fprintf (stderr, "CSI ");
3353 for (p = 0; p < nargs; p++)
3354 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3355 fprintf (stderr, "%c\n", ch);
3356#endif
3357
3358 /* 2862 /*
3359 * private mode handling 2863 * private mode handling
3360 */ 2864 */
3361 if (priv) 2865 if (priv)
3362 { 2866 {
3363 switch (priv) 2867 switch (priv)
3364 { 2868 {
3365 case '>': 2869 case '>':
3366 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3367 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2871 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, '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 }
3368 break; 2881 break;
3369 case '?': 2882 case '?':
3370 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3371 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3372 break; 2885 break;
… …
3498 break; 3011 break;
3499 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3500 scr_report_position (); 3013 scr_report_position ();
3501 break; 3014 break;
3502 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3503 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3504 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3505 break; 3018 break;
3506 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3507 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3508 break; 3021 break;
… …
3575 break; 3088 break;
3576 case CSI_75: 3089 case CSI_75:
3577 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3578 break; 3091 break;
3579 3092
3580#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3581 case CSI_74: 3094 case CSI_74:
3582 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3583 break; 3096 break;
3584#endif 3097#endif
3585 3098
… …
3592 break; 3105 break;
3593 } 3106 }
3594} 3107}
3595/*}}} */ 3108/*}}} */
3596 3109
3597#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3598/* ARGSUSED */ 3111/* ARGSUSED */
3599void 3112void
3600rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3601{ 3114{
3602 int x, y; 3115 int x, y;
3603 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3604 Window wdummy; 3117 Window wdummy;
3605 dDisp; 3118
3119 dLocal (Display *, dpy);
3606 3120
3607 if (nargs == 0) 3121 if (nargs == 0)
3608 return; 3122 return;
3609 3123
3610 switch (args[0]) 3124 switch (args[0])
3611 { 3125 {
3612 /* 3126 /*
3613 * commands 3127 * commands
3614 */ 3128 */
3615 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3616 XMapWindow (disp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3617 break; 3131 break;
3618 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3619 XIconifyWindow (disp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3620 break; 3134 break;
3621 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3622 XMoveWindow (disp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3623 break; 3137 break;
3624 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3625 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3626 break; 3140 break;
3627 case 5: /* raise window */ 3141 case 5: /* raise window */
3628 XRaiseWindow (disp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3629 break; 3143 break;
3630 case 6: /* lower window */ 3144 case 6: /* lower window */
3631 XLowerWindow (disp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3632 break; 3146 break;
3633 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3634 scr_touch (true); 3148 scr_touch (true);
3635 break; 3149 break;
3636 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
… …
3643 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3644 set_widthheight ((unsigned int)width, 3158 set_widthheight ((unsigned int)width,
3645 (unsigned int) (args[1] * fheight)); 3159 (unsigned int) (args[1] * fheight));
3646 break; 3160 break;
3647 3161
3648
3649 /* 3162 /*
3650 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3651 */ 3164 */
3652 case 11: /* report window state */ 3165 case 11: /* report window state */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3655 break; 3168 break;
3656 case 13: /* report window position */ 3169 case 13: /* report window position */
3657 XGetWindowAttributes (disp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3658 XTranslateCoordinates (disp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3659 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3660 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3661 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3662 break; 3175 break;
3663 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3664 XGetWindowAttributes (disp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3665 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3666 break; 3179 break;
3667 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3668 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3669 break; 3182 break;
… …
3671 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3672 break; 3185 break;
3673 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3674 { 3187 {
3675 char *s; 3188 char *s;
3676 XGetIconName (disp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3677 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 */
3678 XFree (s); 3191 XFree (s);
3679 } 3192 }
3680 break; 3193 break;
3681 case 21: /* report window title */ 3194 case 21: /* report window title */
3682 { 3195 {
3683 char *s; 3196 char *s;
3684 XFetchName (disp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3685 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 */
3686 XFree (s); 3199 XFree (s);
3687 } 3200 }
3688 break; 3201 break;
3689 } 3202 }
3690} 3203}
… …
3717 seen_esc = true; 3230 seen_esc = true;
3718 continue; 3231 continue;
3719 } 3232 }
3720 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3721 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3722 else if (ch < 0x20) 3237 else if (ch < 0x20)
3723 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3724 3239
3725 seen_esc = false; 3240 seen_esc = false;
3726 3241
3727 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3728 // stop at some sane length 3243 // stop at some sane length
3729 return NULL; 3244 return NULL;
3730 3245
3731 if (ch == C0_SYN)
3732 string[n++] = cmd_get8 ();
3733 else
3734 string[n++] = ch; 3246 string[n++] = ch;
3735 } 3247 }
3736 3248
3737 string[n++] = '\0'; 3249 string[n++] = '\0';
3738 3250
3739 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3790void 3302void
3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3792{ 3304{
3793 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3794 { 3306 {
3795 unsigned short r, g, b; 3307 rgba c;
3796 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
3797 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);
3798 } 3316 }
3799 else 3317 else
3800 set_window_color (color, str); 3318 set_window_color (color, str);
3801} 3319}
3802 3320
… …
3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3805 */ 3323 */
3806void 3324void
3807rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3325rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3808{ 3326{
3809 int changed = 0;
3810 int color; 3327 int color;
3811 char *buf, *name; 3328 char *buf, *name;
3812 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3813 int saveop = op; 3330 int saveop = op;
3814 dDisp; 3331
3332 dLocal (Display *, dpy);
3815 3333
3816 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
3817 switch (op) 3339 switch (op)
3818 { 3340 {
3819 case XTerm_name: 3341 case XTerm_name:
3820 set_title (str); 3342 set_title (str);
3821 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
… …
3835 unsigned long bytes_after; 3357 unsigned long bytes_after;
3836 unsigned char *value = 0; 3358 unsigned char *value = 0;
3837 const char *str = ""; 3359 const char *str = "";
3838 3360
3839 if (prop 3361 if (prop
3840 && XGetWindowProperty (disp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3841 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3842 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3843 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3844 && actual_type != None 3366 && actual_type != None
3845 && actual_format == 8) 3367 && actual_format == 8)
3846 str = (const char *)(value); 3368 str = (const char *)(value);
3847 3369
3848 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3849 3371
3850 XFree (value); 3372 XFree (value);
3851 } 3373 }
3852 else 3374 else
3853 { 3375 {
… …
3857 { 3379 {
3858 *eq = 0; 3380 *eq = 0;
3859 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3860 } 3382 }
3861 else 3383 else
3862 XDeleteProperty (disp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3863 display->atom (str)); 3385 display->atom (str));
3864 } 3386 }
3865 break; 3387 break;
3866 3388
3867 case XTerm_Color: 3389 case XTerm_Color:
… …
3869 { 3391 {
3870 if ((name = strchr (buf, ';')) == NULL) 3392 if ((name = strchr (buf, ';')) == NULL)
3871 break; 3393 break;
3872 3394
3873 *name++ = '\0'; 3395 *name++ = '\0';
3874 color = atoi (buf); 3396 color = atoi (buf) + minCOLOR;
3875 3397
3876 if (color < 0 || color >= TOTAL_COLORS) 3398 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877 break; 3399 break;
3878 3400
3879 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3880 *buf++ = '\0'; 3402 *buf++ = '\0';
3881 3403
3882 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3883 {
3884 unsigned short r, g, b;
3885 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3886 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887 }
3888 else
3889 set_window_color (color + minCOLOR, name);
3890 } 3405 }
3891 break; 3406 break;
3892 case XTerm_Color00: 3407 case XTerm_Color00:
3893 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3894 break; 3409 break;
3895 case XTerm_Color01: 3410 case XTerm_Color01:
3896 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3897 break; 3412 break;
3898#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3899 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3900 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3901 break; 3416 break;
3902#endif 3417#endif
3903 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3904 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3905 break; 3420 break;
3906 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3907 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3908 break; 3423 break;
3909#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3910 case XTerm_Color_BD:
3911 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3912 break;
3913 case XTerm_Color_UL:
3914 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3915 break;
3916 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3917 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);
3918 break; 3435 break;
3919 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3920 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3921 break; 3438 break;
3922#endif 3439#endif
3923#if TRANSPARENT && TINTING 3440#if TRANSPARENT && TINTING
3924 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3925 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3926 check_our_parents (); 3444 check_our_parents ();
3445
3927 if (am_transparent) 3446 if (am_transparent)
3928 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3929 break;
3930#endif
3931 3448
3449 break;
3450#endif
3451
3932 case XTerm_Pixmap: 3452 case Rxvt_Pixmap:
3453 {
3933 if (*str != ';') 3454 if (*str != ';')
3934 { 3455 {
3935#if XPM_BACKGROUND 3456#if XPM_BACKGROUND
3936 scale_pixmap (""); /* reset to default scaling */ 3457 scale_pixmap (""); /* reset to default scaling */
3937 set_bgPixmap (str); /* change pixmap */ 3458 set_bgPixmap (str); /* change pixmap */
3938#endif
3939 scr_touch (true); 3459 scr_touch (true);
3460#endif
3940 } 3461 }
3462
3463 int changed = 0;
3464
3941 while ((str = strchr (str, ';')) != NULL) 3465 while ((str = strchr (str, ';')) != NULL)
3942 { 3466 {
3943 str++; 3467 str++;
3944#if XPM_BACKGROUND 3468#if XPM_BACKGROUND
3945 changed += scale_pixmap (str); 3469 changed += scale_pixmap (str);
3946#endif 3470#endif
3947 } 3471 }
3948 3472
3949 if (changed) 3473 if (changed)
3950 { 3474 {
3951#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3952 resize_pixmap (); 3476 resize_pixmap ();
3953#endif
3954 scr_touch (true); 3477 scr_touch (true);
3478#endif
3955 } 3479 }
3480#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3956 break; 3485 break;
3957 3486
3958 case XTerm_restoreFG: 3487 case Rxvt_restoreFG:
3959 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3960 break; 3489 break;
3961 case XTerm_restoreBG: 3490 case Rxvt_restoreBG:
3962 set_window_color (Color_bg, str); 3491 set_window_color (Color_bg, str);
3963 break; 3492 break;
3964 3493
3965 case XTerm_logfile: 3494 case XTerm_logfile:
3966 // TODO, when secure mode? 3495 // TODO, when secure mode?
3967 break; 3496 break;
3968 3497
3969#ifdef MENUBAR
3970 case URxvt_Menu:
3971 if (OPTION (Opt_insecure))
3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3973 break;
3974#endif
3975#if 0 3498#if 0
3976 case XTerm_dumpscreen: /* no error notices */ 3499 case Rxvt_dumpscreen: /* no error notices */
3977 { 3500 {
3978 int fd; 3501 int fd;
3979 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)
3980 { 3503 {
3981 scr_dump (fd); 3504 scr_dump (fd);
… …
3992 case URxvt_italicFont: 3515 case URxvt_italicFont:
3993 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3994#endif 3517#endif
3995 if (query) 3518 if (query)
3996 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3997 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3998 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3999 resp); 3522 resp);
4000 else 3523 else
4001 { 3524 {
4002 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4005 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
4006 set_fonts (); 3529 set_fonts ();
4007 } 3530 }
4008 break; 3531 break;
4009 3532
4010#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
4011 case URxvt_locale: 3542 case URxvt_locale:
4012 if (query) 3543 if (query)
4013 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);
4014 else 3545 else
4015 { 3546 {
4016 set_locale (str); 3547 set_locale (str);
4017 pty.set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
4018 init_xlocale (); 3549 init_xlocale ();
4019 } 3550 }
4020 break; 3551 break;
4021 3552
4022 case URxvt_view_up: 3553 case URxvt_view_up:
… …
4033 break; 3564 break;
4034#endif 3565#endif
4035 3566
4036#if ENABLE_PERL 3567#if ENABLE_PERL
4037 case URxvt_perl: 3568 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4039 ; // no responses yet 3570 ; // no responses yet
4040 break; 3571 break;
4041#endif 3572#endif
4042 } 3573 }
4043} 3574}
… …
4075 return state; 3606 return state;
4076} 3607}
4077 3608
4078/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
4079void 3610void
4080rxvt_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)
4081{ 3612{
4082 unsigned int i, j; 3613 unsigned int i, j;
4083 int state; 3614 int state;
4084 3615
4085 static const struct 3616 static const struct
… …
4096 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo },
4097 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin },
4098 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap },
4099 // 8, bi-directional support mode 3630 // 8, bi-directional support mode
4100 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
4101#ifdef menuBar_esc
4102 { menuBar_esc, PrivMode_menuBar },
4103#endif
4104 // 18, 19 printing-related 3632 // 18, 19 printing-related
4105 { 25, PrivMode_VisibleCursor }, 3633 { 25, PrivMode_VisibleCursor },
4106#ifdef scrollBar_esc 3634#ifdef scrollBar_esc
4107 { scrollBar_esc, PrivMode_scrollBar }, 3635 { scrollBar_esc, PrivMode_scrollBar },
4108#endif 3636#endif
… …
4155 /* extra handling for values with state unkept */ 3683 /* extra handling for values with state unkept */
4156 switch (arg[i]) 3684 switch (arg[i])
4157 { 3685 {
4158#if ENABLE_STYLES 3686#if ENABLE_STYLES
4159 case 1021: 3687 case 1021:
4160 if (mode) 3688 set_option (Opt_intensityStyles, mode);
4161 SET_OPTION (Opt_intensityStyles);
4162 else
4163 CLR_OPTION (Opt_intensityStyles);
4164 3689
4165 scr_touch (true); 3690 scr_touch (true);
4166 break; 3691 break;
4167#endif 3692#endif
4168 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4169 case 1049: 3694 case 1049:
4170 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4171 if (mode == 0) 3696 if (mode == 0)
4172 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4173 else if (mode == 1) 3698 else if (mode == 1)
4174 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4175 break; 3700 break;
… …
4190 case 3: /* 80/132 */ 3715 case 3: /* 80/132 */
4191 if (priv_modes & PrivMode_132OK) 3716 if (priv_modes & PrivMode_132OK)
4192 set_widthheight (((state ? 132 : 80) * fwidth), height); 3717 set_widthheight (((state ? 132 : 80) * fwidth), height);
4193 break; 3718 break;
4194 case 4: /* smooth scrolling */ 3719 case 4: /* smooth scrolling */
4195 if (!state) 3720 set_option (Opt_jumpScroll, !state);
4196 SET_OPTION (Opt_jumpScroll);
4197 else
4198 CLR_OPTION (Opt_jumpScroll);
4199 break; 3721 break;
4200 case 5: /* reverse video */ 3722 case 5: /* reverse video */
4201 scr_rvideo_mode (state); 3723 scr_rvideo_mode (state);
4202 break; 3724 break;
4203 case 6: /* relative/absolute origins */ 3725 case 6: /* relative/absolute origins */
… …
4209 /* 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 */
4210 case 9: /* X10 mouse reporting */ 3732 case 9: /* X10 mouse reporting */
4211 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4212 priv_modes &= ~PrivMode_MouseX11; 3734 priv_modes &= ~PrivMode_MouseX11;
4213 break; 3735 break;
4214#ifdef menuBar_esc
4215 case menuBar_esc:
4216#ifdef MENUBAR
4217 map_menuBar (state);
4218#endif
4219 break;
4220#endif
4221#ifdef scrollBar_esc 3736#ifdef scrollBar_esc
4222 case scrollBar_esc: 3737 case scrollBar_esc:
4223 if (scrollbar_mapping (state)) 3738 if (scrollbar_mapping (state))
4224 { 3739 {
4225 resize_all_windows (0, 0, 0); 3740 resize_all_windows (0, 0, 0);
… …
4244#if 0 3759#if 0
4245 case 1001: 3760 case 1001:
4246 break; /* X11 mouse highlighting */ 3761 break; /* X11 mouse highlighting */
4247#endif 3762#endif
4248 case 1010: /* scroll to bottom on TTY output inhibit */ 3763 case 1010: /* scroll to bottom on TTY output inhibit */
4249 if (!state) 3764 set_option (Opt_scrollTtyOutput, !state);
4250 SET_OPTION (Opt_scrollTtyOutput);
4251 else
4252 CLR_OPTION (Opt_scrollTtyOutput);
4253 break; 3765 break;
4254 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4255 if (state) 3767 set_option (Opt_scrollTtyKeypress, state);
4256 SET_OPTION (Opt_scrollTtyKeypress);
4257 else
4258 CLR_OPTION (Opt_scrollTtyKeypress);
4259 break; 3768 break;
4260 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4261 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4262 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4263 scr_erase_screen (2); 3772 scr_erase_screen (2);
4264 scr_change_screen (state); 3773 scr_change_screen (state);
4265 break; 3774 break;
4266 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4267 scr_change_screen (state); 3776 scr_change_screen (state);
4268 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4269 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4270 scr_erase_screen (2); 3779 scr_erase_screen (2);
4271 break; 3780 break;
4272 default: 3781 default:
4273 break; 3782 break;
… …
4401 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4402 break; 3911 break;
4403 3912
4404 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4405 3914
4406#if ENABLE_FRILLS 3915#if !ENABLE_MINIMAL
4407 case 90: 3916 case 90:
4408 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4409 case 92: 3918 case 92:
4410 case 93: 3919 case 93:
4411 case 94: 3920 case 94:
… …
4473const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4474 3983
4475void 3984void
4476rxvt_term::tt_write (const char *data, unsigned int len) 3985rxvt_term::tt_write (const char *data, unsigned int len)
4477{ 3986{
4478 if (pty.pty < 0) 3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4479 return; 3988 return;
4480 3989
3990 if (pty->pty < 0)
3991 return;
3992
4481 if (v_buflen == 0) 3993 if (v_buflen == 0)
4482 { 3994 {
4483 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));
4484 3996
4485 if ((unsigned int)written == len) 3997 if ((unsigned int)written == len)
4486 return; 3998 return;
4487 3999
4488 data += written; 4000 data += written;
… …
4497 pty_ev.set (EVENT_READ | EVENT_WRITE); 4009 pty_ev.set (EVENT_READ | EVENT_WRITE);
4498} 4010}
4499 4011
4500void rxvt_term::pty_write () 4012void rxvt_term::pty_write ()
4501{ 4013{
4502 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));
4503 4015
4504 if (written > 0) 4016 if (written > 0)
4505 { 4017 {
4506 v_buflen -= written; 4018 v_buflen -= written;
4507 4019

Diff Legend

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