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.246 by root, Fri Jan 6 18:36:21 2006 UTC vs.
Revision 1.324 by sasha, Fri Jun 8 20:04:12 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 {
… …
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 (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; 1115 refresh_limit = 1;
1043 refresh_count = 0; 1116 refresh_count = 0;
1044 flush (); 1117 flush ();
1045} 1118}
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1123{
1051 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1125 want_refresh = 1;
1053 1126
1054 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1128}
1056#endif 1129#endif
1057 1130
1058#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1059void 1132void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1147{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1150 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1151 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1153 }
1082} 1154}
1083#endif 1155#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1160{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1162 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1164 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1166 }
1096} 1167}
1097#endif 1168#endif
… …
1102{ 1173{
1103 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1177 {
1107 if (view_start == nsaved || 1178 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1110 1180
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1181 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1183 }
1115} 1184}
1116#endif 1185#endif
1117 1186
1118#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1119static struct event_handler 1188static struct event_handler
1120{ 1189{
1121 check_watcher cw_yield; 1190 check_watcher yield_ev;
1122 1191
1123 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1124 { 1193 {
1125 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1126 w.stop (); 1202 w.stop ();
1127 } 1203 }
1128 1204
1129 event_handler () 1205 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1131 { 1207 {
1132 } 1208 }
1133} event_handler; 1209} event_handler;
1134#endif 1210#endif
1135 1211
… …
1146 1222
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1150 1226
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1228
1153 if (r > 0) 1229 if (r > 0)
1154 { 1230 {
1155 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1156 return true; 1232 return true;
1157 } 1233 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1235 {
1160#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1161 if (display->is_local) 1237 if (display->is_local)
1162 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1163#endif 1239#endif
1164 } 1240 }
1165 else 1241 else
1166 { 1242 {
1167 pty_ev.stop (); 1243 pty_ev.stop ();
1168 1244
1169 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1170 destroy (); 1246 destroy ();
1171 } 1247 }
1172 1248
1173 return false; 1249 return false;
1174} 1250}
1175 1251
1176void 1252void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1254{
1179 SET_R (this); 1255 make_current ();
1180 SET_LOCALE (locale);
1181 1256
1182 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1259 while (pty_fill ())
1185 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1190} 1265}
1191 1266
1192void 1267void
1193rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1194{ 1269{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1271 recolour_cursor ();
1197 1272
1198#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1274 hidden_pointer = 0;
1200 1275
1201 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1278#endif
1204} 1279}
1205 1280
1206#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1207void 1282void
1208rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1209{ 1284{
1210 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1211 return; 1286 return;
1212 1287
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1289 XFlush (dpy);
1215 1290
1216 hidden_pointer = 1; 1291 hidden_pointer = 1;
1217} 1292}
1218 1293
1219void 1294void
1220rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1221{ 1296{
1222 SET_R (this); 1297 make_current ();
1223 SET_LOCALE (locale);
1224 1298
1225 pointer_blank (); 1299 pointer_blank ();
1226} 1300}
1227#endif 1301#endif
1228 1302
… …
1293 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1294 (32 + x + 1), 1368 (32 + x + 1),
1295 (32 + y + 1)); 1369 (32 + y + 1));
1296} 1370}
1297 1371
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 */ 1372/*{{{ process an X event */
1309void 1373void
1310rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1311{ 1375{
1312 dDisp; 1376 make_current ();
1313 1377
1314 SET_R (this); 1378 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1379
1317#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1383 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1384
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1388 unsigned int unused_mask;
1347 1389
1348 switch (ev.type) 1390 switch (ev.type)
1349 { 1391 {
1350 case KeyPress: 1392 case KeyPress:
1351#if ISO_14755 1393 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1394 break;
1357 1395
1358 case KeyRelease: 1396 case KeyRelease:
1359 { 1397 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1428 mouse_slip_wheel_speed = 0;
1429#endif
1430 break; 1398 break;
1431 }
1432 1399
1433 case ButtonPress: 1400 case ButtonPress:
1434 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1435 break; 1402 break;
1436 1403
… …
1438 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1439 break; 1406 break;
1440 1407
1441 case ClientMessage: 1408 case ClientMessage:
1442 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446 destroy (); 1419 destroy ();
1420 }
1447#if ENABLE_EWMH 1421#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1452#endif 1437#endif
1453 } 1438 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1463#ifdef OFFIX_DND
1464 /* OffiX Dnd (drag 'n' drop) protocol */
1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466 && (ev.xclient.data.l[0] == DndFile
1467 || ev.xclient.data.l[0] == DndDir
1468 || ev.xclient.data.l[0] == DndLink))
1469 {
1470 /* Get Dnd data */
1471 Atom ActualType;
1472 int ActualFormat;
1473 unsigned char *data;
1474 unsigned long Size, RemainingBytes;
1475
1476 XGetWindowProperty (disp, display->root,
1477 xa[XA_DNDSELECTION],
1478 0L, 1000000L,
1479 False, AnyPropertyType,
1480 &ActualType, &ActualFormat,
1481 &Size, &RemainingBytes,
1482 &data);
1483 set_string_property (XA_CUT_BUFFER0, data);
1484 XFree (data);
1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487 }
1488#endif /* OFFIX_DND */
1489 break; 1439 break;
1490 1440
1491 case MappingNotify: 1441 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1443 break;
… …
1516 break; 1466 break;
1517 } 1467 }
1518 break; 1468 break;
1519 1469
1520 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1474 focus_in ();
1522 break; 1475 break;
1523 1476
1524 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1481 focus_out ();
1526 break; 1482 break;
1527 1483
1528 case ConfigureNotify: 1484 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1530 { 1486 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1488 ;
1533 1489
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1491 {
1536 seen_resize = 1; 1492 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1538 } 1501 }
1539 1502
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1541 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1542 check_our_parents (); 1507 check_our_parents ();
1543#endif 1508#endif
1544 } 1509 }
1545 break; 1510 break;
1546 1511
1547 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1517
1552 break; 1518 break;
1553 1519
1554 case SelectionClear: 1520 case SelectionClear:
1555 selection_clear (); 1521 selection_clear ();
… …
1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561 break; 1527 break;
1562 1528
1563 case SelectionRequest: 1529 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1531 break;
1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565 break; 1539 break;
1566 1540
1567 case UnmapNotify: 1541 case UnmapNotify:
1568 mapped = 0; 1542 mapped = 0;
1569#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1571#endif 1545#endif
1572 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break; 1547 break;
1580 1548
1581#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1582 case ReparentNotify: 1550 case ReparentNotify:
1583 rootwin_cb (ev); 1551 rootwin_cb (ev);
… …
1589 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1590 { 1558 {
1591 do 1559 do
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1595 1563
1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597 1565
1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1599 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1600 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1601 1569
1602 scr_refresh (refresh_type); 1570 want_refresh = 1;
1603 } 1571 }
1604 else 1572 else
1605 { 1573 {
1606 XEvent unused_event; 1574 XEvent unused_event;
1607 1575
1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1609 ; 1577 ;
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1611 ; 1579 ;
1612 1580
1613 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1614 { 1582 {
1615 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1616 scrollbar_show (0); 1584 scrollbar_show (0);
1617 } 1585 }
1618#ifdef MENUBAR
1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620 menubar_expose ();
1621#endif
1622 1586
1623#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1624 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1625 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1626#endif 1590#endif
1627 } 1591 }
1628 break; 1592 break;
1629 1593
1630 case MotionNotify: 1594 case MotionNotify:
1631#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1632 if (hidden_pointer) 1596 if (hidden_pointer)
1633 pointer_unblank (); 1597 pointer_unblank ();
1634#endif 1598#endif
1635#if MENUBAR
1636 if (isMenuBarWindow (ev.xany.window))
1637 {
1638 menubar_control (ev.xbutton);
1639 break;
1640 }
1641#endif
1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643 break; 1600 break;
1644 1601
1645 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
1646 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop 1606 ; // nop
1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650 { 1608 {
1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1652 ; 1610 ;
1653 1611
1654 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1655 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1658 &ev.xbutton.state); 1616 &ev.xbutton.state);
1659#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1723#endif 1681#endif
1724 } 1682 }
1725 } 1683 }
1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727 { 1685 {
1728 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1729 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1730 ; 1688 ;
1731 1689
1732 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1733 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1734 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1735 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1736 &unused_mask); 1694 &unused_mask);
1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738 scrollbar_size ()); 1696 scrollbar_size ());
1739 scr_refresh (refresh_type); 1697 want_refresh = 1;
1740 refresh_limit = 0; 1698 refresh_limit = 0;
1741 scrollbar_show (1); 1699 scrollbar_show (1);
1742 } 1700 }
1743 break; 1701 break;
1744 } 1702 }
1703
1704#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1706 {
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif
1716
1717#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 {
1720 if (ev.type == MotionNotify
1721 || ev.type == ButtonPress
1722 || ev.type == ButtonRelease)
1723 if (hidden_pointer)
1724 pointer_unblank ();
1725
1726 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank ();
1728 }
1729#endif
1745} 1730}
1746 1731
1747void 1732void
1748rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1749{ 1734{
1750 if (!focus) 1735 if (!focus)
1751 { 1736 {
1752 focus = 1; 1737 focus = 1;
1753 want_refresh = 1; 1738 want_refresh = 1;
1754 1739
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1756 1741
1757#if USE_XIM 1742#if USE_XIM
1758 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1759 { 1744 {
1760 IMSetStatusPosition (); 1745 IMSetPosition ();
1761 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1762 } 1747 }
1763#endif 1748#endif
1764#if CURSOR_BLINK 1749#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1767#endif 1752#endif
1768#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1770 { 1755 {
1771 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1772 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1773 } 1771 }
1774#endif 1772#endif
1775 } 1773 }
1776} 1774}
1777 1775
… …
1797#if USE_XIM 1795#if USE_XIM
1798 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1799 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1800#endif 1798#endif
1801#if CURSOR_BLINK 1799#if CURSOR_BLINK
1802 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1803 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1804 hidden_cursor = 0; 1802 hidden_cursor = 0;
1805#endif 1803#endif
1806#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1811 } 1809 }
1812#endif 1810#endif
1813 } 1811 }
1814} 1812}
1815 1813
1816#if TRANSPARENT 1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1817void 1828void
1818rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1830{
1820 SET_R (this); 1831 make_current ();
1821 SET_LOCALE (locale);
1822 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1823 switch (ev.type) 1838 switch (ev.type)
1824 { 1839 {
1825 case PropertyNotify: 1840 case PropertyNotify:
1826 /* 1841 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
… …
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1832 return; 1847 return;
1833 1848
1834 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1835 case ReparentNotify: 1850 case ReparentNotify:
1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1837 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1838 break; 1853 break;
1839 } 1854 }
1855# endif
1840} 1856}
1841#endif 1857#endif
1842 1858
1843void 1859void
1844rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1853 /* 1869 /*
1854 * VT window processing of button press 1870 * VT window processing of button press
1855 */ 1871 */
1856 if (ev.window == vt) 1872 if (ev.window == vt)
1857 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1858#if ISO_14755 1877#if ISO_14755
1859 // 5.4 1878 // 5.4
1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861 { 1880 {
1862 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
… …
1904 else 1923 else
1905 { 1924 {
1906 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1907 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1908 1927
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910 switch (ev.button) 1928 switch (ev.button)
1911 { 1929 {
1912 case Button1: 1930 case Button1:
1913 /* allow meta + click to select rectangular areas */ 1931 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */ 1932 /* should be done in screen.C */
1915#if ENABLE_FRILLS 1933#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask); 1934 selection.rect = !!(ev.state & ModMetaMask);
1917#else 1935#else
1918 selection.rect = false; 1936 selection.rect = false;
1919#endif 1937#endif
1920 1938
1921 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923 { 1941 {
1924 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1925 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1926 else 1944 else
1927 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1928 } 1946 }
1929 else 1947 else
1930 { 1948 {
1931 if (MEvent.button == Button1 && clickintime) 1949 if (MEvent.button == Button1 && clickintime)
1932 MEvent.clicks++; 1950 MEvent.clicks++;
1933 else 1951 else
1934 MEvent.clicks = 1; 1952 MEvent.clicks = 1;
1935 1953
1936 selection_click (MEvent.clicks, ev.x, ev.y); 1954 selection_click (MEvent.clicks, ev.x, ev.y);
1937 } 1955 }
1938 1956
1939 MEvent.button = Button1; 1957 MEvent.button = Button1;
1940 break; 1958 break;
1941 1959
1942 case Button3: 1960 case Button3:
1943 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1944 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1945 else 1963 else
1946 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1947 1965
1948 MEvent.button = Button3; 1966 MEvent.button = Button3;
1949 break; 1967 break;
1950 } 1968 }
1951 } 1969 }
1952 1970
1953 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1954 return; 1972 return;
1955 } 1973 }
1956 1974
… …
2095 } 2113 }
2096 } 2114 }
2097 2115
2098 return; 2116 return;
2099 } 2117 }
2100
2101#if MENUBAR
2102 /*
2103 * Menubar window processing of button press
2104 */
2105 if (isMenuBarWindow (ev.window))
2106 menubar_control (ev);
2107#endif
2108} 2118}
2109 2119
2110void 2120void
2111rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
2112{ 2122{
… …
2118 2128
2119 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
2120 { 2130 {
2121 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
2122 scrollbar_show (0); 2132 scrollbar_show (0);
2123#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124 refresh_type &= ~SMOOTH_REFRESH;
2125#endif
2126 } 2133 }
2127 2134
2128#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2131#endif 2138#endif
2132 2139
2133 if (ev.window == vt) 2140 if (ev.window == vt)
2134 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2135#if ISO_14755 2145#if ISO_14755
2136 // 5.4 2146 // 5.4
2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138 return; 2148 return;
2139#endif 2149#endif
2150
2140 if (reportmode) 2151 if (reportmode)
2141 { 2152 {
2142 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2143 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2144 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2168 if (priv_modes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
2169 && bypass_keystate 2180 && bypass_keystate
2170 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
2171 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
2172 2183
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2176 switch (ev.button) 2184 switch (ev.button)
2177 { 2185 {
2178 case Button1: 2186 case Button1:
2179 case Button3: 2187 case Button3:
2180 selection_make (ev.time); 2188 selection_make (ev.time);
2181 break; 2189 break;
2190
2182 case Button2: 2191 case Button2:
2183 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2184 break; 2194 break;
2195
2185#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2186 case Button4: 2197 case Button4:
2187 case Button5: 2198 case Button5:
2188 { 2199 {
2189 int i; 2200 int i;
… …
2191 2202
2192 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2193 2204
2194 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2195 i = 1; 2206 i = 1;
2196 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2197 i = nrow - 1; 2208 i = nrow - 1;
2198 else 2209 else
2199 i = 5; 2210 i = 5;
2200 2211
2201# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2211 slip_wheel_ev.start (); 2222 slip_wheel_ev.start ();
2212 } 2223 }
2213 else 2224 else
2214 { 2225 {
2215# endif 2226# endif
2216# ifdef JUMP_MOUSE_WHEEL
2217 scr_page (v, i); 2227 scr_page (v, i);
2218 scr_refresh (SMOOTH_REFRESH);
2219 scrollbar_show (1); 2228 scrollbar_show (1);
2220# else
2221 while (i--)
2222 {
2223 scr_page (v, 1);
2224 scr_refresh (SMOOTH_REFRESH);
2225 scrollbar_show (1);
2226 }
2227# endif
2228# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2229 } 2230 }
2230#endif 2231# endif
2231 } 2232 }
2232 break; 2233 break;
2233#endif 2234#endif
2234 } 2235 }
2235 } 2236 }
2236#ifdef MENUBAR
2237 else if (isMenuBarWindow (ev.window))
2238 menubar_control (ev);
2239#endif
2240} 2237}
2241 2238
2242#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2243#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2244/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2245 2242
2246typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2247 2244
2248void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2249{ 2246{
2250 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2251 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255 int i; 2252 int i;
2256 2253
2257 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2258 2255
2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260 2257
2261 /* for convenience */ 2258 /* for convenience */
2262 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2476 * Do transparency updates if required 2473 * Do transparency updates if required
2477 */ 2474 */
2478int 2475int
2479rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2480{ 2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_aprents_ev.stop();
2480 check_our_aprents_ev.start(NOW + 1./3.);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2481 int i, pchanged, aformat, have_pixmap, rootdepth; 2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2482 unsigned long nitems, bytes_after; 2489 unsigned long nitems, bytes_after;
2483 Atom atype; 2490 Atom atype;
2484 unsigned char *prop = NULL; 2491 unsigned char *prop = NULL;
2485 Window root, oldp, *list; 2492 Window root, oldp, *list;
2486 Pixmap rootpixmap = None; 2493 Pixmap rootpixmap = None;
2487 XWindowAttributes wattr, wrootattr; 2494 XWindowAttributes wattr, wrootattr;
2488 dDisp; 2495 int sx, sy;
2496 Window cr;
2489 2497
2490 pchanged = 0; 2498 pchanged = 0;
2491 2499
2492 if (!OPTION (Opt_transparent)) 2500 if (!option (Opt_transparent))
2493 return pchanged; /* Don't try any more */ 2501 return /*pchanged*/; /* Don't try any more */
2494 2502
2495 XGetWindowAttributes (disp, display->root, &wrootattr); 2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2496 rootdepth = wrootattr.depth; 2504 rootdepth = wrootattr.depth;
2497 2505
2498 XGetWindowAttributes (disp, parent[0], &wattr); 2506 XGetWindowAttributes (dpy, parent[0], &wattr);
2499 2507
2500 if (rootdepth != wattr.depth) 2508 if (rootdepth != wattr.depth)
2501 { 2509 {
2502 if (am_transparent) 2510 if (am_transparent)
2503 { 2511 {
2504 pchanged = 1; 2512 pchanged = 1;
2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2506 am_transparent = am_pixmap_trans = 0; 2514 am_transparent = am_pixmap_trans = 0;
2507 } 2515 }
2508 2516
2509 return pchanged; /* Don't try any more */ 2517 return /*pchanged*/; /* Don't try any more */
2510 } 2518 }
2511 2519
2512 /* Get all X ops out of the queue so that our information is up-to-date. */ 2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2513 XSync (disp, False); 2521 XSync (dpy, False);
2514 2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2515 /* 2530 /*
2516 * Make the frame window set by the window manager have 2531 * Make the frame window set by the window manager have
2517 * the root background. Some window managers put multiple nested frame 2532 * the root background. Some window managers put multiple nested frame
2518 * windows for each client, so we have to take care about that. 2533 * windows for each client, so we have to take care about that.
2519 */ 2534 */
2520 i = (xa[XA_XROOTPMAP_ID] 2535 i = (xa[XA_XROOTPMAP_ID]
2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523 &nitems, &bytes_after, &prop) == Success); 2538 &nitems, &bytes_after, &prop) == Success);
2524 2539
2525 if (!i || prop == NULL) 2540 if (!i || prop == NULL)
2526 i = (xa[XA_ESETROOT_PMAP_ID] 2541 i = (xa[XA_ESETROOT_PMAP_ID]
2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529 &nitems, &bytes_after, &prop) == Success); 2544 &nitems, &bytes_after, &prop) == Success);
2530 2545
2531 if (!i || prop == NULL 2546 if (!i || prop == NULL
2532#if TINTING 2547#if TINTING
2533 || !rs[Rs_color + Color_tint] 2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2534#endif 2553#endif
2535 ) 2554 )
2536 have_pixmap = 0; 2555 have_pixmap = 0;
2537 else 2556 else
2538 { 2557 {
… …
2541 XFree (prop); 2560 XFree (prop);
2542 } 2561 }
2543 2562
2544 if (have_pixmap) 2563 if (have_pixmap)
2545 { 2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2546 /* 2687 /*
2547 * Copy display->root pixmap transparency 2688 * Copy display->root pixmap transparency
2548 */ 2689 */
2549 int sx, sy, nx, ny; 2690 int nx, ny;
2550 unsigned int nw, nh; 2691 unsigned int nw, nh;
2551 Window cr;
2552 XImage *image; 2692 XImage *image;
2553 GC gc;
2554 XGCValues gcvalue;
2555 2693
2556 XTranslateCoordinates (disp, parent[0], display->root,
2557 0, 0, &sx, &sy, &cr);
2558 nw = (unsigned int)szHint.width; 2694 nw = (unsigned int)szHint.width;
2559 nh = (unsigned int)szHint.height; 2695 nh = (unsigned int)szHint.height;
2560 nx = ny = 0; 2696 nx = ny = 0;
2561 2697
2562 if (sx < 0) 2698 if (sx < 0)
2563 { 2699 {
2564 nw += sx; 2700 nw += sx;
2565 nx = -sx; 2701 nx = -sx;
2566 sx = 0; 2702 sx = 0;
2567 } 2703 }
2568 2704
2569 if (sy < 0) 2705 if (sy < 0)
2570 { 2706 {
2571 nh += sy; 2707 nh += sy;
2572 ny = -sy; 2708 ny = -sy;
2573 sy = 0; 2709 sy = 0;
2574 } 2710 }
2575 2711
2576 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2577 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578 2714
2579 XSync (disp, False); 2715 XSync (dpy, False);
2580 allowedxerror = -1; 2716 allowedxerror = -1;
2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582 2718
2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2584 /* XXX: may need a delay here? */ 2720 /* XXX: may need a delay here? */
2585 allowedxerror = 0; 2721 allowedxerror = 0;
2586
2587 if (image == NULL) 2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2588 { 2751 {
2589 if (am_transparent && am_pixmap_trans) 2752 if (am_transparent && am_pixmap_trans)
2590 { 2753 {
2591 pchanged = 1; 2754 pchanged = 1;
2592 if (pixmap != None) 2755 if (pixmap != None)
2593 { 2756 {
2594 XFreePixmap (disp, pixmap); 2757 XFreePixmap (dpy, pixmap);
2595 pixmap = None; 2758 pixmap = None;
2596 } 2759 }
2597 } 2760 }
2598 2761
2599 am_pixmap_trans = 0; 2762 am_pixmap_trans = 0;
2600 } 2763 }
2601 else 2764 else
2602 { 2765 {
2603 if (pixmap != None)
2604 XFreePixmap (disp, pixmap);
2605
2606#if TINTING
2607 if (ISSET_PIXCOLOR (Color_tint))
2608 {
2609 unsigned short rm, gm, bm;
2610 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611
2612 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2613
2614 ShadeXImage (display, image, shade, rm, gm, bm);
2615 }
2616#endif
2617
2618 pixmap = XCreatePixmap (disp, vt,
2619 szHint.width, szHint.height, image->depth);
2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2621 XPutImage (disp, pixmap, gc, image, 0, 0,
2622 nx, ny, image->width, image->height);
2623 XFreeGC (disp, gc);
2624 XDestroyImage (image);
2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2626 XClearWindow (disp, parent[0]); 2767 XClearWindow (dpy, parent[0]);
2627 2768
2628 if (!am_transparent || !am_pixmap_trans) 2769 if (!am_transparent || !am_pixmap_trans)
2629 pchanged = 1; 2770 pchanged = 1;
2630 2771
2631 am_transparent = am_pixmap_trans = 1; 2772 am_transparent = am_pixmap_trans = 1;
2632 } 2773 }
2633 } 2774 }
2634 2775
2635 if (am_pixmap_trans) 2776 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2637 else 2778 else
2638 { 2779 {
2639 unsigned int n; 2780 unsigned int n;
2640 /* 2781 /*
2641 * InheritPixmap transparency 2782 * InheritPixmap transparency
2642 */ 2783 */
2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 { 2785 {
2645 oldp = parent[i]; 2786 oldp = parent[i];
2646 XQueryTree (disp, parent[i - 1], &root, 2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2647 &parent[i], &list, &n);
2648 XFree (list); 2788 XFree (list);
2649 2789
2650 if (parent[i] == display->root) 2790 if (parent[i] == display->root)
2651 { 2791 {
2652 if (oldp != None) 2792 if (oldp != None)
… …
2660 } 2800 }
2661 2801
2662 n = 0; 2802 n = 0;
2663 2803
2664 if (pchanged) 2804 if (pchanged)
2665 {
2666 for (; n < (unsigned int)i; n++) 2805 for (; n < (unsigned int)i; n++)
2667 { 2806 {
2668 XGetWindowAttributes (disp, parent[n], &wattr); 2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2808
2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670 { 2810 {
2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672 break; 2812 break;
2673 } 2813 }
2674 } 2814 }
2675 }
2676 2815
2677 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2678 { 2817 {
2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2681 am_transparent = 0; 2820 am_transparent = 0;
2682 /* XXX: also turn off Opt_transparent? */ 2821 /* XXX: also turn off Opt_transparent? */
2683 } 2822 }
2684 else 2823 else
2685 { 2824 {
2686#if WAIT_FOR_WM
2687 /* wait (an arbitrary period) for the WM to do its thing
2688 * needed for fvwm2.2.2 (and before?) */
2689 sleep (1);
2690#endif
2691 for (n = 0; n < (unsigned int)i; n++) 2825 for (n = 0; n < (unsigned int)i; n++)
2692 { 2826 {
2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2694 XClearWindow (disp, parent[n]); 2828 XClearWindow (dpy, parent[n]);
2695 } 2829 }
2696 2830
2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2698 am_transparent = 1; 2832 am_transparent = 1;
2699 } 2833 }
2700 2834
2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702 parent[i] = None; 2836 parent[i] = None;
2703 } 2837 }
2704 2838
2705 if (scrollBar.win) 2839 if (scrollBar.win)
2706 { 2840 {
2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2708 scrollBar.setIdle (); 2842 scrollBar.setIdle ();
2709 scrollbar_show (0); 2843 scrollbar_show (0);
2710 } 2844 }
2711 2845
2712 if (am_transparent) 2846 if (am_transparent)
… …
2714 want_refresh = want_full_refresh = 1; 2848 want_refresh = want_full_refresh = 1;
2715 if (am_pixmap_trans) 2849 if (am_pixmap_trans)
2716 flush (); 2850 flush ();
2717 } 2851 }
2718 2852
2719 return pchanged; 2853// return pchanged;
2720} 2854}
2721#endif 2855#endif
2722 2856
2723/*}}} */ 2857/*}}} */
2724 2858
… …
2775 if (ch == C0_LF) 2909 if (ch == C0_LF)
2776 nlines++; 2910 nlines++;
2777 2911
2778 refresh_count++; 2912 refresh_count++;
2779 2913
2780 if (!OPTION (Opt_jumpScroll) 2914 if (!option (Opt_jumpScroll)
2781 || (refresh_count >= refresh_limit * (nrow - 1))) 2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2782 { 2916 {
2783 refreshnow = true; 2917 refreshnow = true;
2784 refresh_count = 0; 2918 refresh_count = 0;
2785 ch = NOCHAR; 2919 ch = NOCHAR;
… …
2787 } 2921 }
2788 2922
2789 // scr_add_lines only works for nlines <= nrow - 1. 2923 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2924 if (nlines >= nrow - 1)
2791 { 2925 {
2926 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2927 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2928 scr_add_lines (buf, str - buf, nlines);
2794 2929
2795 nlines = 0; 2930 nlines = 0;
2796 str = buf; 2931 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2932 eol = str + min (ncol, UBUFSIZ);
… …
2812 2947
2813 seq_begin = cmdbuf_ptr; 2948 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2949 ch = next_char ();
2815 } 2950 }
2816 2951
2952 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2953 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818 scr_add_lines (buf, str - buf, nlines); 2954 scr_add_lines (buf, str - buf, nlines);
2819 2955
2820 /* 2956 /*
2821 * If there have been a lot of new lines, then update the screen 2957 * If there have been a lot of new lines, then update the screen
2822 * What the heck I'll cheat and only refresh less than every page-full. 2958 * What the heck I'll cheat and only refresh less than every page-full.
2823 * the number of pages between refreshes is refresh_limit, which 2959 * the number of pages between refreshes is refresh_limit, which
2824 * is incremented here because we must be doing flat-out scrolling. 2960 * is incremented here because we must be doing flat-out scrolling.
2825 */ 2961 */
2826 if (refreshnow) 2962 if (refreshnow)
2827 { 2963 {
2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829 refresh_limit++; 2965 refresh_limit++;
2830 else 2966 else
2831 { 2967 {
2832 flag = true; 2968 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2833 scr_refresh (refresh_type); 2970 scr_refresh ();
2834 flush_ev.stop (); 2971 want_refresh = 1;
2835 } 2972 }
2836 } 2973 }
2837 2974
2838 } 2975 }
2839 else 2976 else
… …
2856 return flag; 2993 return flag;
2857} 2994}
2858 2995
2859// read the next character 2996// read the next character
2860wchar_t 2997wchar_t
2861rxvt_term::next_char () 2998rxvt_term::next_char () NOTHROW
2862{ 2999{
2863 while (cmdbuf_ptr < cmdbuf_endp) 3000 while (cmdbuf_ptr < cmdbuf_endp)
2864 { 3001 {
2865 // assume 7-bit to be ascii ALWAYS 3002 // assume 7-bit to be ascii ALWAYS
2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3003 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2887 return NOCHAR; 3024 return NOCHAR;
2888} 3025}
2889 3026
2890// read the next octet 3027// read the next octet
2891uint32_t 3028uint32_t
2892rxvt_term::next_octet () 3029rxvt_term::next_octet () NOTHROW
2893{ 3030{
2894 return cmdbuf_ptr < cmdbuf_endp 3031 return cmdbuf_ptr < cmdbuf_endp
2895 ? (unsigned char)*cmdbuf_ptr++ 3032 ? (unsigned char)*cmdbuf_ptr++
2896 : NOCHAR; 3033 : NOCHAR;
2897} 3034}
3035
3036static class out_of_input out_of_input;
2898 3037
2899/* rxvt_cmd_getc () - Return next input character */ 3038/* rxvt_cmd_getc () - Return next input character */
2900/* 3039/*
2901 * Return the next input character after first passing any keyboard input 3040 * Return the next input character after first passing any keyboard input
2902 * to the command. 3041 * to the command.
2903 */ 3042 */
2904wchar_t 3043wchar_t
2905rxvt_term::cmd_getc () 3044rxvt_term::cmd_getc () THROW ((class out_of_input))
2906{ 3045{
2907 wchar_t c = next_char (); 3046 wchar_t c = next_char ();
2908 3047
2909 if (c == NOCHAR) 3048 if (c == NOCHAR)
2910 throw out_of_input; 3049 throw out_of_input;
2911 3050
2912 return c; 3051 return c;
2913} 3052}
2914 3053
2915uint32_t 3054uint32_t
2916rxvt_term::cmd_get8 () 3055rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917{ 3056{
2918 uint32_t c = next_octet (); 3057 uint32_t c = next_octet ();
2919 3058
2920 if (c == NOCHAR) 3059 if (c == NOCHAR)
2921 throw out_of_input; 3060 throw out_of_input;
… …
3159 scr_charset_set (2, (unsigned int)cmd_getc ()); 3298 scr_charset_set (2, (unsigned int)cmd_getc ());
3160 break; 3299 break;
3161 case '+': 3300 case '+':
3162 scr_charset_set (3, (unsigned int)cmd_getc ()); 3301 scr_charset_set (3, (unsigned int)cmd_getc ());
3163 break; 3302 break;
3164#if ENABLE_FRILLS 3303#if !ENABLE_MINIMAL
3165 case '6': 3304 case '6':
3166 scr_backindex (); 3305 scr_backindex ();
3167 break; 3306 break;
3168#endif 3307#endif
3169 case '7': 3308 case '7':
3170 scr_cursor (SAVE); 3309 scr_cursor (SAVE);
3171 break; 3310 break;
3172 case '8': 3311 case '8':
3173 scr_cursor (RESTORE); 3312 scr_cursor (RESTORE);
3174 break; 3313 break;
3175#if ENABLE_FRILLS 3314#if !ENABLE_MINIMAL
3176 case '9': 3315 case '9':
3177 scr_forwardindex (); 3316 scr_forwardindex ();
3178 break; 3317 break;
3179#endif 3318#endif
3180 case '=': 3319 case '=':
… …
3342 ndef = get_byte_array_bit (csi_defaults, i); 3481 ndef = get_byte_array_bit (csi_defaults, i);
3343 for (p = 0; p < nargs; p++) 3482 for (p = 0; p < nargs; p++)
3344 if (arg[p] == -1) 3483 if (arg[p] == -1)
3345 arg[p] = ndef; 3484 arg[p] = ndef;
3346 3485
3347#ifdef DEBUG_CMD
3348 fprintf (stderr, "CSI ");
3349 for (p = 0; p < nargs; p++)
3350 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351 fprintf (stderr, "%c\n", ch);
3352#endif
3353
3354 /* 3486 /*
3355 * private mode handling 3487 * private mode handling
3356 */ 3488 */
3357 if (priv) 3489 if (priv)
3358 { 3490 {
3359 switch (priv) 3491 switch (priv)
3360 { 3492 {
3361 case '>': 3493 case '>':
3362 if (ch == CSI_DA) /* secondary device attributes */ 3494 if (ch == CSI_DA) /* secondary device attributes */
3363 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3495 {
3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3498 //
3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3501 // that we do not support xterm mouse reporting (should be 95 when we do).
3502 //
3503 tt_printf ("\033[>%d;94;0c", 'U');
3504 }
3364 break; 3505 break;
3365 case '?': 3506 case '?':
3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367 process_terminal_mode (ch, priv, nargs, arg); 3508 process_terminal_mode (ch, priv, nargs, arg);
3368 break; 3509 break;
… …
3494 break; 3635 break;
3495 case 6: /* CPR requested */ 3636 case 6: /* CPR requested */
3496 scr_report_position (); 3637 scr_report_position ();
3497 break; 3638 break;
3498 case 7: /* unofficial extension */ 3639 case 7: /* unofficial extension */
3499 if (OPTION (Opt_insecure)) 3640 if (option (Opt_insecure))
3500 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3641 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3501 break; 3642 break;
3502 case 8: /* unofficial extension */ 3643 case 8: /* unofficial extension */
3503 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3644 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3504 break; 3645 break;
… …
3571 break; 3712 break;
3572 case CSI_75: 3713 case CSI_75:
3573 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
3574 break; 3715 break;
3575 3716
3576#if ENABLE_FRILLS 3717#if !ENABLE_MINIMAL
3577 case CSI_74: 3718 case CSI_74:
3578 process_window_ops (arg, nargs); 3719 process_window_ops (arg, nargs);
3579 break; 3720 break;
3580#endif 3721#endif
3581 3722
… …
3588 break; 3729 break;
3589 } 3730 }
3590} 3731}
3591/*}}} */ 3732/*}}} */
3592 3733
3593#if ENABLE_FRILLS 3734#if !ENABLE_MINIMAL
3594/* ARGSUSED */ 3735/* ARGSUSED */
3595void 3736void
3596rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3737rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597{ 3738{
3598 int x, y; 3739 int x, y;
3599 XWindowAttributes wattr; 3740 XWindowAttributes wattr;
3600 Window wdummy; 3741 Window wdummy;
3601 dDisp; 3742
3743 dLocal (Display *, dpy);
3602 3744
3603 if (nargs == 0) 3745 if (nargs == 0)
3604 return; 3746 return;
3605 3747
3606 switch (args[0]) 3748 switch (args[0])
3607 { 3749 {
3608 /* 3750 /*
3609 * commands 3751 * commands
3610 */ 3752 */
3611 case 1: /* deiconify window */ 3753 case 1: /* deiconify window */
3612 XMapWindow (disp, parent[0]); 3754 XMapWindow (dpy, parent[0]);
3613 break; 3755 break;
3614 case 2: /* iconify window */ 3756 case 2: /* iconify window */
3615 XIconifyWindow (disp, parent[0], display->screen); 3757 XIconifyWindow (dpy, parent[0], display->screen);
3616 break; 3758 break;
3617 case 3: /* set position (pixels) */ 3759 case 3: /* set position (pixels) */
3618 XMoveWindow (disp, parent[0], args[1], args[2]); 3760 XMoveWindow (dpy, parent[0], args[1], args[2]);
3619 break; 3761 break;
3620 case 4: /* set size (pixels) */ 3762 case 4: /* set size (pixels) */
3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3763 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622 break; 3764 break;
3623 case 5: /* raise window */ 3765 case 5: /* raise window */
3624 XRaiseWindow (disp, parent[0]); 3766 XRaiseWindow (dpy, parent[0]);
3625 break; 3767 break;
3626 case 6: /* lower window */ 3768 case 6: /* lower window */
3627 XLowerWindow (disp, parent[0]); 3769 XLowerWindow (dpy, parent[0]);
3628 break; 3770 break;
3629 case 7: /* refresh window */ 3771 case 7: /* refresh window */
3630 scr_touch (true); 3772 scr_touch (true);
3631 break; 3773 break;
3632 case 8: /* set size (chars) */ 3774 case 8: /* set size (chars) */
… …
3639 if (args[0] >= 24) /* set height (chars) */ 3781 if (args[0] >= 24) /* set height (chars) */
3640 set_widthheight ((unsigned int)width, 3782 set_widthheight ((unsigned int)width,
3641 (unsigned int) (args[1] * fheight)); 3783 (unsigned int) (args[1] * fheight));
3642 break; 3784 break;
3643 3785
3644
3645 /* 3786 /*
3646 * reports - some output format copied from XTerm 3787 * reports - some output format copied from XTerm
3647 */ 3788 */
3648 case 11: /* report window state */ 3789 case 11: /* report window state */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3790 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3791 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651 break; 3792 break;
3652 case 13: /* report window position */ 3793 case 13: /* report window position */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3794 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 XTranslateCoordinates (disp, parent[0], wattr.root, 3795 XTranslateCoordinates (dpy, parent[0], wattr.root,
3655 -wattr.border_width, -wattr.border_width, 3796 -wattr.border_width, -wattr.border_width,
3656 &x, &y, &wdummy); 3797 &x, &y, &wdummy);
3657 tt_printf ("\033[3;%d;%dt", x, y); 3798 tt_printf ("\033[3;%d;%dt", x, y);
3658 break; 3799 break;
3659 case 14: /* report window size (pixels) */ 3800 case 14: /* report window size (pixels) */
3660 XGetWindowAttributes (disp, parent[0], &wattr); 3801 XGetWindowAttributes (dpy, parent[0], &wattr);
3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3802 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662 break; 3803 break;
3663 case 18: /* report text area size (chars) */ 3804 case 18: /* report text area size (chars) */
3664 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3805 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665 break; 3806 break;
… …
3667 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3808 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668 break; 3809 break;
3669 case 20: /* report icon label */ 3810 case 20: /* report icon label */
3670 { 3811 {
3671 char *s; 3812 char *s;
3672 XGetIconName (disp, parent[0], &s); 3813 XGetIconName (dpy, parent[0], &s);
3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3814 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674 XFree (s); 3815 XFree (s);
3675 } 3816 }
3676 break; 3817 break;
3677 case 21: /* report window title */ 3818 case 21: /* report window title */
3678 { 3819 {
3679 char *s; 3820 char *s;
3680 XFetchName (disp, parent[0], &s); 3821 XFetchName (dpy, parent[0], &s);
3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3822 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682 XFree (s); 3823 XFree (s);
3683 } 3824 }
3684 break; 3825 break;
3685 } 3826 }
3686} 3827}
… …
3713 seen_esc = true; 3854 seen_esc = true;
3714 continue; 3855 continue;
3715 } 3856 }
3716 else if (ch == C0_BEL || ch == CHAR_ST) 3857 else if (ch == C0_BEL || ch == CHAR_ST)
3717 break; 3858 break;
3859 else if (ch == C0_SYN)
3860 ch = cmd_get8 ();
3718 else if (ch < 0x20) 3861 else if (ch < 0x20)
3719 return NULL; /* other control character - exit */ 3862 return NULL; /* other control character - exit */
3720 3863
3721 seen_esc = false; 3864 seen_esc = false;
3722 3865
3723 if (n >= STRING_MAX - 1) 3866 if (n >= STRING_MAX - 1)
3724 // stop at some sane length 3867 // stop at some sane length
3725 return NULL; 3868 return NULL;
3726 3869
3727 if (ch == C0_SYN)
3728 string[n++] = cmd_get8 ();
3729 else
3730 string[n++] = ch; 3870 string[n++] = ch;
3731 } 3871 }
3732 3872
3733 string[n++] = '\0'; 3873 string[n++] = '\0';
3734 3874
3735 ends_how = (ch == 0x5c ? C0_ESC : ch); 3875 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3786void 3926void
3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3927rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788{ 3928{
3789 if (str[0] == '?' && !str[1]) 3929 if (str[0] == '?' && !str[1])
3790 { 3930 {
3791 unsigned short r, g, b; 3931 rgba c;
3792 pix_colors_focused[color].get (display, r, g, b); 3932 pix_colors_focused[color].get (c);
3933
3934#if XFT
3935 if (c.a != rgba::MAX_CC)
3936 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3937 else
3938#endif
3793 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3939 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3794 } 3940 }
3795 else 3941 else
3796 set_window_color (color, str); 3942 set_window_color (color, str);
3797} 3943}
3798 3944
… …
3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3946 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801 */ 3947 */
3802void 3948void
3803rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3949rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804{ 3950{
3805 int changed = 0;
3806 int color; 3951 int color;
3807 char *buf, *name; 3952 char *buf, *name;
3808 bool query = str[0] == '?' && !str[1]; 3953 bool query = str[0] == '?' && !str[1];
3809 int saveop = op; 3954 int saveop = op;
3810 dDisp; 3955
3956 dLocal (Display *, dpy);
3811 3957
3812 assert (str != NULL); 3958 assert (str != NULL);
3959
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return;
3962
3813 switch (op) 3963 switch (op)
3814 { 3964 {
3815 case XTerm_name: 3965 case XTerm_name:
3816 set_title (str); 3966 set_title (str);
3817 /* FALLTHROUGH */ 3967 /* FALLTHROUGH */
… …
3831 unsigned long bytes_after; 3981 unsigned long bytes_after;
3832 unsigned char *value = 0; 3982 unsigned char *value = 0;
3833 const char *str = ""; 3983 const char *str = "";
3834 3984
3835 if (prop 3985 if (prop
3836 && XGetWindowProperty (disp, parent[0], 3986 && XGetWindowProperty (dpy, parent[0],
3837 prop, 0, 1<<16, 0, AnyPropertyType, 3987 prop, 0, 1<<16, 0, AnyPropertyType,
3838 &actual_type, &actual_format, 3988 &actual_type, &actual_format,
3839 &nitems, &bytes_after, &value) == Success 3989 &nitems, &bytes_after, &value) == Success
3840 && actual_type != None 3990 && actual_type != None
3841 && actual_format == 8) 3991 && actual_format == 8)
3842 str = (const char *)(value); 3992 str = (const char *)(value);
3843 3993
3844 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3994 tt_printf ("\033]%d;%s%c", op, str, resp);
3845 3995
3846 XFree (value); 3996 XFree (value);
3847 } 3997 }
3848 else 3998 else
3849 { 3999 {
… …
3853 { 4003 {
3854 *eq = 0; 4004 *eq = 0;
3855 set_utf8_property (display->atom (str), eq + 1); 4005 set_utf8_property (display->atom (str), eq + 1);
3856 } 4006 }
3857 else 4007 else
3858 XDeleteProperty (disp, parent[0], 4008 XDeleteProperty (dpy, parent[0],
3859 display->atom (str)); 4009 display->atom (str));
3860 } 4010 }
3861 break; 4011 break;
3862 4012
3863 case XTerm_Color: 4013 case XTerm_Color:
… …
3865 { 4015 {
3866 if ((name = strchr (buf, ';')) == NULL) 4016 if ((name = strchr (buf, ';')) == NULL)
3867 break; 4017 break;
3868 4018
3869 *name++ = '\0'; 4019 *name++ = '\0';
3870 color = atoi (buf); 4020 color = atoi (buf) + minCOLOR;
3871 4021
3872 if (color < 0 || color >= TOTAL_COLORS) 4022 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873 break; 4023 break;
3874 4024
3875 if ((buf = strchr (name, ';')) != NULL) 4025 if ((buf = strchr (name, ';')) != NULL)
3876 *buf++ = '\0'; 4026 *buf++ = '\0';
3877 4027
3878 if (name[0] == '?' && !name[1]) 4028 process_color_seq (op, color, name, resp);
3879 {
3880 unsigned short r, g, b;
3881 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883 }
3884 else
3885 set_window_color (color + minCOLOR, name);
3886 } 4029 }
3887 break; 4030 break;
3888 case XTerm_Color00: 4031 case XTerm_Color00:
3889 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4032 process_color_seq (op, Color_fg, str, resp);
3890 break; 4033 break;
3891 case XTerm_Color01: 4034 case XTerm_Color01:
3892 process_color_seq (XTerm_Color00, Color_bg, str, resp); 4035 process_color_seq (op, Color_bg, str, resp);
3893 break; 4036 break;
3894#ifndef NO_CURSORCOLOR 4037#ifndef NO_CURSORCOLOR
3895 case XTerm_Color_cursor: 4038 case XTerm_Color_cursor:
3896 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4039 process_color_seq (op, Color_cursor, str, resp);
3897 break; 4040 break;
3898#endif 4041#endif
3899 case XTerm_Color_pointer_fg: 4042 case XTerm_Color_pointer_fg:
3900 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4043 process_color_seq (op, Color_pointer_fg, str, resp);
3901 break; 4044 break;
3902 case XTerm_Color_pointer_bg: 4045 case XTerm_Color_pointer_bg:
3903 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4046 process_color_seq (op, Color_pointer_bg, str, resp);
3904 break; 4047 break;
3905#ifndef NO_BOLD_UNDERLINE_REVERSE 4048#ifndef NO_BOLD_UNDERLINE_REVERSE
3906 case XTerm_Color_BD:
3907 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908 break;
3909 case XTerm_Color_UL:
3910 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911 break;
3912 case XTerm_Color_RV: 4049 case XTerm_Color_RV:
3913 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4050 process_color_seq (op, Color_RV, str, resp);
4051 break;
4052 case Rxvt_Color_BD:
4053 case URxvt_Color_BD:
4054 process_color_seq (op, Color_BD, str, resp);
4055 break;
4056 case Rxvt_Color_UL:
4057 case URxvt_Color_UL:
4058 process_color_seq (op, Color_UL, str, resp);
3914 break; 4059 break;
3915 case URxvt_Color_IT: 4060 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4061 process_color_seq (op, Color_IT, str, resp);
3917 break; 4062 break;
3918#endif 4063#endif
3919#if TRANSPARENT && TINTING 4064#if TRANSPARENT && TINTING
3920 case URxvt_Color_tint: 4065 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4066 process_color_seq (op, Color_tint, str, resp);
4067
3922 check_our_parents (); 4068 check_our_parents ();
4069
3923 if (am_transparent) 4070 if (am_transparent)
3924 want_full_refresh = want_refresh = 1; 4071 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927 4072
4073 break;
4074#endif
4075
3928 case XTerm_Pixmap: 4076 case Rxvt_Pixmap:
4077 {
3929 if (*str != ';') 4078 if (*str != ';')
3930 { 4079 {
3931#if XPM_BACKGROUND 4080#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */ 4081 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */ 4082 set_bgPixmap (str); /* change pixmap */
3934#endif
3935 scr_touch (true); 4083 scr_touch (true);
4084#endif
3936 } 4085 }
4086
4087 int changed = 0;
4088
3937 while ((str = strchr (str, ';')) != NULL) 4089 while ((str = strchr (str, ';')) != NULL)
3938 { 4090 {
3939 str++; 4091 str++;
3940#if XPM_BACKGROUND 4092#if XPM_BACKGROUND
3941 changed += scale_pixmap (str); 4093 changed += scale_pixmap (str);
3942#endif 4094#endif
3943 } 4095 }
3944 4096
3945 if (changed) 4097 if (changed)
3946 { 4098 {
3947#ifdef XPM_BACKGROUND 4099#ifdef XPM_BACKGROUND
3948 resize_pixmap (); 4100 resize_pixmap ();
3949#endif
3950 scr_touch (true); 4101 scr_touch (true);
4102#endif
3951 } 4103 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif
4108
4109 }
3952 break; 4110 break;
3953 4111
3954 case XTerm_restoreFG: 4112 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 4113 set_window_color (Color_fg, str);
3956 break; 4114 break;
3957 case XTerm_restoreBG: 4115 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str); 4116 set_window_color (Color_bg, str);
3959 break; 4117 break;
3960 4118
3961 case XTerm_logfile: 4119 case XTerm_logfile:
3962 // TODO, when secure mode? 4120 // TODO, when secure mode?
3963 break; 4121 break;
3964 4122
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 4123#if 0
3972 case XTerm_dumpscreen: /* no error notices */ 4124 case Rxvt_dumpscreen: /* no error notices */
3973 { 4125 {
3974 int fd; 4126 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4127 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976 { 4128 {
3977 scr_dump (fd); 4129 scr_dump (fd);
… …
3988 case URxvt_italicFont: 4140 case URxvt_italicFont:
3989 case URxvt_boldItalicFont: 4141 case URxvt_boldItalicFont:
3990#endif 4142#endif
3991 if (query) 4143 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop, 4144 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4145 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "", 4146 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp); 4147 resp);
3996 else 4148 else
3997 { 4149 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4150 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4001 allocated.push_back ((void *)res); 4153 allocated.push_back ((void *)res);
4002 set_fonts (); 4154 set_fonts ();
4003 } 4155 }
4004 break; 4156 break;
4005 4157
4006#if ENABLE_FRILLS 4158 case URxvt_version:
4159 if (query)
4160 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4161 op,
4162 rs[Rs_name], VERSION[0], VERSION[2],
4163 resp);
4164 break;
4165
4166#if !ENABLE_MINIMAL
4007 case URxvt_locale: 4167 case URxvt_locale:
4008 if (query) 4168 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4169 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4010 else 4170 else
4011 { 4171 {
4012 set_locale (str); 4172 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 4173 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 4174 init_xlocale ();
4015 } 4175 }
4016 break; 4176 break;
4017 4177
4018 case URxvt_view_up: 4178 case URxvt_view_up:
… …
4029 break; 4189 break;
4030#endif 4190#endif
4031 4191
4032#if ENABLE_PERL 4192#if ENABLE_PERL
4033 case URxvt_perl: 4193 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4194 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4035 ; // no responses yet 4195 ; // no responses yet
4036 break; 4196 break;
4037#endif 4197#endif
4038 } 4198 }
4039} 4199}
… …
4071 return state; 4231 return state;
4072} 4232}
4073 4233
4074/* we're not using priv _yet_ */ 4234/* we're not using priv _yet_ */
4075void 4235void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4236rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 4237{
4078 unsigned int i, j; 4238 unsigned int i, j;
4079 int state; 4239 int state;
4080 4240
4081 static const struct 4241 static const struct
… …
4092 { 5, PrivMode_rVideo }, 4252 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 4253 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 4254 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 4255 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 4256 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 4257 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 4258 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 4259#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 4260 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 4261#endif
… …
4151 /* extra handling for values with state unkept */ 4308 /* extra handling for values with state unkept */
4152 switch (arg[i]) 4309 switch (arg[i])
4153 { 4310 {
4154#if ENABLE_STYLES 4311#if ENABLE_STYLES
4155 case 1021: 4312 case 1021:
4156 if (mode) 4313 set_option (Opt_intensityStyles, mode);
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160 4314
4161 scr_touch (true); 4315 scr_touch (true);
4162 break; 4316 break;
4163#endif 4317#endif
4164 case 1048: /* alternative cursor save */ 4318 case 1048: /* alternative cursor save */
4165 case 1049: 4319 case 1049:
4166 if (OPTION (Opt_secondaryScreen)) 4320 if (option (Opt_secondaryScreen))
4167 if (mode == 0) 4321 if (mode == 0)
4168 scr_cursor (RESTORE); 4322 scr_cursor (RESTORE);
4169 else if (mode == 1) 4323 else if (mode == 1)
4170 scr_cursor (SAVE); 4324 scr_cursor (SAVE);
4171 break; 4325 break;
… …
4186 case 3: /* 80/132 */ 4340 case 3: /* 80/132 */
4187 if (priv_modes & PrivMode_132OK) 4341 if (priv_modes & PrivMode_132OK)
4188 set_widthheight (((state ? 132 : 80) * fwidth), height); 4342 set_widthheight (((state ? 132 : 80) * fwidth), height);
4189 break; 4343 break;
4190 case 4: /* smooth scrolling */ 4344 case 4: /* smooth scrolling */
4191 if (!state) 4345 set_option (Opt_jumpScroll, !state);
4192 SET_OPTION (Opt_jumpScroll);
4193 else
4194 CLR_OPTION (Opt_jumpScroll);
4195 break; 4346 break;
4196 case 5: /* reverse video */ 4347 case 5: /* reverse video */
4197 scr_rvideo_mode (state); 4348 scr_rvideo_mode (state);
4198 break; 4349 break;
4199 case 6: /* relative/absolute origins */ 4350 case 6: /* relative/absolute origins */
… …
4205 /* case 8: - auto repeat, can't do on a per window basis */ 4356 /* case 8: - auto repeat, can't do on a per window basis */
4206 case 9: /* X10 mouse reporting */ 4357 case 9: /* X10 mouse reporting */
4207 if (state) /* orthogonal */ 4358 if (state) /* orthogonal */
4208 priv_modes &= ~PrivMode_MouseX11; 4359 priv_modes &= ~PrivMode_MouseX11;
4209 break; 4360 break;
4210#ifdef menuBar_esc
4211 case menuBar_esc:
4212#ifdef MENUBAR
4213 map_menuBar (state);
4214#endif
4215 break;
4216#endif
4217#ifdef scrollBar_esc 4361#ifdef scrollBar_esc
4218 case scrollBar_esc: 4362 case scrollBar_esc:
4219 if (scrollbar_mapping (state)) 4363 if (scrollbar_mapping (state))
4220 { 4364 {
4221 resize_all_windows (0, 0, 0); 4365 resize_all_windows (0, 0, 0);
… …
4240#if 0 4384#if 0
4241 case 1001: 4385 case 1001:
4242 break; /* X11 mouse highlighting */ 4386 break; /* X11 mouse highlighting */
4243#endif 4387#endif
4244 case 1010: /* scroll to bottom on TTY output inhibit */ 4388 case 1010: /* scroll to bottom on TTY output inhibit */
4245 if (!state) 4389 set_option (Opt_scrollTtyOutput, !state);
4246 SET_OPTION (Opt_scrollTtyOutput);
4247 else
4248 CLR_OPTION (Opt_scrollTtyOutput);
4249 break; 4390 break;
4250 case 1011: /* scroll to bottom on key press */ 4391 case 1011: /* scroll to bottom on key press */
4251 if (state) 4392 set_option (Opt_scrollTtyKeypress, state);
4252 SET_OPTION (Opt_scrollTtyKeypress);
4253 else
4254 CLR_OPTION (Opt_scrollTtyKeypress);
4255 break; 4393 break;
4256 case 1047: /* secondary screen w/ clearing last */ 4394 case 1047: /* secondary screen w/ clearing last */
4257 if (OPTION (Opt_secondaryScreen)) 4395 if (option (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 4396 if (current_screen != PRIMARY)
4259 scr_erase_screen (2); 4397 scr_erase_screen (2);
4260 scr_change_screen (state); 4398 scr_change_screen (state);
4261 break; 4399 break;
4262 case 1049: /* secondary screen w/ clearing first */ 4400 case 1049: /* secondary screen w/ clearing first */
4263 scr_change_screen (state); 4401 scr_change_screen (state);
4264 if (OPTION (Opt_secondaryScreen)) 4402 if (option (Opt_secondaryScreen))
4265 if (current_screen != PRIMARY) 4403 if (current_screen != PRIMARY)
4266 scr_erase_screen (2); 4404 scr_erase_screen (2);
4267 break; 4405 break;
4268 default: 4406 default:
4269 break; 4407 break;
… …
4397 scr_color (Color_bg, Color_bg); 4535 scr_color (Color_bg, Color_bg);
4398 break; 4536 break;
4399 4537
4400 //case 50: // not variable spacing 4538 //case 50: // not variable spacing
4401 4539
4402#if ENABLE_FRILLS 4540#if !ENABLE_MINIMAL
4403 case 90: 4541 case 90:
4404 case 91: /* set bright fg color */ 4542 case 91: /* set bright fg color */
4405 case 92: 4543 case 92:
4406 case 93: 4544 case 93:
4407 case 94: 4545 case 94:
… …
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4607const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470 4608
4471void 4609void
4472rxvt_term::tt_write (const char *data, unsigned int len) 4610rxvt_term::tt_write (const char *data, unsigned int len)
4473{ 4611{
4474 if (pty.pty < 0) 4612 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475 return; 4613 return;
4476 4614
4615 if (pty->pty < 0)
4616 return;
4617
4477 if (v_buflen == 0) 4618 if (v_buflen == 0)
4478 { 4619 {
4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4620 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480 4621
4481 if ((unsigned int)written == len) 4622 if ((unsigned int)written == len)
4482 return; 4623 return;
4483 4624
4484 data += written; 4625 data += written;
… …
4493 pty_ev.set (EVENT_READ | EVENT_WRITE); 4634 pty_ev.set (EVENT_READ | EVENT_WRITE);
4494} 4635}
4495 4636
4496void rxvt_term::pty_write () 4637void rxvt_term::pty_write ()
4497{ 4638{
4498 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4639 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499 4640
4500 if (written > 0) 4641 if (written > 0)
4501 { 4642 {
4502 v_buflen -= written; 4643 v_buflen -= written;
4503 4644

Diff Legend

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