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.245 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
230# if !UNICODE3 227# if !UNICODE3
231 if (ch >= 0x10000) 228 if (ch >= 0x10000)
232 ch = 0xfffd; 229 ch = 0xfffd;
233# endif 230# endif
234 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
236 } 235 }
237 236
237// {
238// char buf[4+4+3+1];
239// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
240// scr_overlay_set (0, 0, buf);
241// }
238 scr_overlay_set (0, len , attr); 242 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 243 scr_overlay_set (0, len + 1, fname);
240 244
241 free (fname); 245 free (fname);
242 246
302rxvt_term::lookup_key (XKeyEvent &ev) 306rxvt_term::lookup_key (XKeyEvent &ev)
303{ 307{
304 int ctrl, meta, shft, len; 308 int ctrl, meta, shft, len;
305 unsigned int newlen; 309 unsigned int newlen;
306 KeySym keysym; 310 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 311 int valid_keysym;
311 char kbuf[KBUFSZ]; 312 char kbuf[KBUFSZ];
312 313
313 /* 314 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
443 scr_move_to (0, 1); 444 scr_move_to (0, 1);
444 return; 445 return;
445 } 446 }
446 else if (keysym == XK_End) 447 else if (keysym == XK_End)
447 { 448 {
448 scr_move_to (1, 0); 449 scr_move_to (1, 1);
449 return; 450 return;
450 } 451 }
451 } 452 }
452#endif 453#endif
453 } 454 }
464 { 465 {
465 switch (keysym) 466 switch (keysym)
466 { 467 {
467 /* normal XTerm key bindings */ 468 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 469 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 470 selection_request (ev.time);
470 return; 471 return;
471#if TODO 472#if TODO
472 /* rxvt extras */ 473 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 474 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 475 change_font (FONT_UP);
867#endif 868#endif
868 /* nil */ ; 869 /* nil */ ;
869 } 870 }
870 } 871 }
871 872
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 874 return;
874 875
875 if (len <= 0) 876 if (len <= 0)
876 return; /* not mapped */ 877 return; /* not mapped */
877 878
905 { 906 {
906 const char ch = C0_ESC; 907 const char ch = C0_ESC;
907 tt_write (&ch, 1); 908 tt_write (&ch, 1);
908 } 909 }
909 910
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); 911 tt_write (kbuf, (unsigned int)len);
921} 912}
922/*}}} */ 913/*}}} */
923 914
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 915#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 916unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 917rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 918{
930 unsigned int n, s; 919 unsigned int n, s;
931 920
972 961
973 if (want_refresh) 962 if (want_refresh)
974 { 963 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 964 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 965 {
977 int row = -view_start; 966 int row = view_start;
967 int end_row = row + nrow;
978 968
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 969 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 970 --row;
981 971
982 while (row < -view_start + nrow) 972 do
983 { 973 {
984 int start_row = row; 974 int start_row = row;
985 line_t *l; 975 line_t *l;
986 976
987 do 977 do
988 { 978 {
989 l = &ROW (row); 979 l = &ROW (row++);
990 980
991 if (!(l->f & LINE_FILTERED)) 981 if (!(l->f & LINE_FILTERED))
992 { 982 {
993 // line not filtered, mark it as filtered 983 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 984 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 985 while (l->is_longer ())
996 { 986 {
997 l = &ROW (++row); 987 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 988 l->f |= LINE_FILTERED;
999 } 989 }
1000 990
1001 // and filter it 991 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 992 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 993
1004 break; 994 break;
1005 } 995 }
1006 } 996 }
1007 while (l->is_longer ()); 997 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 998 }
999 while (row < end_row);
1011 1000 }
1012 }
1013 1001
1014 scr_refresh (refresh_type); 1002 scr_refresh ();
1015 scrollbar_show (1); 1003 scrollbar_show (1);
1016#ifdef USE_XIM 1004#ifdef USE_XIM
1017 IMSendSpot (); 1005 IMSendSpot ();
1018#endif 1006#endif
1019 } 1007 }
1022} 1010}
1023 1011
1024void 1012void
1025rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
1026{ 1014{
1027 SET_R (this); 1015 make_current ();
1028 SET_LOCALE (locale);
1029 1016
1030 display->flush (); 1017 display->flush ();
1031 1018
1032 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1021}
1035 1022
1036void 1023void
1037rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
1038{ 1025{
1039 SET_R (this); 1026 make_current ();
1040 SET_LOCALE (locale);
1041 1027
1042 refresh_limit = 1; 1028 refresh_limit = 1;
1043 refresh_count = 0; 1029 refresh_count = 0;
1044 flush (); 1030 flush ();
1045} 1031}
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1036{
1051 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1038 want_refresh = 1;
1053 1039
1054 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1041}
1056#endif 1042#endif
1057 1043
1058#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1059void 1045void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1060{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1063 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1064 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1066 }
1082} 1067}
1083#endif 1068#endif
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1073{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1075 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1077 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1079 }
1096} 1080}
1097#endif 1081#endif
1102{ 1086{
1103 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1090 {
1107 if (view_start == nsaved || 1091 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1092 mouse_slip_wheel_speed = 0;
1110 1093
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1094 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1096 }
1115} 1097}
1116#endif 1098#endif
1146 1128
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
1150 1132
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1134
1153 if (r > 0) 1135 if (r > 0)
1154 { 1136 {
1155 cmdbuf_endp += r; 1137 cmdbuf_endp += r;
1156 return true; 1138 return true;
1174} 1156}
1175 1157
1176void 1158void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1160{
1179 SET_R (this); 1161 make_current ();
1180 SET_LOCALE (locale);
1181 1162
1182 if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1165 while (pty_fill ())
1185 if (cmd_parse ()) 1166 if (cmd_parse ())
1190} 1171}
1191 1172
1192void 1173void
1193rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1194{ 1175{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1196 recolour_cursor (); 1177 recolour_cursor ();
1197 1178
1198#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1180 hidden_pointer = 0;
1200 1181
1208rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1209{ 1190{
1210 if (!OPTION (Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1211 return; 1192 return;
1212 1193
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1214 XFlush (display->display); 1195 XFlush (xdisp);
1215 1196
1216 hidden_pointer = 1; 1197 hidden_pointer = 1;
1217} 1198}
1218 1199
1219void 1200void
1220rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
1221{ 1202{
1222 SET_R (this); 1203 make_current ();
1223 SET_LOCALE (locale);
1224 1204
1225 pointer_blank (); 1205 pointer_blank ();
1226} 1206}
1227#endif 1207#endif
1228 1208
1293 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1294 (32 + x + 1), 1274 (32 + x + 1),
1295 (32 + y + 1)); 1275 (32 + y + 1));
1296} 1276}
1297 1277
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 */ 1278/*{{{ process an X event */
1309void 1279void
1310rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1311{ 1281{
1312 dDisp; 1282 make_current ();
1313 1283
1314 SET_R (this); 1284 dLocal (Display *, xdisp);
1315 SET_LOCALE (locale);
1316 1285
1317#if defined(CURSOR_BLINK) 1286 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1289 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1290
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1291 // 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; 1292 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1294 unsigned int unused_mask;
1347 1295
1348 switch (ev.type) 1296 switch (ev.type)
1355 1303
1356 break; 1304 break;
1357 1305
1358 case KeyRelease: 1306 case KeyRelease:
1359 { 1307 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1309 KeySym keysym;
1362 1310
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif 1312#endif
1365 1313
1366#if ENABLE_FRILLS || ISO_14755 1314#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1315 // ISO 14755 support
1368 if (iso14755buf) 1316 if (iso14755buf)
1373# endif 1321# endif
1374# if ISO_14755 1322# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1323 // iso14755 part 5.2 handling: release time
1376 // first: controls 1324 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1325 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1328 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1330 commit_iso14755 ();
1383 return; // case-break; 1331 goto skip_switch;
1384 } 1332 }
1385 1333
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1335 if (i[0] == keysym)
1388 { 1336 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1337 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1338 commit_iso14755 ();
1391 return; // case-break; 1339 goto skip_switch;
1392 } 1340 }
1393 1341
1394 scr_bell (); 1342 scr_bell ();
1395# endif 1343# endif
1396 iso14755buf = 0; 1344 iso14755buf = 0;
1416 iso14755buf = 0; 1364 iso14755buf = 0;
1417 } 1365 }
1418#endif 1366#endif
1419 1367
1420 if (ev.xany.window == vt 1368 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1422 break; 1370 break;
1423 1371
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1428 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1429#endif 1377#endif
1430 break; 1378 break;
1431 } 1379 }
1432 1380
1438 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1439 break; 1387 break;
1440 1388
1441 case ClientMessage: 1389 case ClientMessage:
1442 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 1392 {
1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1394 {
1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1396 {
1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1398 {
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446 destroy (); 1400 destroy ();
1401 }
1447#if ENABLE_EWMH 1402#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev); 1406 &ev);
1407#endif
1408 }
1409 }
1410#if ENABLE_XEMBED
1411 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1412 {
1413 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1414 focus_in ();
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out ();
1417 }
1452#endif 1418#endif
1453 } 1419 }
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; 1420 break;
1490 1421
1491 case MappingNotify: 1422 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1424 break;
1526 break; 1457 break;
1527 1458
1528 case ConfigureNotify: 1459 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0]) 1460 if (ev.xconfigure.window == parent[0])
1530 { 1461 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1463 ;
1533 1464
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1466 {
1536 seen_resize = 1; 1467 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 } 1469 }
1539 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1541 if (OPTION (Opt_transparent)) 1474 if (OPTION (Opt_transparent))
1542 check_our_parents (); 1475 check_our_parents ();
1543#endif 1476#endif
1544 } 1477 }
1545 break; 1478 break;
1546 1479
1547 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1485
1552 break; 1486 break;
1553 1487
1554 case SelectionClear: 1488 case SelectionClear:
1555 selection_clear (); 1489 selection_clear ();
1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561 break; 1495 break;
1562 1496
1563 case SelectionRequest: 1497 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1499 break;
1500
1501 case MapNotify:
1502 mapped = 1;
1503#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1505#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565 break; 1507 break;
1566 1508
1567 case UnmapNotify: 1509 case UnmapNotify:
1568 mapped = 0; 1510 mapped = 0;
1569#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1571#endif 1513#endif
1572 break; 1514 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; 1515 break;
1580 1516
1581#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1582 case ReparentNotify: 1518 case ReparentNotify:
1583 rootwin_cb (ev); 1519 rootwin_cb (ev);
1589 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1590 { 1526 {
1591 do 1527 do
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1595 1531
1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597 1533
1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1599 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1600 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1601 1537
1602 scr_refresh (refresh_type); 1538 want_refresh = 1;
1603 } 1539 }
1604 else 1540 else
1605 { 1541 {
1606 XEvent unused_event; 1542 XEvent unused_event;
1607 1543
1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1609 ; 1545 ;
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1611 ; 1547 ;
1612 1548
1613 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1614 { 1550 {
1615 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1616 scrollbar_show (0); 1552 scrollbar_show (0);
1617 } 1553 }
1618#ifdef MENUBAR
1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620 menubar_expose ();
1621#endif
1622 1554
1623#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1624 if (am_transparent && ev.xany.window == parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1625 XClearWindow (disp, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1626#endif 1558#endif
1627 } 1559 }
1628 break; 1560 break;
1629 1561
1630 case MotionNotify: 1562 case MotionNotify:
1631#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1632 if (hidden_pointer) 1564 if (hidden_pointer)
1633 pointer_unblank (); 1565 pointer_unblank ();
1634#endif 1566#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) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643 break; 1568 break;
1644 1569
1645 if (ev.xany.window == vt) 1570 if (ev.xany.window == vt)
1646 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop 1574 ; // nop
1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650 { 1576 {
1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1652 ; 1578 ;
1653 1579
1654 XQueryPointer (disp, vt, 1580 XQueryPointer (xdisp, vt,
1655 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1658 &ev.xbutton.state); 1584 &ev.xbutton.state);
1659#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
1723#endif 1649#endif
1724 } 1650 }
1725 } 1651 }
1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727 { 1653 {
1728 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1729 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1730 ; 1656 ;
1731 1657
1732 XQueryPointer (disp, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1733 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1734 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1735 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1736 &unused_mask); 1662 &unused_mask);
1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738 scrollbar_size ()); 1664 scrollbar_size ());
1739 scr_refresh (refresh_type); 1665 want_refresh = 1;
1740 refresh_limit = 0; 1666 refresh_limit = 0;
1741 scrollbar_show (1); 1667 scrollbar_show (1);
1742 } 1668 }
1743 break; 1669 break;
1744 } 1670 }
1671
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1676 {
1677 if (hidden_cursor)
1678 {
1679 hidden_cursor = 0;
1680 want_refresh = 1;
1681 }
1682
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 }
1685#endif
1686
1687#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 {
1690 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease)
1693 if (hidden_pointer)
1694 pointer_unblank ();
1695
1696 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank ();
1698 }
1699#endif
1745} 1700}
1746 1701
1747void 1702void
1748rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1749{ 1704{
1761 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1762 } 1717 }
1763#endif 1718#endif
1764#if CURSOR_BLINK 1719#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink)) 1720 if (OPTION (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1767#endif 1722#endif
1768#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1770 { 1725 {
1771 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1815 1770
1816#if TRANSPARENT 1771#if TRANSPARENT
1817void 1772void
1818rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1774{
1820 SET_R (this); 1775 make_current ();
1821 SET_LOCALE (locale);
1822 1776
1823 switch (ev.type) 1777 switch (ev.type)
1824 { 1778 {
1825 case PropertyNotify: 1779 case PropertyNotify:
1826 /* 1780 /*
1853 /* 1807 /*
1854 * VT window processing of button press 1808 * VT window processing of button press
1855 */ 1809 */
1856 if (ev.window == vt) 1810 if (ev.window == vt)
1857 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1858#if ISO_14755 1815#if ISO_14755
1859 // 5.4 1816 // 5.4
1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861 { 1818 {
1862 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
1904 else 1861 else
1905 { 1862 {
1906 if (ev.button != MEvent.button) 1863 if (ev.button != MEvent.button)
1907 MEvent.clicks = 0; 1864 MEvent.clicks = 0;
1908 1865
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910 switch (ev.button) 1866 switch (ev.button)
1911 { 1867 {
1912 case Button1: 1868 case Button1:
1913 /* allow meta + click to select rectangular areas */ 1869 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */ 1870 /* should be done in screen.C */
1915#if ENABLE_FRILLS 1871#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask); 1872 selection.rect = !!(ev.state & ModMetaMask);
1917#else 1873#else
1918 selection.rect = false; 1874 selection.rect = false;
1919#endif 1875#endif
1920 1876
1921 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923 { 1879 {
1924 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1925 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1926 else 1882 else
1927 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
1928 } 1884 }
1929 else 1885 else
1930 { 1886 {
1931 if (MEvent.button == Button1 && clickintime) 1887 if (MEvent.button == Button1 && clickintime)
1932 MEvent.clicks++; 1888 MEvent.clicks++;
1933 else 1889 else
1934 MEvent.clicks = 1; 1890 MEvent.clicks = 1;
1935 1891
1936 selection_click (MEvent.clicks, ev.x, ev.y); 1892 selection_click (MEvent.clicks, ev.x, ev.y);
1937 } 1893 }
1938 1894
1939 MEvent.button = Button1; 1895 MEvent.button = Button1;
1940 break; 1896 break;
1941 1897
1942 case Button3: 1898 case Button3:
1943 if (MEvent.button == Button3 && clickintime) 1899 if (MEvent.button == Button3 && clickintime)
1944 selection_rotate (ev.x, ev.y); 1900 selection_rotate (ev.x, ev.y);
1945 else 1901 else
1946 selection_extend (ev.x, ev.y, 1); 1902 selection_extend (ev.x, ev.y, 1);
1947 1903
1948 MEvent.button = Button3; 1904 MEvent.button = Button3;
1949 break; 1905 break;
1950 } 1906 }
1951 } 1907 }
1952 1908
1953 MEvent.time = ev.time; 1909 MEvent.time = ev.time;
1954 return; 1910 return;
1955 } 1911 }
1956 1912
2095 } 2051 }
2096 } 2052 }
2097 2053
2098 return; 2054 return;
2099 } 2055 }
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} 2056}
2109 2057
2110void 2058void
2111rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
2112{ 2060{
2118 2066
2119 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
2120 { 2068 {
2121 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2122 scrollbar_show (0); 2070 scrollbar_show (0);
2123#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124 refresh_type &= ~SMOOTH_REFRESH;
2125#endif
2126 } 2071 }
2127 2072
2128#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2131#endif 2076#endif
2132 2077
2133 if (ev.window == vt) 2078 if (ev.window == vt)
2134 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2135#if ISO_14755 2083#if ISO_14755
2136 // 5.4 2084 // 5.4
2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138 return; 2086 return;
2139#endif 2087#endif
2088
2140 if (reportmode) 2089 if (reportmode)
2141 { 2090 {
2142 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2143 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2144 if (ev.button >= 4) 2093 if (ev.button >= 4)
2168 if (priv_modes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
2169 && bypass_keystate 2118 && bypass_keystate
2170 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
2171 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
2172 2121
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2176 switch (ev.button) 2122 switch (ev.button)
2177 { 2123 {
2178 case Button1: 2124 case Button1:
2179 case Button3: 2125 case Button3:
2180 selection_make (ev.time); 2126 selection_make (ev.time);
2181 break; 2127 break;
2128
2182 case Button2: 2129 case Button2:
2183 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2184 break; 2132 break;
2133
2185#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2186 case Button4: 2135 case Button4:
2187 case Button5: 2136 case Button5:
2188 { 2137 {
2189 int i; 2138 int i;
2211 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2212 } 2161 }
2213 else 2162 else
2214 { 2163 {
2215# endif 2164# endif
2216# ifdef JUMP_MOUSE_WHEEL
2217 scr_page (v, i); 2165 scr_page (v, i);
2218 scr_refresh (SMOOTH_REFRESH);
2219 scrollbar_show (1); 2166 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 2167# ifdef MOUSE_SLIP_WHEELING
2229 } 2168 }
2230#endif 2169# endif
2231 } 2170 }
2232 break; 2171 break;
2233#endif 2172#endif
2234 } 2173 }
2235 } 2174 }
2236#ifdef MENUBAR
2237 else if (isMenuBarWindow (ev.window))
2238 menubar_control (ev);
2239#endif
2240} 2175}
2241 2176
2242#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2243#if TINTING 2178#if TINTING
2244/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2245 2180
2246typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2247 2182
2248void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2249{ 2184{
2250 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2251 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255 int i; 2190 int i;
2256 2191
2257 Visual *visual = display->visual; 2192 Visual *visual = term->visual;
2258 2193
2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260 2195
2261 /* for convenience */ 2196 /* for convenience */
2262 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
2483 Atom atype; 2418 Atom atype;
2484 unsigned char *prop = NULL; 2419 unsigned char *prop = NULL;
2485 Window root, oldp, *list; 2420 Window root, oldp, *list;
2486 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2487 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2488 dDisp;
2489 2423
2490 pchanged = 0; 2424 pchanged = 0;
2491 2425
2492 if (!OPTION (Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2493 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2494 2428
2495 XGetWindowAttributes (disp, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2496 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2497 2431
2498 XGetWindowAttributes (disp, parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2499 2433
2500 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2501 { 2435 {
2502 if (am_transparent) 2436 if (am_transparent)
2503 { 2437 {
2504 pchanged = 1; 2438 pchanged = 1;
2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2506 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2507 } 2441 }
2508 2442
2509 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2510 } 2444 }
2511 2445
2512 /* Get all X ops out of the queue so that our information is up-to-date. */ 2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2513 XSync (disp, False); 2447 XSync (xdisp, False);
2514 2448
2515 /* 2449 /*
2516 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2517 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2518 * windows for each client, so we have to take care about that. 2452 * windows for each client, so we have to take care about that.
2519 */ 2453 */
2520 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2524 2458
2525 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2526 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2530 2464
2531 if (!i || prop == NULL 2465 if (!i || prop == NULL
2532#if TINTING 2466#if TINTING
2533 || !rs[Rs_color + Color_tint] 2467 || !ISSET_PIXCOLOR (Color_tint)
2534#endif 2468#endif
2535 ) 2469 )
2536 have_pixmap = 0; 2470 have_pixmap = 0;
2537 else 2471 else
2538 { 2472 {
2551 Window cr; 2485 Window cr;
2552 XImage *image; 2486 XImage *image;
2553 GC gc; 2487 GC gc;
2554 XGCValues gcvalue; 2488 XGCValues gcvalue;
2555 2489
2556 XTranslateCoordinates (disp, parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2557 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2558 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2559 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2560 nx = ny = 0; 2494 nx = ny = 0;
2561 2495
2574 } 2508 }
2575 2509
2576 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2577 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578 2512
2579 XSync (disp, False); 2513 XSync (xdisp, False);
2580 allowedxerror = -1; 2514 allowedxerror = -1;
2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582 2516
2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2584 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2585 allowedxerror = 0; 2519 allowedxerror = 0;
2586 2520
2589 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2590 { 2524 {
2591 pchanged = 1; 2525 pchanged = 1;
2592 if (pixmap != None) 2526 if (pixmap != None)
2593 { 2527 {
2594 XFreePixmap (disp, pixmap); 2528 XFreePixmap (xdisp, pixmap);
2595 pixmap = None; 2529 pixmap = None;
2596 } 2530 }
2597 } 2531 }
2598 2532
2599 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2600 } 2534 }
2601 else 2535 else
2602 { 2536 {
2603 if (pixmap != None) 2537 if (pixmap != None)
2604 XFreePixmap (disp, pixmap); 2538 XFreePixmap (xdisp, pixmap);
2605 2539
2606#if TINTING 2540#if TINTING
2607 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2608 { 2542 {
2609 unsigned short rm, gm, bm;
2610 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611 2544
2545 rgba c;
2612 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused [Color_tint].get (this, c);
2613 2547
2614 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2615 } 2549 }
2616#endif 2550#endif
2617 2551
2618 pixmap = XCreatePixmap (disp, vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2619 szHint.width, szHint.height, image->depth);
2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2621 XPutImage (disp, pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2622 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2623 XFreeGC (disp, gc); 2556 XFreeGC (xdisp, gc);
2624 XDestroyImage (image); 2557 XDestroyImage (image);
2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2626 XClearWindow (disp, parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2627 2560
2628 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2629 pchanged = 1; 2562 pchanged = 1;
2630 2563
2631 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2632 } 2565 }
2633 } 2566 }
2634 2567
2635 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2637 else 2570 else
2638 { 2571 {
2639 unsigned int n; 2572 unsigned int n;
2640 /* 2573 /*
2641 * InheritPixmap transparency 2574 * InheritPixmap transparency
2642 */ 2575 */
2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 { 2577 {
2645 oldp = parent[i]; 2578 oldp = parent[i];
2646 XQueryTree (disp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2647 &parent[i], &list, &n);
2648 XFree (list); 2580 XFree (list);
2649 2581
2650 if (parent[i] == display->root) 2582 if (parent[i] == display->root)
2651 { 2583 {
2652 if (oldp != None) 2584 if (oldp != None)
2660 } 2592 }
2661 2593
2662 n = 0; 2594 n = 0;
2663 2595
2664 if (pchanged) 2596 if (pchanged)
2665 {
2666 for (; n < (unsigned int)i; n++) 2597 for (; n < (unsigned int)i; n++)
2667 { 2598 {
2668 XGetWindowAttributes (disp, parent[n], &wattr); 2599 XGetWindowAttributes (xdisp, parent[n], &wattr);
2600
2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670 { 2602 {
2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672 break; 2604 break;
2673 } 2605 }
2674 } 2606 }
2675 }
2676 2607
2677 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2608 if (n > (sizeof (parent) / sizeof (parent[0])))
2678 { 2609 {
2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2681 am_transparent = 0; 2612 am_transparent = 0;
2682 /* XXX: also turn off Opt_transparent? */ 2613 /* XXX: also turn off Opt_transparent? */
2683 } 2614 }
2684 else 2615 else
2685 { 2616 {
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++) 2617 for (n = 0; n < (unsigned int)i; n++)
2692 { 2618 {
2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2619 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2694 XClearWindow (disp, parent[n]); 2620 XClearWindow (xdisp, parent[n]);
2695 } 2621 }
2696 2622
2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2623 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2698 am_transparent = 1; 2624 am_transparent = 1;
2699 } 2625 }
2700 2626
2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2627 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702 parent[i] = None; 2628 parent[i] = None;
2703 } 2629 }
2704 2630
2705 if (scrollBar.win) 2631 if (scrollBar.win)
2706 { 2632 {
2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2633 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2708 scrollBar.setIdle (); 2634 scrollBar.setIdle ();
2709 scrollbar_show (0); 2635 scrollbar_show (0);
2710 } 2636 }
2711 2637
2712 if (am_transparent) 2638 if (am_transparent)
2787 } 2713 }
2788 2714
2789 // scr_add_lines only works for nlines <= nrow - 1. 2715 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2716 if (nlines >= nrow - 1)
2791 { 2717 {
2718 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2719 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2720 scr_add_lines (buf, str - buf, nlines);
2794 2721
2795 nlines = 0; 2722 nlines = 0;
2796 str = buf; 2723 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2724 eol = str + min (ncol, UBUFSIZ);
2812 2739
2813 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2741 ch = next_char ();
2815 } 2742 }
2816 2743
2744 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2745 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818 scr_add_lines (buf, str - buf, nlines); 2746 scr_add_lines (buf, str - buf, nlines);
2819 2747
2820 /* 2748 /*
2821 * If there have been a lot of new lines, then update the screen 2749 * 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. 2750 * What the heck I'll cheat and only refresh less than every page-full.
2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2756 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829 refresh_limit++; 2757 refresh_limit++;
2830 else 2758 else
2831 { 2759 {
2832 flag = true; 2760 flag = true;
2833 scr_refresh (refresh_type); 2761 scr_refresh ();
2834 flush_ev.stop (); 2762 want_refresh = 1;
2835 } 2763 }
2836 } 2764 }
2837 2765
2838 } 2766 }
2839 else 2767 else
2856 return flag; 2784 return flag;
2857} 2785}
2858 2786
2859// read the next character 2787// read the next character
2860wchar_t 2788wchar_t
2861rxvt_term::next_char () 2789rxvt_term::next_char () NOTHROW
2862{ 2790{
2863 while (cmdbuf_ptr < cmdbuf_endp) 2791 while (cmdbuf_ptr < cmdbuf_endp)
2864 { 2792 {
2865 // assume 7-bit to be ascii ALWAYS 2793 // assume 7-bit to be ascii ALWAYS
2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2794 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2887 return NOCHAR; 2815 return NOCHAR;
2888} 2816}
2889 2817
2890// read the next octet 2818// read the next octet
2891uint32_t 2819uint32_t
2892rxvt_term::next_octet () 2820rxvt_term::next_octet () NOTHROW
2893{ 2821{
2894 return cmdbuf_ptr < cmdbuf_endp 2822 return cmdbuf_ptr < cmdbuf_endp
2895 ? *cmdbuf_ptr++ 2823 ? (unsigned char)*cmdbuf_ptr++
2896 : NOCHAR; 2824 : NOCHAR;
2897} 2825}
2826
2827static class out_of_input out_of_input;
2898 2828
2899/* rxvt_cmd_getc () - Return next input character */ 2829/* rxvt_cmd_getc () - Return next input character */
2900/* 2830/*
2901 * Return the next input character after first passing any keyboard input 2831 * Return the next input character after first passing any keyboard input
2902 * to the command. 2832 * to the command.
2903 */ 2833 */
2904wchar_t 2834wchar_t
2905rxvt_term::cmd_getc () 2835rxvt_term::cmd_getc () THROW ((class out_of_input))
2906{ 2836{
2907 wchar_t c = next_char (); 2837 wchar_t c = next_char ();
2908 2838
2909 if (c == NOCHAR) 2839 if (c == NOCHAR)
2910 throw out_of_input; 2840 throw out_of_input;
2911 2841
2912 return c; 2842 return c;
2913} 2843}
2914 2844
2915uint32_t 2845uint32_t
2916rxvt_term::cmd_get8 () 2846rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917{ 2847{
2918 uint32_t c = next_octet (); 2848 uint32_t c = next_octet ();
2919 2849
2920 if (c == NOCHAR) 2850 if (c == NOCHAR)
2921 throw out_of_input; 2851 throw out_of_input;
3159 scr_charset_set (2, (unsigned int)cmd_getc ()); 3089 scr_charset_set (2, (unsigned int)cmd_getc ());
3160 break; 3090 break;
3161 case '+': 3091 case '+':
3162 scr_charset_set (3, (unsigned int)cmd_getc ()); 3092 scr_charset_set (3, (unsigned int)cmd_getc ());
3163 break; 3093 break;
3164#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3165 case '6': 3095 case '6':
3166 scr_backindex (); 3096 scr_backindex ();
3167 break; 3097 break;
3168#endif 3098#endif
3169 case '7': 3099 case '7':
3170 scr_cursor (SAVE); 3100 scr_cursor (SAVE);
3171 break; 3101 break;
3172 case '8': 3102 case '8':
3173 scr_cursor (RESTORE); 3103 scr_cursor (RESTORE);
3174 break; 3104 break;
3175#if ENABLE_FRILLS 3105#if !ENABLE_MINIMAL
3176 case '9': 3106 case '9':
3177 scr_forwardindex (); 3107 scr_forwardindex ();
3178 break; 3108 break;
3179#endif 3109#endif
3180 case '=': 3110 case '=':
3342 ndef = get_byte_array_bit (csi_defaults, i); 3272 ndef = get_byte_array_bit (csi_defaults, i);
3343 for (p = 0; p < nargs; p++) 3273 for (p = 0; p < nargs; p++)
3344 if (arg[p] == -1) 3274 if (arg[p] == -1)
3345 arg[p] = ndef; 3275 arg[p] = ndef;
3346 3276
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 /* 3277 /*
3355 * private mode handling 3278 * private mode handling
3356 */ 3279 */
3357 if (priv) 3280 if (priv)
3358 { 3281 {
3359 switch (priv) 3282 switch (priv)
3360 { 3283 {
3361 case '>': 3284 case '>':
3362 if (ch == CSI_DA) /* secondary device attributes */ 3285 if (ch == CSI_DA) /* secondary device attributes */
3363 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3286 {
3287 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3288 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3289 //
3290 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3291 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3292 // that we do not support xterm mouse reporting (should be 95 when we do).
3293 //
3294 tt_printf ("\033[>%d;94;0c", 'U');
3295 }
3364 break; 3296 break;
3365 case '?': 3297 case '?':
3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3298 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367 process_terminal_mode (ch, priv, nargs, arg); 3299 process_terminal_mode (ch, priv, nargs, arg);
3368 break; 3300 break;
3571 break; 3503 break;
3572 case CSI_75: 3504 case CSI_75:
3573 scr_cursor (RESTORE); 3505 scr_cursor (RESTORE);
3574 break; 3506 break;
3575 3507
3576#if ENABLE_FRILLS 3508#if !ENABLE_MINIMAL
3577 case CSI_74: 3509 case CSI_74:
3578 process_window_ops (arg, nargs); 3510 process_window_ops (arg, nargs);
3579 break; 3511 break;
3580#endif 3512#endif
3581 3513
3588 break; 3520 break;
3589 } 3521 }
3590} 3522}
3591/*}}} */ 3523/*}}} */
3592 3524
3593#if ENABLE_FRILLS 3525#if !ENABLE_MINIMAL
3594/* ARGSUSED */ 3526/* ARGSUSED */
3595void 3527void
3596rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3528rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597{ 3529{
3598 int x, y; 3530 int x, y;
3599 XWindowAttributes wattr; 3531 XWindowAttributes wattr;
3600 Window wdummy; 3532 Window wdummy;
3601 dDisp; 3533
3534 dLocal (Display *, xdisp);
3602 3535
3603 if (nargs == 0) 3536 if (nargs == 0)
3604 return; 3537 return;
3605 3538
3606 switch (args[0]) 3539 switch (args[0])
3607 { 3540 {
3608 /* 3541 /*
3609 * commands 3542 * commands
3610 */ 3543 */
3611 case 1: /* deiconify window */ 3544 case 1: /* deiconify window */
3612 XMapWindow (disp, parent[0]); 3545 XMapWindow (xdisp, parent[0]);
3613 break; 3546 break;
3614 case 2: /* iconify window */ 3547 case 2: /* iconify window */
3615 XIconifyWindow (disp, parent[0], display->screen); 3548 XIconifyWindow (xdisp, parent[0], display->screen);
3616 break; 3549 break;
3617 case 3: /* set position (pixels) */ 3550 case 3: /* set position (pixels) */
3618 XMoveWindow (disp, parent[0], args[1], args[2]); 3551 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3619 break; 3552 break;
3620 case 4: /* set size (pixels) */ 3553 case 4: /* set size (pixels) */
3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3554 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622 break; 3555 break;
3623 case 5: /* raise window */ 3556 case 5: /* raise window */
3624 XRaiseWindow (disp, parent[0]); 3557 XRaiseWindow (xdisp, parent[0]);
3625 break; 3558 break;
3626 case 6: /* lower window */ 3559 case 6: /* lower window */
3627 XLowerWindow (disp, parent[0]); 3560 XLowerWindow (xdisp, parent[0]);
3628 break; 3561 break;
3629 case 7: /* refresh window */ 3562 case 7: /* refresh window */
3630 scr_touch (true); 3563 scr_touch (true);
3631 break; 3564 break;
3632 case 8: /* set size (chars) */ 3565 case 8: /* set size (chars) */
3639 if (args[0] >= 24) /* set height (chars) */ 3572 if (args[0] >= 24) /* set height (chars) */
3640 set_widthheight ((unsigned int)width, 3573 set_widthheight ((unsigned int)width,
3641 (unsigned int) (args[1] * fheight)); 3574 (unsigned int) (args[1] * fheight));
3642 break; 3575 break;
3643 3576
3644
3645 /* 3577 /*
3646 * reports - some output format copied from XTerm 3578 * reports - some output format copied from XTerm
3647 */ 3579 */
3648 case 11: /* report window state */ 3580 case 11: /* report window state */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3582 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651 break; 3583 break;
3652 case 13: /* report window position */ 3584 case 13: /* report window position */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3585 XGetWindowAttributes (xdisp, parent[0], &wattr);
3654 XTranslateCoordinates (disp, parent[0], wattr.root, 3586 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3655 -wattr.border_width, -wattr.border_width, 3587 -wattr.border_width, -wattr.border_width,
3656 &x, &y, &wdummy); 3588 &x, &y, &wdummy);
3657 tt_printf ("\033[3;%d;%dt", x, y); 3589 tt_printf ("\033[3;%d;%dt", x, y);
3658 break; 3590 break;
3659 case 14: /* report window size (pixels) */ 3591 case 14: /* report window size (pixels) */
3660 XGetWindowAttributes (disp, parent[0], &wattr); 3592 XGetWindowAttributes (xdisp, parent[0], &wattr);
3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3593 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662 break; 3594 break;
3663 case 18: /* report text area size (chars) */ 3595 case 18: /* report text area size (chars) */
3664 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3596 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665 break; 3597 break;
3667 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3599 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668 break; 3600 break;
3669 case 20: /* report icon label */ 3601 case 20: /* report icon label */
3670 { 3602 {
3671 char *s; 3603 char *s;
3672 XGetIconName (disp, parent[0], &s); 3604 XGetIconName (xdisp, parent[0], &s);
3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3605 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674 XFree (s); 3606 XFree (s);
3675 } 3607 }
3676 break; 3608 break;
3677 case 21: /* report window title */ 3609 case 21: /* report window title */
3678 { 3610 {
3679 char *s; 3611 char *s;
3680 XFetchName (disp, parent[0], &s); 3612 XFetchName (xdisp, parent[0], &s);
3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3613 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682 XFree (s); 3614 XFree (s);
3683 } 3615 }
3684 break; 3616 break;
3685 } 3617 }
3786void 3718void
3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3719rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788{ 3720{
3789 if (str[0] == '?' && !str[1]) 3721 if (str[0] == '?' && !str[1])
3790 { 3722 {
3791 unsigned short r, g, b; 3723 rgba c;
3792 pix_colors_focused[color].get (display, r, g, b); 3724 pix_colors_focused[color].get (this, c);
3725
3726#if XFT
3727 if (c.a != rgba::MAX_CC)
3728 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3729 else
3730#endif
3793 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3731 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3794 } 3732 }
3795 else 3733 else
3796 set_window_color (color, str); 3734 set_window_color (color, str);
3797} 3735}
3798 3736
3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3738 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801 */ 3739 */
3802void 3740void
3803rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3741rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804{ 3742{
3805 int changed = 0;
3806 int color; 3743 int color;
3807 char *buf, *name; 3744 char *buf, *name;
3808 bool query = str[0] == '?' && !str[1]; 3745 bool query = str[0] == '?' && !str[1];
3809 int saveop = op; 3746 int saveop = op;
3810 dDisp; 3747
3748 dLocal (Display *, xdisp);
3811 3749
3812 assert (str != NULL); 3750 assert (str != NULL);
3813 switch (op) 3751 switch (op)
3814 { 3752 {
3815 case XTerm_name: 3753 case XTerm_name:
3831 unsigned long bytes_after; 3769 unsigned long bytes_after;
3832 unsigned char *value = 0; 3770 unsigned char *value = 0;
3833 const char *str = ""; 3771 const char *str = "";
3834 3772
3835 if (prop 3773 if (prop
3836 && XGetWindowProperty (disp, parent[0], 3774 && XGetWindowProperty (xdisp, parent[0],
3837 prop, 0, 1<<16, 0, AnyPropertyType, 3775 prop, 0, 1<<16, 0, AnyPropertyType,
3838 &actual_type, &actual_format, 3776 &actual_type, &actual_format,
3839 &nitems, &bytes_after, &value) == Success 3777 &nitems, &bytes_after, &value) == Success
3840 && actual_type != None 3778 && actual_type != None
3841 && actual_format == 8) 3779 && actual_format == 8)
3842 str = (const char *)(value); 3780 str = (const char *)(value);
3843 3781
3844 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3782 tt_printf ("\033]%d;%s%c", op, str, resp);
3845 3783
3846 XFree (value); 3784 XFree (value);
3847 } 3785 }
3848 else 3786 else
3849 { 3787 {
3853 { 3791 {
3854 *eq = 0; 3792 *eq = 0;
3855 set_utf8_property (display->atom (str), eq + 1); 3793 set_utf8_property (display->atom (str), eq + 1);
3856 } 3794 }
3857 else 3795 else
3858 XDeleteProperty (disp, parent[0], 3796 XDeleteProperty (xdisp, parent[0],
3859 display->atom (str)); 3797 display->atom (str));
3860 } 3798 }
3861 break; 3799 break;
3862 3800
3863 case XTerm_Color: 3801 case XTerm_Color:
3865 { 3803 {
3866 if ((name = strchr (buf, ';')) == NULL) 3804 if ((name = strchr (buf, ';')) == NULL)
3867 break; 3805 break;
3868 3806
3869 *name++ = '\0'; 3807 *name++ = '\0';
3870 color = atoi (buf); 3808 color = atoi (buf) + minCOLOR;
3871 3809
3872 if (color < 0 || color >= TOTAL_COLORS) 3810 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873 break; 3811 break;
3874 3812
3875 if ((buf = strchr (name, ';')) != NULL) 3813 if ((buf = strchr (name, ';')) != NULL)
3876 *buf++ = '\0'; 3814 *buf++ = '\0';
3877 3815
3878 if (name[0] == '?' && !name[1]) 3816 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 } 3817 }
3887 break; 3818 break;
3888 case XTerm_Color00: 3819 case XTerm_Color00:
3889 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3820 process_color_seq (op, Color_fg, str, resp);
3890 break; 3821 break;
3891 case XTerm_Color01: 3822 case XTerm_Color01:
3892 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3823 process_color_seq (op, Color_bg, str, resp);
3893 break; 3824 break;
3894#ifndef NO_CURSORCOLOR 3825#ifndef NO_CURSORCOLOR
3895 case XTerm_Color_cursor: 3826 case XTerm_Color_cursor:
3896 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3827 process_color_seq (op, Color_cursor, str, resp);
3897 break; 3828 break;
3898#endif 3829#endif
3899 case XTerm_Color_pointer_fg: 3830 case XTerm_Color_pointer_fg:
3900 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3831 process_color_seq (op, Color_pointer_fg, str, resp);
3901 break; 3832 break;
3902 case XTerm_Color_pointer_bg: 3833 case XTerm_Color_pointer_bg:
3903 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3834 process_color_seq (op, Color_pointer_bg, str, resp);
3904 break; 3835 break;
3905#ifndef NO_BOLD_UNDERLINE_REVERSE 3836#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: 3837 case XTerm_Color_RV:
3913 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3838 process_color_seq (op, Color_RV, str, resp);
3839 break;
3840 case Rxvt_Color_BD:
3841 case URxvt_Color_BD:
3842 process_color_seq (op, Color_BD, str, resp);
3843 break;
3844 case Rxvt_Color_UL:
3845 case URxvt_Color_UL:
3846 process_color_seq (op, Color_UL, str, resp);
3914 break; 3847 break;
3915 case URxvt_Color_IT: 3848 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3849 process_color_seq (op, Color_IT, str, resp);
3917 break; 3850 break;
3918#endif 3851#endif
3919#if TRANSPARENT && TINTING 3852#if TRANSPARENT && TINTING
3920 case URxvt_Color_tint: 3853 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3854 process_color_seq (op, Color_tint, str, resp);
3855
3922 check_our_parents (); 3856 check_our_parents ();
3857
3923 if (am_transparent) 3858 if (am_transparent)
3924 want_full_refresh = want_refresh = 1; 3859 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927 3860
3861 break;
3862#endif
3863
3928 case XTerm_Pixmap: 3864 case Rxvt_Pixmap:
3865 {
3929 if (*str != ';') 3866 if (*str != ';')
3930 { 3867 {
3931#if XPM_BACKGROUND 3868#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */ 3869 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */ 3870 set_bgPixmap (str); /* change pixmap */
3934#endif
3935 scr_touch (true); 3871 scr_touch (true);
3872#endif
3936 } 3873 }
3874
3875 int changed = 0;
3876
3937 while ((str = strchr (str, ';')) != NULL) 3877 while ((str = strchr (str, ';')) != NULL)
3938 { 3878 {
3939 str++; 3879 str++;
3940#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3941 changed += scale_pixmap (str); 3881 changed += scale_pixmap (str);
3942#endif 3882#endif
3943 } 3883 }
3944 3884
3945 if (changed) 3885 if (changed)
3946 { 3886 {
3947#ifdef XPM_BACKGROUND 3887#ifdef XPM_BACKGROUND
3948 resize_pixmap (); 3888 resize_pixmap ();
3949#endif
3950 scr_touch (true); 3889 scr_touch (true);
3890#endif
3951 } 3891 }
3892 }
3952 break; 3893 break;
3953 3894
3954 case XTerm_restoreFG: 3895 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3896 set_window_color (Color_fg, str);
3956 break; 3897 break;
3957 case XTerm_restoreBG: 3898 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str); 3899 set_window_color (Color_bg, str);
3959 break; 3900 break;
3960 3901
3961 case XTerm_logfile: 3902 case XTerm_logfile:
3962 // TODO, when secure mode? 3903 // TODO, when secure mode?
3963 break; 3904 break;
3964 3905
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 3906#if 0
3972 case XTerm_dumpscreen: /* no error notices */ 3907 case Rxvt_dumpscreen: /* no error notices */
3973 { 3908 {
3974 int fd; 3909 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3910 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976 { 3911 {
3977 scr_dump (fd); 3912 scr_dump (fd);
4001 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
4002 set_fonts (); 3937 set_fonts ();
4003 } 3938 }
4004 break; 3939 break;
4005 3940
4006#if ENABLE_FRILLS 3941 case URxvt_version:
3942 if (query)
3943 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3944 op,
3945 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp);
3947 break;
3948
3949#if !ENABLE_MINIMAL
4007 case URxvt_locale: 3950 case URxvt_locale:
4008 if (query) 3951 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4010 else 3953 else
4011 { 3954 {
4012 set_locale (str); 3955 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3956 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3957 init_xlocale ();
4015 } 3958 }
4016 break; 3959 break;
4017 3960
4018 case URxvt_view_up: 3961 case URxvt_view_up:
4071 return state; 4014 return state;
4072} 4015}
4073 4016
4074/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
4075void 4018void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4019rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 4020{
4078 unsigned int i, j; 4021 unsigned int i, j;
4079 int state; 4022 int state;
4080 4023
4081 static const struct 4024 static const struct
4092 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 4038 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 4040 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 4041 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 4042#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 4043 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 4044#endif
4151 /* extra handling for values with state unkept */ 4091 /* extra handling for values with state unkept */
4152 switch (arg[i]) 4092 switch (arg[i])
4153 { 4093 {
4154#if ENABLE_STYLES 4094#if ENABLE_STYLES
4155 case 1021: 4095 case 1021:
4156 if (mode) 4096 set_option (Opt_intensityStyles, mode);
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160 4097
4161 scr_touch (true); 4098 scr_touch (true);
4162 break; 4099 break;
4163#endif 4100#endif
4164 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4186 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
4187 if (priv_modes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
4188 set_widthheight (((state ? 132 : 80) * fwidth), height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
4189 break; 4126 break;
4190 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
4191 if (!state) 4128 set_option (Opt_jumpScroll, !state);
4192 SET_OPTION (Opt_jumpScroll);
4193 else
4194 CLR_OPTION (Opt_jumpScroll);
4195 break; 4129 break;
4196 case 5: /* reverse video */ 4130 case 5: /* reverse video */
4197 scr_rvideo_mode (state); 4131 scr_rvideo_mode (state);
4198 break; 4132 break;
4199 case 6: /* relative/absolute origins */ 4133 case 6: /* relative/absolute origins */
4205 /* case 8: - auto repeat, can't do on a per window basis */ 4139 /* case 8: - auto repeat, can't do on a per window basis */
4206 case 9: /* X10 mouse reporting */ 4140 case 9: /* X10 mouse reporting */
4207 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
4208 priv_modes &= ~PrivMode_MouseX11; 4142 priv_modes &= ~PrivMode_MouseX11;
4209 break; 4143 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 4144#ifdef scrollBar_esc
4218 case scrollBar_esc: 4145 case scrollBar_esc:
4219 if (scrollbar_mapping (state)) 4146 if (scrollbar_mapping (state))
4220 { 4147 {
4221 resize_all_windows (0, 0, 0); 4148 resize_all_windows (0, 0, 0);
4240#if 0 4167#if 0
4241 case 1001: 4168 case 1001:
4242 break; /* X11 mouse highlighting */ 4169 break; /* X11 mouse highlighting */
4243#endif 4170#endif
4244 case 1010: /* scroll to bottom on TTY output inhibit */ 4171 case 1010: /* scroll to bottom on TTY output inhibit */
4245 if (!state) 4172 set_option (Opt_scrollTtyOutput, !state);
4246 SET_OPTION (Opt_scrollTtyOutput);
4247 else
4248 CLR_OPTION (Opt_scrollTtyOutput);
4249 break; 4173 break;
4250 case 1011: /* scroll to bottom on key press */ 4174 case 1011: /* scroll to bottom on key press */
4251 if (state) 4175 set_option (Opt_scrollTtyKeypress, state);
4252 SET_OPTION (Opt_scrollTtyKeypress);
4253 else
4254 CLR_OPTION (Opt_scrollTtyKeypress);
4255 break; 4176 break;
4256 case 1047: /* secondary screen w/ clearing last */ 4177 case 1047: /* secondary screen w/ clearing last */
4257 if (OPTION (Opt_secondaryScreen)) 4178 if (OPTION (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 4179 if (current_screen != PRIMARY)
4259 scr_erase_screen (2); 4180 scr_erase_screen (2);
4397 scr_color (Color_bg, Color_bg); 4318 scr_color (Color_bg, Color_bg);
4398 break; 4319 break;
4399 4320
4400 //case 50: // not variable spacing 4321 //case 50: // not variable spacing
4401 4322
4402#if ENABLE_FRILLS 4323#if !ENABLE_MINIMAL
4403 case 90: 4324 case 90:
4404 case 91: /* set bright fg color */ 4325 case 91: /* set bright fg color */
4405 case 92: 4326 case 92:
4406 case 93: 4327 case 93:
4407 case 94: 4328 case 94:
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4390const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470 4391
4471void 4392void
4472rxvt_term::tt_write (const char *data, unsigned int len) 4393rxvt_term::tt_write (const char *data, unsigned int len)
4473{ 4394{
4474 if (pty.pty < 0) 4395 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475 return; 4396 return;
4476 4397
4398 if (pty->pty < 0)
4399 return;
4400
4477 if (v_buflen == 0) 4401 if (v_buflen == 0)
4478 { 4402 {
4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4403 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480 4404
4481 if ((unsigned int)written == len) 4405 if ((unsigned int)written == len)
4482 return; 4406 return;
4483 4407
4484 data += written; 4408 data += written;
4493 pty_ev.set (EVENT_READ | EVENT_WRITE); 4417 pty_ev.set (EVENT_READ | EVENT_WRITE);
4494} 4418}
4495 4419
4496void rxvt_term::pty_write () 4420void rxvt_term::pty_write ()
4497{ 4421{
4498 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499 4423
4500 if (written > 0) 4424 if (written > 0)
4501 { 4425 {
4502 v_buflen -= written; 4426 v_buflen -= written;
4503 4427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines