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.242 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.328 by ayin, Mon Jun 11 17:40:15 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_STRING_LEN, kbuf, len, DT_END))) 884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */
923 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1003unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1005{
930 unsigned int n, s; 1006 unsigned int n, s;
931 1007
… …
972 1048
973 if (want_refresh) 1049 if (want_refresh)
974 { 1050 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1052 {
977 int row = -view_start; 1053 int row = view_start;
1054 int end_row = row + nrow;
978 1055
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1056 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1057 --row;
981 1058
982 while (row < -view_start + nrow) 1059 do
983 { 1060 {
984 int start_row = row; 1061 int start_row = row;
985 line_t *l; 1062 line_t *l;
986 1063
987 do 1064 do
988 { 1065 {
989 l = &ROW (row); 1066 l = &ROW (row++);
990 1067
991 if (!(l->f & LINE_FILTERED)) 1068 if (!(l->f & LINE_FILTERED))
992 { 1069 {
993 // line not filtered, mark it as filtered 1070 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1071 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1072 while (l->is_longer ())
996 { 1073 {
997 l = &ROW (++row); 1074 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1075 l->f |= LINE_FILTERED;
999 } 1076 }
1000 1077
1001 // and filter it 1078 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1080
1004 break; 1081 break;
1005 } 1082 }
1006 } 1083 }
1007 while (l->is_longer ()); 1084 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1085 }
1086 while (row < end_row);
1011 1087 }
1012 }
1013 1088
1014 scr_refresh (refresh_type); 1089 scr_refresh ();
1015 scrollbar_show (1); 1090 scrollbar_show (1);
1016#ifdef USE_XIM 1091#ifdef USE_XIM
1017 IMSendSpot (); 1092 IMSendSpot ();
1018#endif 1093#endif
1019 } 1094 }
… …
1022} 1097}
1023 1098
1024void 1099void
1025rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
1026{ 1101{
1027 SET_R (this); 1102 make_current ();
1028 SET_LOCALE (locale);
1029 1103
1030 display->flush (); 1104 display->flush ();
1031 1105
1032 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1108}
1035 1109
1036void 1110void
1037rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1038{ 1112{
1039 SET_R (this); 1113 make_current ();
1040 SET_LOCALE (locale);
1041 1114
1042 refresh_limit = 1; 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 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1422
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R)
1427 mouse_slip_wheel_speed = 0;
1428#endif
1429 break; 1398 break;
1430 }
1431 1399
1432 case ButtonPress: 1400 case ButtonPress:
1433 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1434 break; 1402 break;
1435 1403
… …
1437 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1438 break; 1406 break;
1439 1407
1440 case ClientMessage: 1408 case ClientMessage:
1441 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 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 {
1444 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)))
1445 destroy (); 1419 destroy ();
1420 }
1446#if ENABLE_EWMH 1421#if ENABLE_EWMH
1447 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])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &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 }
1451#endif 1437#endif
1452 } 1438 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1462#ifdef OFFIX_DND
1463 /* OffiX Dnd (drag 'n' drop) protocol */
1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1465 && (ev.xclient.data.l[0] == DndFile
1466 || ev.xclient.data.l[0] == DndDir
1467 || ev.xclient.data.l[0] == DndLink))
1468 {
1469 /* Get Dnd data */
1470 Atom ActualType;
1471 int ActualFormat;
1472 unsigned char *data;
1473 unsigned long Size, RemainingBytes;
1474
1475 XGetWindowProperty (disp, display->root,
1476 xa[XA_DNDSELECTION],
1477 0L, 1000000L,
1478 False, AnyPropertyType,
1479 &ActualType, &ActualFormat,
1480 &Size, &RemainingBytes,
1481 &data);
1482 set_string_property (XA_CUT_BUFFER0, data);
1483 XFree (data);
1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1486 }
1487#endif /* OFFIX_DND */
1488 break; 1439 break;
1489 1440
1490 case MappingNotify: 1441 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1443 break;
… …
1515 break; 1466 break;
1516 } 1467 }
1517 break; 1468 break;
1518 1469
1519 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1520 focus_in (); 1474 focus_in ();
1521 break; 1475 break;
1522 1476
1523 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1524 focus_out (); 1481 focus_out ();
1525 break; 1482 break;
1526 1483
1527 case ConfigureNotify: 1484 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1529 { 1486 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1488 ;
1532 1489
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1491 {
1535 seen_resize = 1; 1492 seen_resize = 1;
1536 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
1537 } 1501 }
1538 1502
1539#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
1540 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1541 check_our_parents (); 1507 check_our_parents ();
1542#endif 1508#endif
1543 } 1509 }
1544 break; 1510 break;
1545 1511
1546 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1517
1551 break; 1518 break;
1552 1519
1553 case SelectionClear: 1520 case SelectionClear:
1554 selection_clear (); 1521 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1527 break;
1561 1528
1562 case SelectionRequest: 1529 case SelectionRequest:
1563 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));
1564 break; 1539 break;
1565 1540
1566 case UnmapNotify: 1541 case UnmapNotify:
1567 mapped = 0; 1542 mapped = 0;
1568#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1570#endif 1545#endif
1571 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break; 1547 break;
1579 1548
1580#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1581 case ReparentNotify: 1550 case ReparentNotify:
1582 rootwin_cb (ev); 1551 rootwin_cb (ev);
… …
1588 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1589 { 1558 {
1590 do 1559 do
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1594 1563
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1565
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1600 1569
1601 scr_refresh (refresh_type); 1570 want_refresh = 1;
1602 } 1571 }
1603 else 1572 else
1604 { 1573 {
1605 XEvent unused_event; 1574 XEvent unused_event;
1606 1575
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1608 ; 1577 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1579 ;
1611 1580
1612 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1613 { 1582 {
1614 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1615 scrollbar_show (0); 1584 scrollbar_show (0);
1616 } 1585 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1586
1622#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1625#endif 1590#endif
1626 } 1591 }
1627 break; 1592 break;
1628 1593
1629 case MotionNotify: 1594 case MotionNotify:
1630#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1596 if (hidden_pointer)
1632 pointer_unblank (); 1597 pointer_unblank ();
1633#endif 1598#endif
1634#if MENUBAR
1635 if (isMenuBarWindow (ev.xany.window))
1636 {
1637 menubar_control (ev.xbutton);
1638 break;
1639 }
1640#endif
1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1600 break;
1643 1601
1644 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
1645 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1606 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1608 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1651 ; 1610 ;
1652 1611
1653 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1654 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1616 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1722#endif 1681#endif
1723 } 1682 }
1724 } 1683 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1685 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1728 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1729 ; 1688 ;
1730 1689
1731 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1732 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1694 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1696 scrollbar_size ());
1738 scr_refresh (refresh_type); 1697 want_refresh = 1;
1739 refresh_limit = 0; 1698 refresh_limit = 0;
1740 scrollbar_show (1); 1699 scrollbar_show (1);
1741 } 1700 }
1742 break; 1701 break;
1743 } 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
1744} 1730}
1745 1731
1746void 1732void
1747rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1748{ 1734{
1749 if (!focus) 1735 if (!focus)
1750 { 1736 {
1751 focus = 1; 1737 focus = 1;
1752 want_refresh = 1; 1738 want_refresh = 1;
1753 1739
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1755 1741
1756#if USE_XIM 1742#if USE_XIM
1757 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1758 { 1744 {
1759 IMSetStatusPosition (); 1745 IMSetPosition ();
1760 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1761 } 1747 }
1762#endif 1748#endif
1763#if CURSOR_BLINK 1749#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1752#endif
1767#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1769 { 1755 {
1770 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1771 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 }
1772 } 1771 }
1773#endif 1772#endif
1774 } 1773 }
1775} 1774}
1776 1775
… …
1796#if USE_XIM 1795#if USE_XIM
1797 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1798 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1799#endif 1798#endif
1800#if CURSOR_BLINK 1799#if CURSOR_BLINK
1801 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1802 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1803 hidden_cursor = 0; 1802 hidden_cursor = 0;
1804#endif 1803#endif
1805#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1810 } 1809 }
1811#endif 1810#endif
1812 } 1811 }
1813} 1812}
1814 1813
1815#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
1816void 1828void
1817rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1830{
1819 SET_R (this); 1831 make_current ();
1820 SET_LOCALE (locale);
1821 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
1822 switch (ev.type) 1838 switch (ev.type)
1823 { 1839 {
1824 case PropertyNotify: 1840 case PropertyNotify:
1825 /* 1841 /*
1826 * 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,
… …
1830 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1831 return; 1847 return;
1832 1848
1833 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1834 case ReparentNotify: 1850 case ReparentNotify:
1835 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1836 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1837 break; 1853 break;
1838 } 1854 }
1855# endif
1839} 1856}
1840#endif 1857#endif
1841 1858
1842void 1859void
1843rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1852 /* 1869 /*
1853 * VT window processing of button press 1870 * VT window processing of button press
1854 */ 1871 */
1855 if (ev.window == vt) 1872 if (ev.window == vt)
1856 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1857#if ISO_14755 1877#if ISO_14755
1858 // 5.4 1878 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1880 {
1861 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
… …
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1875 { 1895 {
1876 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1877 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1878 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1879 { 1900 {
1880 /* only report double clicks */ 1901 /* only report double clicks */
1881 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1882 mouse_report (ev); 1903 mouse_report (ev);
… …
1902 else 1923 else
1903 { 1924 {
1904 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1906 1927
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1928 switch (ev.button)
1909 { 1929 {
1910 case Button1: 1930 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1931 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1932 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1933#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1934 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1935#else
1916 selection.rect = false; 1936 selection.rect = false;
1917#endif 1937#endif
1918 1938
1919 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1941 {
1922 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1924 else 1944 else
1925 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1926 } 1946 }
1927 else 1947 else
1928 { 1948 {
1929 if (MEvent.button == Button1 && clickintime) 1949 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1950 MEvent.clicks++;
1931 else 1951 else
1932 MEvent.clicks = 1; 1952 MEvent.clicks = 1;
1933 1953
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1954 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1955 }
1936 1956
1937 MEvent.button = Button1; 1957 MEvent.button = Button1;
1938 break; 1958 break;
1939 1959
1940 case Button3: 1960 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1943 else 1963 else
1944 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1945 1965
1946 MEvent.button = Button3; 1966 MEvent.button = Button3;
1947 break; 1967 break;
1948 } 1968 }
1949 } 1969 }
1950 1970
1951 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1952 return; 1972 return;
1953 } 1973 }
1954 1974
… …
2090 } 2110 }
2091 2111
2092 break; 2112 break;
2093 } 2113 }
2094 } 2114 }
2115
2095 return; 2116 return;
2096 } 2117 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2118}
2105 2119
2106void 2120void
2107rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
2108{ 2122{
… …
2114 2128
2115 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
2116 { 2130 {
2117 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
2118 scrollbar_show (0); 2132 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2133 }
2123 2134
2124#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2127#endif 2138#endif
2128 2139
2129 if (ev.window == vt) 2140 if (ev.window == vt)
2130 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2131#if ISO_14755 2145#if ISO_14755
2132 // 5.4 2146 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2148 return;
2135#endif 2149#endif
2150
2136 if (reportmode) 2151 if (reportmode)
2137 { 2152 {
2138 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2164 if (priv_modes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2180 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
2168 2183
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2184 switch (ev.button)
2173 { 2185 {
2174 case Button1: 2186 case Button1:
2175 case Button3: 2187 case Button3:
2176 selection_make (ev.time); 2188 selection_make (ev.time);
2177 break; 2189 break;
2190
2178 case Button2: 2191 case Button2:
2179 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);
2180 break; 2194 break;
2195
2181#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2182 case Button4: 2197 case Button4:
2183 case Button5: 2198 case Button5:
2184 { 2199 {
2185 int i; 2200 int i;
… …
2187 2202
2188 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2189 2204
2190 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2191 i = 1; 2206 i = 1;
2192 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2193 i = nrow - 1; 2208 i = nrow - 1;
2194 else 2209 else
2195 i = 5; 2210 i = 5;
2196 2211
2197# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2207 slip_wheel_ev.start (); 2222 slip_wheel_ev.start ();
2208 } 2223 }
2209 else 2224 else
2210 { 2225 {
2211# endif 2226# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2227 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2228 scrollbar_show (1);
2216# else
2217 while (i--)
2218 {
2219 scr_page (v, 1);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1);
2222 }
2223# endif
2224# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2225 } 2230 }
2226#endif 2231# endif
2227 } 2232 }
2228 break; 2233 break;
2229#endif 2234#endif
2230 } 2235 }
2231 } 2236 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2237}
2237
2238#ifdef TRANSPARENT
2239#if TINTING
2240/* taken from aterm-0.4.2 */
2241
2242typedef uint32_t RUINT32T;
2243
2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2245{
2246 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i;
2252
2253 Visual *visual = display->visual;
2254
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256
2257 /* for convenience */
2258 mask_r = visual->red_mask;
2259 mask_g = visual->green_mask;
2260 mask_b = visual->blue_mask;
2261
2262 /* boring lookup table pre-initialization */
2263 switch (srcImage->bits_per_pixel) {
2264 case 15:
2265 if ((mask_r != 0x7c00) ||
2266 (mask_g != 0x03e0) ||
2267 (mask_b != 0x001f))
2268 return;
2269 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2270 lookup_r = lookup;
2271 lookup_g = lookup+32;
2272 lookup_b = lookup+32+32;
2273 sh_r = 10;
2274 sh_g = 5;
2275 sh_b = 0;
2276 break;
2277 case 16:
2278 if ((mask_r != 0xf800) ||
2279 (mask_g != 0x07e0) ||
2280 (mask_b != 0x001f))
2281 return;
2282 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2283 lookup_r = lookup;
2284 lookup_g = lookup+32;
2285 lookup_b = lookup+32+64;
2286 sh_r = 11;
2287 sh_g = 5;
2288 sh_b = 0;
2289 break;
2290 case 24:
2291 if ((mask_r != 0xff0000) ||
2292 (mask_g != 0x00ff00) ||
2293 (mask_b != 0x0000ff))
2294 return;
2295 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2296 lookup_r = lookup;
2297 lookup_g = lookup+256;
2298 lookup_b = lookup+256+256;
2299 sh_r = 16;
2300 sh_g = 8;
2301 sh_b = 0;
2302 break;
2303 case 32:
2304 if ((mask_r != 0xff0000) ||
2305 (mask_g != 0x00ff00) ||
2306 (mask_b != 0x0000ff))
2307 return;
2308 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2309 lookup_r = lookup;
2310 lookup_g = lookup+256;
2311 lookup_b = lookup+256+256;
2312 sh_r = 16;
2313 sh_g = 8;
2314 sh_b = 0;
2315 break;
2316 default:
2317 return; /* we do not support this color depth */
2318 }
2319
2320 /* prepare limits for color transformation (each channel is handled separately) */
2321 if (shade < 0) {
2322 shade = -shade;
2323 if (shade < 0) shade = 0;
2324 if (shade > 100) shade = 100;
2325
2326 lower_lim_r = 65535-rm;
2327 lower_lim_g = 65535-gm;
2328 lower_lim_b = 65535-bm;
2329
2330 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2331 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2332 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2333
2334 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2335 } else {
2336 if (shade < 0) shade = 0;
2337 if (shade > 100) shade = 100;
2338
2339 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2340
2341 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2342 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2343 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2344 }
2345
2346 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2347 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2348 {
2349 unsigned int tmp;
2350
2351 tmp = lower_lim_r;
2352 lower_lim_r = lower_lim_b;
2353 lower_lim_b = tmp;
2354
2355 tmp = upper_lim_r;
2356 upper_lim_r = upper_lim_b;
2357 upper_lim_b = tmp;
2358 }
2359
2360 /* fill our lookup tables */
2361 for (i = 0; i <= mask_r>>sh_r; i++)
2362 {
2363 RUINT32T tmp;
2364 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2365 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2366 lookup_r[i] = (tmp/65535)<<sh_r;
2367 }
2368 for (i = 0; i <= mask_g>>sh_g; i++)
2369 {
2370 RUINT32T tmp;
2371 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2372 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2373 lookup_g[i] = (tmp/65535)<<sh_g;
2374 }
2375 for (i = 0; i <= mask_b>>sh_b; i++)
2376 {
2377 RUINT32T tmp;
2378 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2379 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2380 lookup_b[i] = (tmp/65535)<<sh_b;
2381 }
2382
2383 /* apply table to input image (replacing colors by newly calculated ones) */
2384 switch (srcImage->bits_per_pixel)
2385 {
2386 case 15:
2387 {
2388 unsigned short *p1, *pf, *p, *pl;
2389 p1 = (unsigned short *) srcImage->data;
2390 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0x7c00)>>10] |
2398 lookup_g[(*p & 0x03e0)>> 5] |
2399 lookup_b[(*p & 0x001f)];
2400 }
2401 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2402 }
2403 break;
2404 }
2405 case 16:
2406 {
2407 unsigned short *p1, *pf, *p, *pl;
2408 p1 = (unsigned short *) srcImage->data;
2409 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2410 while (p1 < pf)
2411 {
2412 p = p1;
2413 pl = p1 + srcImage->width;
2414 for (; p < pl; p++)
2415 {
2416 *p = lookup_r[(*p & 0xf800)>>11] |
2417 lookup_g[(*p & 0x07e0)>> 5] |
2418 lookup_b[(*p & 0x001f)];
2419 }
2420 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2421 }
2422 break;
2423 }
2424 case 24:
2425 {
2426 unsigned char *p1, *pf, *p, *pl;
2427 p1 = (unsigned char *) srcImage->data;
2428 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2429 while (p1 < pf)
2430 {
2431 p = p1;
2432 pl = p1 + srcImage->width * 3;
2433 for (; p < pl; p += 3)
2434 {
2435 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2436 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2437 p[2] = lookup_r[(p[2] & 0x0000ff)];
2438 }
2439 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2440 }
2441 break;
2442 }
2443 case 32:
2444 {
2445 RUINT32T *p1, *pf, *p, *pl;
2446 p1 = (RUINT32T *) srcImage->data;
2447 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2448
2449 while (p1 < pf)
2450 {
2451 p = p1;
2452 pl = p1 + srcImage->width;
2453 for (; p < pl; p++)
2454 {
2455 *p = lookup_r[(*p & 0xff0000)>>16] |
2456 lookup_g[(*p & 0x00ff00)>> 8] |
2457 lookup_b[(*p & 0x0000ff)] |
2458 (*p & ~0xffffff);
2459 }
2460 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2461 }
2462 break;
2463 }
2464 }
2465
2466 free (lookup);
2467}
2468#endif
2469
2470/*
2471 * Check our parents are still who we think they are.
2472 * Do transparency updates if required
2473 */
2474int
2475rxvt_term::check_our_parents ()
2476{
2477 int i, pchanged, aformat, have_pixmap, rootdepth;
2478 unsigned long nitems, bytes_after;
2479 Atom atype;
2480 unsigned char *prop = NULL;
2481 Window root, oldp, *list;
2482 Pixmap rootpixmap = None;
2483 XWindowAttributes wattr, wrootattr;
2484 dDisp;
2485
2486 pchanged = 0;
2487
2488 if (!OPTION (Opt_transparent))
2489 return pchanged; /* Don't try any more */
2490
2491 XGetWindowAttributes (disp, display->root, &wrootattr);
2492 rootdepth = wrootattr.depth;
2493
2494 XGetWindowAttributes (disp, parent[0], &wattr);
2495
2496 if (rootdepth != wattr.depth)
2497 {
2498 if (am_transparent)
2499 {
2500 pchanged = 1;
2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2502 am_transparent = am_pixmap_trans = 0;
2503 }
2504
2505 return pchanged; /* Don't try any more */
2506 }
2507
2508 /* Get all X ops out of the queue so that our information is up-to-date. */
2509 XSync (disp, False);
2510
2511 /*
2512 * Make the frame window set by the window manager have
2513 * the root background. Some window managers put multiple nested frame
2514 * windows for each client, so we have to take care about that.
2515 */
2516 i = (xa[XA_XROOTPMAP_ID]
2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2519 &nitems, &bytes_after, &prop) == Success);
2520
2521 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success);
2526
2527 if (!i || prop == NULL
2528#if TINTING
2529 || !rs[Rs_color + Color_tint]
2530#endif
2531 )
2532 have_pixmap = 0;
2533 else
2534 {
2535 have_pixmap = 1;
2536 rootpixmap = *(Pixmap *)prop;
2537 XFree (prop);
2538 }
2539
2540 if (have_pixmap)
2541 {
2542 /*
2543 * Copy display->root pixmap transparency
2544 */
2545 int sx, sy, nx, ny;
2546 unsigned int nw, nh;
2547 Window cr;
2548 XImage *image;
2549 GC gc;
2550 XGCValues gcvalue;
2551
2552 XTranslateCoordinates (disp, parent[0], display->root,
2553 0, 0, &sx, &sy, &cr);
2554 nw = (unsigned int)szHint.width;
2555 nh = (unsigned int)szHint.height;
2556 nx = ny = 0;
2557
2558 if (sx < 0)
2559 {
2560 nw += sx;
2561 nx = -sx;
2562 sx = 0;
2563 }
2564
2565 if (sy < 0)
2566 {
2567 nh += sy;
2568 ny = -sy;
2569 sy = 0;
2570 }
2571
2572 min_it (nw, (unsigned int) (wrootattr.width - sx));
2573 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574
2575 XSync (disp, False);
2576 allowedxerror = -1;
2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2578
2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2580 /* XXX: may need a delay here? */
2581 allowedxerror = 0;
2582
2583 if (image == NULL)
2584 {
2585 if (am_transparent && am_pixmap_trans)
2586 {
2587 pchanged = 1;
2588 if (pixmap != None)
2589 {
2590 XFreePixmap (disp, pixmap);
2591 pixmap = None;
2592 }
2593 }
2594
2595 am_pixmap_trans = 0;
2596 }
2597 else
2598 {
2599 if (pixmap != None)
2600 XFreePixmap (disp, pixmap);
2601
2602#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint))
2604 {
2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2609
2610 ShadeXImage (display, image, shade, rm, gm, bm);
2611 }
2612#endif
2613
2614 pixmap = XCreatePixmap (disp, vt,
2615 szHint.width, szHint.height, image->depth);
2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2617 XPutImage (disp, pixmap, gc, image, 0, 0,
2618 nx, ny, image->width, image->height);
2619 XFreeGC (disp, gc);
2620 XDestroyImage (image);
2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2622 XClearWindow (disp, parent[0]);
2623
2624 if (!am_transparent || !am_pixmap_trans)
2625 pchanged = 1;
2626
2627 am_transparent = am_pixmap_trans = 1;
2628 }
2629 }
2630
2631 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2633 else
2634 {
2635 unsigned int n;
2636 /*
2637 * InheritPixmap transparency
2638 */
2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2640 {
2641 oldp = parent[i];
2642 XQueryTree (disp, parent[i - 1], &root,
2643 &parent[i], &list, &n);
2644 XFree (list);
2645
2646 if (parent[i] == display->root)
2647 {
2648 if (oldp != None)
2649 pchanged = 1;
2650
2651 break;
2652 }
2653
2654 if (oldp != parent[i])
2655 pchanged = 1;
2656 }
2657
2658 n = 0;
2659
2660 if (pchanged)
2661 {
2662 for (; n < (unsigned int)i; n++)
2663 {
2664 XGetWindowAttributes (disp, parent[n], &wattr);
2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2666 {
2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2668 break;
2669 }
2670 }
2671 }
2672
2673 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2674 {
2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2677 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */
2679 }
2680 else
2681 {
2682#if WAIT_FOR_WM
2683 /* wait (an arbitrary period) for the WM to do its thing
2684 * needed for fvwm2.2.2 (and before?) */
2685 sleep (1);
2686#endif
2687 for (n = 0; n < (unsigned int)i; n++)
2688 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]);
2691 }
2692
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2694 am_transparent = 1;
2695 }
2696
2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2698 parent[i] = None;
2699 }
2700
2701 if (scrollBar.win)
2702 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle ();
2705 scrollbar_show (0);
2706 }
2707
2708 if (am_transparent)
2709 {
2710 want_refresh = want_full_refresh = 1;
2711 if (am_pixmap_trans)
2712 flush ();
2713 }
2714
2715 return pchanged;
2716}
2717#endif
2718 2238
2719/*}}} */ 2239/*}}} */
2720 2240
2721bool 2241bool
2722rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2723{ 2243{
2724 bool flag = false; 2244 bool flag = false;
2725 unicode_t ch = NOCHAR; 2245 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2246 char *seq_begin; // remember start of esc-sequence here
2727 2247
2728 for (;;) 2248 for (;;)
2729 { 2249 {
2730 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
… …
2751 if (seen_resize && cmd_pid) 2271 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2272 kill (-cmd_pid, SIGWINCH);
2753 } 2273 }
2754 2274
2755 /* Read a text string from the input buffer */ 2275 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2276 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2277 bool refreshnow = false;
2758 int nlines = 0; 2278 int nlines = 0;
2759 unicode_t *str = buf; 2279 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2280 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2281
2762 for (;;) 2282 for (;;)
2763 { 2283 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2284 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break; 2285 break;
… …
2771 if (ch == C0_LF) 2291 if (ch == C0_LF)
2772 nlines++; 2292 nlines++;
2773 2293
2774 refresh_count++; 2294 refresh_count++;
2775 2295
2776 if (!OPTION (Opt_jumpScroll) 2296 if (!option (Opt_jumpScroll)
2777 || (refresh_count >= refresh_limit * (nrow - 1))) 2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2778 { 2298 {
2779 refreshnow = true; 2299 refreshnow = true;
2780 refresh_count = 0; 2300 refresh_count = 0;
2781 ch = NOCHAR; 2301 ch = NOCHAR;
… …
2783 } 2303 }
2784 2304
2785 // scr_add_lines only works for nlines <= nrow - 1. 2305 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2306 if (nlines >= nrow - 1)
2787 { 2307 {
2308 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2309 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2310 scr_add_lines (buf, str - buf, nlines);
2790 2311
2791 nlines = 0; 2312 nlines = 0;
2792 str = buf; 2313 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2314 eol = str + min (ncol, UBUFSIZ);
2794 } 2315 }
… …
2808 2329
2809 seq_begin = cmdbuf_ptr; 2330 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2331 ch = next_char ();
2811 } 2332 }
2812 2333
2334 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2336 scr_add_lines (buf, str - buf, nlines);
2815 2337
2816 /* 2338 /*
2817 * If there have been a lot of new lines, then update the screen 2339 * If there have been a lot of new lines, then update the screen
2818 * What the heck I'll cheat and only refresh less than every page-full. 2340 * What the heck I'll cheat and only refresh less than every page-full.
2819 * the number of pages between refreshes is refresh_limit, which 2341 * the number of pages between refreshes is refresh_limit, which
2820 * is incremented here because we must be doing flat-out scrolling. 2342 * is incremented here because we must be doing flat-out scrolling.
2821 */ 2343 */
2822 if (refreshnow) 2344 if (refreshnow)
2823 { 2345 {
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2347 refresh_limit++;
2826 else 2348 else
2827 { 2349 {
2828 flag = true; 2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2829 scr_refresh (refresh_type); 2352 scr_refresh ();
2830 flush_ev.stop (); 2353 want_refresh = 1;
2831 } 2354 }
2832 } 2355 }
2833 2356
2834 } 2357 }
2835 else 2358 else
… …
2850 } 2373 }
2851 2374
2852 return flag; 2375 return flag;
2853} 2376}
2854 2377
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character 2378// read the next character
2865unicode_t 2379wchar_t
2866rxvt_term::next_char () 2380rxvt_term::next_char () NOTHROW
2867{ 2381{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2383 {
2870 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2394 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2395 break;
2882 } 2396 }
2883 2397
2884 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2399 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886 2400
2887 // assume wchar == unicode 2401 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2403 return wc & UNICODE_MASK;
2890 } 2404 }
2891 2405
2892 return NOCHAR; 2406 return NOCHAR;
2893} 2407}
2408
2409// read the next octet
2410uint32_t
2411rxvt_term::next_octet () NOTHROW
2412{
2413 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR;
2416}
2417
2418static class out_of_input out_of_input;
2894 2419
2895/* rxvt_cmd_getc () - Return next input character */ 2420/* rxvt_cmd_getc () - Return next input character */
2896/* 2421/*
2897 * Return the next input character after first passing any keyboard input 2422 * Return the next input character after first passing any keyboard input
2898 * to the command. 2423 * to the command.
2899 */ 2424 */
2900unicode_t 2425wchar_t
2901rxvt_term::cmd_getc () 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2427{
2903 unicode_t c = next_char (); 2428 wchar_t c = next_char ();
2904 2429
2905 if (c == NOCHAR) 2430 if (c == NOCHAR)
2906 throw out_of_input; 2431 throw out_of_input;
2907 2432
2908 return c; 2433 return c;
2909} 2434}
2910 2435
2911unicode_t 2436uint32_t
2912rxvt_term::cmd_get8 () 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2438{
2914 unicode_t c = next_octet (); 2439 uint32_t c = next_octet ();
2915 2440
2916 if (c == NOCHAR) 2441 if (c == NOCHAR)
2917 throw out_of_input; 2442 throw out_of_input;
2918 2443
2919 return c; 2444 return c;
… …
3155 scr_charset_set (2, (unsigned int)cmd_getc ()); 2680 scr_charset_set (2, (unsigned int)cmd_getc ());
3156 break; 2681 break;
3157 case '+': 2682 case '+':
3158 scr_charset_set (3, (unsigned int)cmd_getc ()); 2683 scr_charset_set (3, (unsigned int)cmd_getc ());
3159 break; 2684 break;
3160#if ENABLE_FRILLS 2685#if !ENABLE_MINIMAL
3161 case '6': 2686 case '6':
3162 scr_backindex (); 2687 scr_backindex ();
3163 break; 2688 break;
3164#endif 2689#endif
3165 case '7': 2690 case '7':
3166 scr_cursor (SAVE); 2691 scr_cursor (SAVE);
3167 break; 2692 break;
3168 case '8': 2693 case '8':
3169 scr_cursor (RESTORE); 2694 scr_cursor (RESTORE);
3170 break; 2695 break;
3171#if ENABLE_FRILLS 2696#if !ENABLE_MINIMAL
3172 case '9': 2697 case '9':
3173 scr_forwardindex (); 2698 scr_forwardindex ();
3174 break; 2699 break;
3175#endif 2700#endif
3176 case '=': 2701 case '=':
… …
3186 break; 2711 break;
3187 2712
3188 /* 8.3.87: NEXT LINE */ 2713 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 2714 case C1_NEL: /* ESC E */
3190 { 2715 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 2716 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 2718 }
3194 break; 2719 break;
3195 2720
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 2721 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 2722 case C1_ESA: /* ESC G */
… …
3338 ndef = get_byte_array_bit (csi_defaults, i); 2863 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 2864 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 2865 if (arg[p] == -1)
3341 arg[p] = ndef; 2866 arg[p] = ndef;
3342 2867
3343#ifdef DEBUG_CMD
3344 fprintf (stderr, "CSI ");
3345 for (p = 0; p < nargs; p++)
3346 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3347 fprintf (stderr, "%c\n", ch);
3348#endif
3349
3350 /* 2868 /*
3351 * private mode handling 2869 * private mode handling
3352 */ 2870 */
3353 if (priv) 2871 if (priv)
3354 { 2872 {
3355 switch (priv) 2873 switch (priv)
3356 { 2874 {
3357 case '>': 2875 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 2876 if (ch == CSI_DA) /* secondary device attributes */
3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2877 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2883 // that we do not support xterm mouse reporting (should be 95 when we do).
2884 //
2885 tt_printf ("\033[>%d;94;0c", 'U');
2886 }
3360 break; 2887 break;
3361 case '?': 2888 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 2890 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 2891 break;
… …
3490 break; 3017 break;
3491 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3492 scr_report_position (); 3019 scr_report_position ();
3493 break; 3020 break;
3494 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3495 if (OPTION (Opt_insecure)) 3022 if (option (Opt_insecure))
3496 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3497 break; 3024 break;
3498 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3499 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3500 break; 3027 break;
… …
3567 break; 3094 break;
3568 case CSI_75: 3095 case CSI_75:
3569 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
3570 break; 3097 break;
3571 3098
3572#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3573 case CSI_74: 3100 case CSI_74:
3574 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
3575 break; 3102 break;
3576#endif 3103#endif
3577 3104
… …
3584 break; 3111 break;
3585 } 3112 }
3586} 3113}
3587/*}}} */ 3114/*}}} */
3588 3115
3589#if ENABLE_FRILLS 3116#if !ENABLE_MINIMAL
3590/* ARGSUSED */ 3117/* ARGSUSED */
3591void 3118void
3592rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3593{ 3120{
3594 int x, y; 3121 int x, y;
3595 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
3596 Window wdummy; 3123 Window wdummy;
3597 dDisp; 3124
3125 dLocal (Display *, dpy);
3598 3126
3599 if (nargs == 0) 3127 if (nargs == 0)
3600 return; 3128 return;
3601 3129
3602 switch (args[0]) 3130 switch (args[0])
3603 { 3131 {
3604 /* 3132 /*
3605 * commands 3133 * commands
3606 */ 3134 */
3607 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3608 XMapWindow (disp, parent[0]); 3136 XMapWindow (dpy, parent[0]);
3609 break; 3137 break;
3610 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3611 XIconifyWindow (disp, parent[0], display->screen); 3139 XIconifyWindow (dpy, parent[0], display->screen);
3612 break; 3140 break;
3613 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3614 XMoveWindow (disp, parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent[0], args[1], args[2]);
3615 break; 3143 break;
3616 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3618 break; 3146 break;
3619 case 5: /* raise window */ 3147 case 5: /* raise window */
3620 XRaiseWindow (disp, parent[0]); 3148 XRaiseWindow (dpy, parent[0]);
3621 break; 3149 break;
3622 case 6: /* lower window */ 3150 case 6: /* lower window */
3623 XLowerWindow (disp, parent[0]); 3151 XLowerWindow (dpy, parent[0]);
3624 break; 3152 break;
3625 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3626 scr_touch (true); 3154 scr_touch (true);
3627 break; 3155 break;
3628 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
… …
3635 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3636 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)width,
3637 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3638 break; 3166 break;
3639 3167
3640
3641 /* 3168 /*
3642 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3643 */ 3170 */
3644 case 11: /* report window state */ 3171 case 11: /* report window state */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3647 break; 3174 break;
3648 case 13: /* report window position */ 3175 case 13: /* report window position */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 XTranslateCoordinates (disp, parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent[0], wattr.root,
3651 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3652 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3653 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3654 break; 3181 break;
3655 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent[0], &wattr);
3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3658 break; 3185 break;
3659 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break; 3188 break;
… …
3663 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3664 break; 3191 break;
3665 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3666 { 3193 {
3667 char *s; 3194 char *s;
3668 XGetIconName (disp, parent[0], &s); 3195 XGetIconName (dpy, parent[0], &s);
3669 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s); 3197 XFree (s);
3671 } 3198 }
3672 break; 3199 break;
3673 case 21: /* report window title */ 3200 case 21: /* report window title */
3674 { 3201 {
3675 char *s; 3202 char *s;
3676 XFetchName (disp, parent[0], &s); 3203 XFetchName (dpy, parent[0], &s);
3677 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s); 3205 XFree (s);
3679 } 3206 }
3680 break; 3207 break;
3681 } 3208 }
3682} 3209}
… …
3709 seen_esc = true; 3236 seen_esc = true;
3710 continue; 3237 continue;
3711 } 3238 }
3712 else if (ch == C0_BEL || ch == CHAR_ST) 3239 else if (ch == C0_BEL || ch == CHAR_ST)
3713 break; 3240 break;
3241 else if (ch == C0_SYN)
3242 ch = cmd_get8 ();
3714 else if (ch < 0x20) 3243 else if (ch < 0x20)
3715 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
3716 3245
3717 seen_esc = false; 3246 seen_esc = false;
3718 3247
3719 if (n >= STRING_MAX - 1) 3248 if (n >= STRING_MAX - 1)
3720 // stop at some sane length 3249 // stop at some sane length
3721 return NULL; 3250 return NULL;
3722 3251
3723 if (ch == C0_SYN)
3724 string[n++] = cmd_get8 ();
3725 else
3726 string[n++] = ch; 3252 string[n++] = ch;
3727 } 3253 }
3728 3254
3729 string[n++] = '\0'; 3255 string[n++] = '\0';
3730 3256
3731 ends_how = (ch == 0x5c ? C0_ESC : ch); 3257 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3782void 3308void
3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3309rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3784{ 3310{
3785 if (str[0] == '?' && !str[1]) 3311 if (str[0] == '?' && !str[1])
3786 { 3312 {
3787 unsigned short r, g, b; 3313 rgba c;
3788 pix_colors_focused[color].get (display, r, g, b); 3314 pix_colors_focused[color].get (c);
3315
3316#if XFT
3317 if (c.a != rgba::MAX_CC)
3318 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3319 else
3320#endif
3789 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3321 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3790 } 3322 }
3791 else 3323 else
3792 set_window_color (color, str); 3324 set_window_color (color, str);
3793} 3325}
3794 3326
… …
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3329 */
3798void 3330void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3331rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3332{
3801 int changed = 0;
3802 int color; 3333 int color;
3803 char *buf, *name; 3334 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3335 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3336 int saveop = op;
3806 dDisp; 3337
3338 dLocal (Display *, dpy);
3807 3339
3808 assert (str != NULL); 3340 assert (str != NULL);
3341
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return;
3344
3809 switch (op) 3345 switch (op)
3810 { 3346 {
3811 case XTerm_name: 3347 case XTerm_name:
3812 set_title (str); 3348 set_title (str);
3813 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
… …
3827 unsigned long bytes_after; 3363 unsigned long bytes_after;
3828 unsigned char *value = 0; 3364 unsigned char *value = 0;
3829 const char *str = ""; 3365 const char *str = "";
3830 3366
3831 if (prop 3367 if (prop
3832 && XGetWindowProperty (disp, parent[0], 3368 && XGetWindowProperty (dpy, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType, 3369 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format, 3370 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success 3371 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None 3372 && actual_type != None
3837 && actual_format == 8) 3373 && actual_format == 8)
3838 str = (const char *)(value); 3374 str = (const char *)(value);
3839 3375
3840 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3376 tt_printf ("\033]%d;%s%c", op, str, resp);
3841 3377
3842 XFree (value); 3378 XFree (value);
3843 } 3379 }
3844 else 3380 else
3845 { 3381 {
… …
3849 { 3385 {
3850 *eq = 0; 3386 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1); 3387 set_utf8_property (display->atom (str), eq + 1);
3852 } 3388 }
3853 else 3389 else
3854 XDeleteProperty (disp, parent[0], 3390 XDeleteProperty (dpy, parent[0],
3855 display->atom (str)); 3391 display->atom (str));
3856 } 3392 }
3857 break; 3393 break;
3858 3394
3859 case XTerm_Color: 3395 case XTerm_Color:
… …
3861 { 3397 {
3862 if ((name = strchr (buf, ';')) == NULL) 3398 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3399 break;
3864 3400
3865 *name++ = '\0'; 3401 *name++ = '\0';
3866 color = atoi (buf); 3402 color = atoi (buf) + minCOLOR;
3867 3403
3868 if (color < 0 || color >= TOTAL_COLORS) 3404 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3405 break;
3870 3406
3871 if ((buf = strchr (name, ';')) != NULL) 3407 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3408 *buf++ = '\0';
3873 3409
3874 if (name[0] == '?' && !name[1]) 3410 process_color_seq (op, color, name, resp);
3875 {
3876 unsigned short r, g, b;
3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879 }
3880 else
3881 set_window_color (color + minCOLOR, name);
3882 } 3411 }
3883 break; 3412 break;
3884 case XTerm_Color00: 3413 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3414 process_color_seq (op, Color_fg, str, resp);
3886 break; 3415 break;
3887 case XTerm_Color01: 3416 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3889 break; 3418 break;
3890#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3421 process_color_seq (op, Color_cursor, str, resp);
3893 break; 3422 break;
3894#endif 3423#endif
3895 case XTerm_Color_pointer_fg: 3424 case XTerm_Color_pointer_fg:
3896 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3897 break; 3426 break;
3898 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3900 break; 3429 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3902 case XTerm_Color_BD:
3903 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3904 break;
3905 case XTerm_Color_UL:
3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3907 break;
3908 case XTerm_Color_RV: 3431 case XTerm_Color_RV:
3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3432 process_color_seq (op, Color_RV, str, resp);
3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp);
3437 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp);
3910 break; 3441 break;
3911 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
3913 break; 3444 break;
3914#endif 3445#endif
3915#if TRANSPARENT && TINTING 3446#if TRANSPARENT && TINTING
3916 case URxvt_Color_tint: 3447 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3448 process_color_seq (op, Color_tint, str, resp);
3449
3918 check_our_parents (); 3450 check_our_parents ();
3451
3919 if (am_transparent) 3452 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3453 want_full_refresh = want_refresh = 1;
3921 break;
3922#endif
3923 3454
3455 break;
3456#endif
3457
3924 case XTerm_Pixmap: 3458 case Rxvt_Pixmap:
3459 {
3925 if (*str != ';') 3460 if (*str != ';')
3926 { 3461 {
3927#if XPM_BACKGROUND 3462#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3463 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3464 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3465 scr_touch (true);
3466#endif
3932 } 3467 }
3468
3469 int changed = 0;
3470
3933 while ((str = strchr (str, ';')) != NULL) 3471 while ((str = strchr (str, ';')) != NULL)
3934 { 3472 {
3935 str++; 3473 str++;
3936#if XPM_BACKGROUND 3474#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3475 changed += scale_pixmap (str);
3938#endif 3476#endif
3939 } 3477 }
3940 3478
3941 if (changed) 3479 if (changed)
3942 { 3480 {
3943#ifdef XPM_BACKGROUND 3481#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3482 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3483 scr_touch (true);
3484#endif
3947 } 3485 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option(Opt_transparent))
3488 check_our_parents ();
3489#endif
3490
3491 }
3948 break; 3492 break;
3949 3493
3950 case XTerm_restoreFG: 3494 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3495 set_window_color (Color_fg, str);
3952 break; 3496 break;
3953 case XTerm_restoreBG: 3497 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3498 set_window_color (Color_bg, str);
3955 break; 3499 break;
3956 3500
3957 case XTerm_logfile: 3501 case XTerm_logfile:
3958 // TODO, when secure mode? 3502 // TODO, when secure mode?
3959 break; 3503 break;
3960 3504
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3505#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3506 case Rxvt_dumpscreen: /* no error notices */
3969 { 3507 {
3970 int fd; 3508 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3509 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 { 3510 {
3973 scr_dump (fd); 3511 scr_dump (fd);
… …
3984 case URxvt_italicFont: 3522 case URxvt_italicFont:
3985 case URxvt_boldItalicFont: 3523 case URxvt_boldItalicFont:
3986#endif 3524#endif
3987 if (query) 3525 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop, 3526 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3527 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "", 3528 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp); 3529 resp);
3992 else 3530 else
3993 { 3531 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3532 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3997 allocated.push_back ((void *)res); 3535 allocated.push_back ((void *)res);
3998 set_fonts (); 3536 set_fonts ();
3999 } 3537 }
4000 break; 3538 break;
4001 3539
4002#if ENABLE_FRILLS 3540 case URxvt_version:
3541 if (query)
3542 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3543 op,
3544 rs[Rs_name], VERSION[0], VERSION[2],
3545 resp);
3546 break;
3547
3548#if !ENABLE_MINIMAL
4003 case URxvt_locale: 3549 case URxvt_locale:
4004 if (query) 3550 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3551 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4006 else 3552 else
4007 { 3553 {
4008 set_locale (str); 3554 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3555 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3556 init_xlocale ();
4011 } 3557 }
4012 break; 3558 break;
4013 3559
4014 case URxvt_view_up: 3560 case URxvt_view_up:
… …
4025 break; 3571 break;
4026#endif 3572#endif
4027 3573
4028#if ENABLE_PERL 3574#if ENABLE_PERL
4029 case URxvt_perl: 3575 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3576 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4031 ; // no responses yet 3577 ; // no responses yet
4032 break; 3578 break;
4033#endif 3579#endif
4034 } 3580 }
4035} 3581}
… …
4067 return state; 3613 return state;
4068} 3614}
4069 3615
4070/* we're not using priv _yet_ */ 3616/* we're not using priv _yet_ */
4071void 3617void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3618rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 3619{
4074 unsigned int i, j; 3620 unsigned int i, j;
4075 int state; 3621 int state;
4076 3622
4077 static const struct 3623 static const struct
… …
4088 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 3637 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 3639 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 3640 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 3641#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 3642 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 3643#endif
… …
4147 /* extra handling for values with state unkept */ 3690 /* extra handling for values with state unkept */
4148 switch (arg[i]) 3691 switch (arg[i])
4149 { 3692 {
4150#if ENABLE_STYLES 3693#if ENABLE_STYLES
4151 case 1021: 3694 case 1021:
4152 if (mode) 3695 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 3696
4157 scr_touch (true); 3697 scr_touch (true);
4158 break; 3698 break;
4159#endif 3699#endif
4160 case 1048: /* alternative cursor save */ 3700 case 1048: /* alternative cursor save */
4161 case 1049: 3701 case 1049:
4162 if (OPTION (Opt_secondaryScreen)) 3702 if (option (Opt_secondaryScreen))
4163 if (mode == 0) 3703 if (mode == 0)
4164 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
4165 else if (mode == 1) 3705 else if (mode == 1)
4166 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
4167 break; 3707 break;
… …
4182 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 3724 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 3725 break;
4186 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
4187 if (!state) 3727 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 3728 break;
4192 case 5: /* reverse video */ 3729 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 3730 scr_rvideo_mode (state);
4194 break; 3731 break;
4195 case 6: /* relative/absolute origins */ 3732 case 6: /* relative/absolute origins */
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 3738 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 3739 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 3741 priv_modes &= ~PrivMode_MouseX11;
4205 break; 3742 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 3743#ifdef scrollBar_esc
4214 case scrollBar_esc: 3744 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 3745 if (scrollbar_mapping (state))
4216 { 3746 {
4217 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
… …
4236#if 0 3766#if 0
4237 case 1001: 3767 case 1001:
4238 break; /* X11 mouse highlighting */ 3768 break; /* X11 mouse highlighting */
4239#endif 3769#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 3770 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 3771 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 3772 break;
4246 case 1011: /* scroll to bottom on key press */ 3773 case 1011: /* scroll to bottom on key press */
4247 if (state) 3774 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 3775 break;
4252 case 1047: /* secondary screen w/ clearing last */ 3776 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 3779 scr_erase_screen (2);
4256 scr_change_screen (state); 3780 scr_change_screen (state);
4257 break; 3781 break;
4258 case 1049: /* secondary screen w/ clearing first */ 3782 case 1049: /* secondary screen w/ clearing first */
4259 scr_change_screen (state); 3783 scr_change_screen (state);
4260 if (OPTION (Opt_secondaryScreen)) 3784 if (option (Opt_secondaryScreen))
4261 if (current_screen != PRIMARY) 3785 if (current_screen != PRIMARY)
4262 scr_erase_screen (2); 3786 scr_erase_screen (2);
4263 break; 3787 break;
4264 default: 3788 default:
4265 break; 3789 break;
… …
4393 scr_color (Color_bg, Color_bg); 3917 scr_color (Color_bg, Color_bg);
4394 break; 3918 break;
4395 3919
4396 //case 50: // not variable spacing 3920 //case 50: // not variable spacing
4397 3921
4398#if ENABLE_FRILLS 3922#if !ENABLE_MINIMAL
4399 case 90: 3923 case 90:
4400 case 91: /* set bright fg color */ 3924 case 91: /* set bright fg color */
4401 case 92: 3925 case 92:
4402 case 93: 3926 case 93:
4403 case 94: 3927 case 94:
… …
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 3990
4467void 3991void
4468rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 3993{
4470 if (pty.pty < 0) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 3995 return;
4472 3996
3997 if (pty->pty < 0)
3998 return;
3999
4473 if (v_buflen == 0) 4000 if (v_buflen == 0)
4474 { 4001 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4003
4477 if ((unsigned int)written == len) 4004 if ((unsigned int)written == len)
4478 return; 4005 return;
4479 4006
4480 data += written; 4007 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4017}
4491 4018
4492void rxvt_term::pty_write () 4019void rxvt_term::pty_write ()
4493{ 4020{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4021 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4022
4496 if (written > 0) 4023 if (written > 0)
4497 { 4024 {
4498 v_buflen -= written; 4025 v_buflen -= written;
4499 4026

Diff Legend

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