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.240 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.340 by sasha, Fri Aug 3 22:40:10 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#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 {
… …
507# endif 519# endif
508 return; 520 return;
509 } 521 }
510 else 522 else
511 { 523 {
512# if ENABLE_OVERLAY 524# if ISO_14755
513 scr_overlay_off (); 525 scr_overlay_off ();
514# endif 526# endif
515 iso14755buf = 0; 527 iso14755buf = 0;
516 } 528 }
517 } 529 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
521 { 533 {
522 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 535# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
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 ISO_14755
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 ISO_14755
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
… …
959void 1035void
960rxvt_term::flush () 1036rxvt_term::flush ()
961{ 1037{
962 flush_ev.stop (); 1038 flush_ev.stop ();
963 1039
964#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
965 if (want_full_refresh) 1041 if (want_full_refresh)
966 { 1042 {
967 want_full_refresh = 0; 1043 want_full_refresh = 0;
968 scr_clear (); 1044 scr_clear ();
969 scr_touch (false); 1045 scr_touch (false);
… …
972 1048
973 if (want_refresh) 1049 if (want_refresh)
974 { 1050 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1052 {
977 int row = -view_start; 1053 int row = view_start;
1054 int end_row = row + nrow;
978 1055
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1056 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1057 --row;
981 1058
982 while (row < -view_start + nrow) 1059 do
983 { 1060 {
984 int start_row = row; 1061 int start_row = row;
985 line_t *l; 1062 line_t *l;
986 1063
987 do 1064 do
988 { 1065 {
989 l = &ROW (row); 1066 l = &ROW (row++);
990 1067
991 if (!(l->f & LINE_FILTERED)) 1068 if (!(l->f & LINE_FILTERED))
992 { 1069 {
993 // line not filtered, mark it as filtered 1070 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1071 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1072 while (l->is_longer ())
996 { 1073 {
997 l = &ROW (++row); 1074 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1075 l->f |= LINE_FILTERED;
999 } 1076 }
1000 1077
1001 // and filter it 1078 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1080
1004 break; 1081 break;
1005 } 1082 }
1006 } 1083 }
1007 while (l->is_longer ()); 1084 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1085 }
1086 while (row < end_row);
1011 1087 }
1012 }
1013 1088
1014 scr_refresh (refresh_type); 1089 scr_refresh ();
1015 scrollbar_show (1); 1090 scrollbar_show (1);
1016#ifdef USE_XIM 1091#ifdef USE_XIM
1017 IMSendSpot (); 1092 IMSendSpot ();
1018#endif 1093#endif
1019 } 1094 }
… …
1022} 1097}
1023 1098
1024void 1099void
1025rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
1026{ 1101{
1027 SET_R (this); 1102 make_current ();
1028 SET_LOCALE (locale);
1029 1103
1030 display->flush (); 1104 display->flush ();
1031 1105
1032 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1108}
1035 1109
1036void 1110void
1037rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1038{ 1112{
1039 SET_R (this); 1113 make_current ();
1040 SET_LOCALE (locale);
1041 1114
1042 refresh_limit = 1;
1043 refresh_count = 0; 1115 refresh_count = 0;
1044 flush (); 1116 flush ();
1045} 1117}
1046 1118
1047#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1122{
1051 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1124 want_refresh = 1;
1053 1125
1054 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1127}
1056#endif 1128#endif
1057 1129
1058#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1059void 1131void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1146{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1149 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1150 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1152 }
1082} 1153}
1083#endif 1154#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1159{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1161 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1163 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1165 }
1096} 1166}
1097#endif 1167#endif
… …
1102{ 1172{
1103 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1176 {
1107 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1110 1179
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1180 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1182 }
1115} 1183}
1116#endif 1184#endif
1117 1185
1118#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1119static struct event_handler 1187static struct event_handler
1120{ 1188{
1121 check_watcher cw_yield; 1189 check_watcher yield_ev;
1122 1190
1123 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1124 { 1192 {
1125 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1126 w.stop (); 1201 w.stop ();
1127 } 1202 }
1128 1203
1129 event_handler () 1204 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1131 { 1206 {
1132 } 1207 }
1133} event_handler; 1208} event_handler;
1134#endif 1209#endif
1135 1210
… …
1146 1221
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1150 1225
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1227
1153 if (r > 0) 1228 if (r > 0)
1154 { 1229 {
1155 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1156 return true; 1231 return true;
1157 } 1232 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1234 {
1160#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1161 if (display->is_local) 1236 if (display->is_local)
1162 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1163#endif 1238#endif
1164 } 1239 }
1165 else 1240 else
1166 { 1241 {
1167 pty_ev.stop (); 1242 pty_ev.stop ();
1168 1243
1169 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1170 destroy (); 1245 destroy ();
1171 } 1246 }
1172 1247
1173 return false; 1248 return false;
1174} 1249}
1175 1250
1176void 1251void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1253{
1179 SET_R (this); 1254 make_current ();
1180 SET_LOCALE (locale);
1181 1255
1182 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1258 while (pty_fill ())
1185 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1190} 1264}
1191 1265
1192void 1266void
1193rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1194{ 1268{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1270 recolour_cursor ();
1197 1271
1198#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1273 hidden_pointer = 0;
1200 1274
1201 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1277#endif
1204} 1278}
1205 1279
1206#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1207void 1281void
1208rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1209{ 1283{
1210 if (! OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1211 return; 1285 return;
1212 1286
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1288 XFlush (dpy);
1215 1289
1216 hidden_pointer = 1; 1290 hidden_pointer = 1;
1217} 1291}
1218 1292
1219void 1293void
1220rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1221{ 1295{
1222 SET_R (this); 1296 make_current ();
1223 SET_LOCALE (locale);
1224 1297
1225 pointer_blank (); 1298 pointer_blank ();
1226} 1299}
1227#endif 1300#endif
1228 1301
… …
1293 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1294 (32 + x + 1), 1367 (32 + x + 1),
1295 (32 + y + 1)); 1368 (32 + y + 1));
1296} 1369}
1297 1370
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1371/*{{{ process an X event */
1309void 1372void
1310rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1311{ 1374{
1312 dDisp; 1375 make_current ();
1313 1376
1314 SET_R (this); 1377 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1378
1317#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1382 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1383
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // 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; 1385 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1387 unsigned int unused_mask;
1347 1388
1348 switch (ev.type) 1389 switch (ev.type)
1349 { 1390 {
1350 case KeyPress: 1391 case KeyPress:
1351#if ISO_14755 1392 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1393 break;
1357 1394
1358 case KeyRelease: 1395 case KeyRelease:
1359 { 1396 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 defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1421 if (!(ev.xkey.state & ControlMask))
1422 slip_wheel_ev.stop ();
1423 else if (ks == XK_Control_L || ks == XK_Control_R)
1424 mouse_slip_wheel_speed = 0;
1425#endif
1426 break; 1397 break;
1427 }
1428 1398
1429 case ButtonPress: 1399 case ButtonPress:
1430 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1431 break; 1401 break;
1432 1402
… …
1434 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1435 break; 1405 break;
1436 1406
1437 case ClientMessage: 1407 case ClientMessage:
1438 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1439 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1440 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1441 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1442 destroy (); 1418 destroy ();
1419 }
1443#if ENABLE_EWMH 1420#if ENABLE_EWMH
1444 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1445 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1446 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1447 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1448#endif 1436#endif
1449 } 1437 }
1450#if ENABLE_XEMBED
1451 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1452 {
1453 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1454 focus_in ();
1455 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1456 focus_out ();
1457 }
1458#endif
1459#ifdef OFFIX_DND
1460 /* OffiX Dnd (drag 'n' drop) protocol */
1461 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1462 && (ev.xclient.data.l[0] == DndFile
1463 || ev.xclient.data.l[0] == DndDir
1464 || ev.xclient.data.l[0] == DndLink))
1465 {
1466 /* Get Dnd data */
1467 Atom ActualType;
1468 int ActualFormat;
1469 unsigned char *data;
1470 unsigned long Size, RemainingBytes;
1471
1472 XGetWindowProperty (disp, display->root,
1473 xa[XA_DNDSELECTION],
1474 0L, 1000000L,
1475 False, AnyPropertyType,
1476 &ActualType, &ActualFormat,
1477 &Size, &RemainingBytes,
1478 &data);
1479 set_string_property (XA_CUT_BUFFER0, data);
1480 XFree (data);
1481 selection_paste (display->root, XA_CUT_BUFFER0, true);
1482 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1483 }
1484#endif /* OFFIX_DND */
1485 break;
1486
1487 case MappingNotify:
1488 XRefreshKeyboardMapping (&ev.xmapping);
1489 break; 1438 break;
1490 1439
1491 /* 1440 /*
1492 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1493 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1512 break; 1461 break;
1513 } 1462 }
1514 break; 1463 break;
1515 1464
1516 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1517 focus_in (); 1469 focus_in ();
1518 break; 1470 break;
1519 1471
1520 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1521 focus_out (); 1476 focus_out ();
1522 break; 1477 break;
1523 1478
1524 case ConfigureNotify: 1479 case ConfigureNotify:
1525 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1526 { 1481 {
1527 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1528 ; 1483 ;
1529 1484
1530 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1531 { 1486 {
1532 seen_resize = 1; 1487 seen_resize = 1;
1533 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef HAVE_BG_PIXMAP
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 resize_pixmap ();
1494 scr_touch (true);
1495 }
1496#endif
1534 } 1497 }
1535 1498
1536#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1537 if (OPTION (Opt_transparent)) 1502 if (option (Opt_transparent))
1538 check_our_parents (); 1503 check_our_parents ();
1539#endif 1504#endif
1540 } 1505 }
1541 break; 1506 break;
1542 1507
1543 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1544 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1545 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1546 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1547 1513
1548 break; 1514 break;
1549 1515
1550 case SelectionClear: 1516 case SelectionClear:
1551 selection_clear (); 1517 selection_clear ();
… …
1556 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1557 break; 1523 break;
1558 1524
1559 case SelectionRequest: 1525 case SelectionRequest:
1560 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1527 break;
1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1561 break; 1535 break;
1562 1536
1563 case UnmapNotify: 1537 case UnmapNotify:
1564 mapped = 0; 1538 mapped = 0;
1565#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1566 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1567#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1568 break; 1543 break;
1569 1544
1570 case MapNotify:
1571 mapped = 1;
1572#ifdef TEXT_BLINK
1573 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1574#endif
1575 break;
1576
1577#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1578 case ReparentNotify: 1546 case ReparentNotify:
1579 rootwin_cb (ev); 1547 rootwin_cb (ev);
1580 break; 1548 break;
1581#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1582 1550
1583 case GraphicsExpose: 1551 case GraphicsExpose:
1584 case Expose: 1552 case Expose:
1585 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1586 { 1554 {
1587 do 1555 do
1588 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1589 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1590 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1591 1559
1592 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1593 1561
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1595 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1596 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1597 1565
1598 scr_refresh (refresh_type); 1566 want_refresh = 1;
1599 } 1567 }
1600 else 1568 else
1601 { 1569 {
1602 XEvent unused_event; 1570 XEvent unused_event;
1603 1571
1604 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1605 ; 1573 ;
1606 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1607 ; 1575 ;
1608 1576
1609 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1610 { 1578 {
1611 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1612 scrollbar_show (0); 1580 scrollbar_show (0);
1613 } 1581 }
1614#ifdef MENUBAR
1615 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1616 menubar_expose ();
1617#endif
1618 1582
1619#ifdef TRANSPARENT 1583#ifdef ENABLE_TRANSPARENCY
1620 if (am_transparent && ev.xany.window == parent[0]) 1584 if (am_transparent && ev.xany.window == parent[0])
1621 XClearWindow (disp, ev.xany.window); 1585 XClearWindow (dpy, ev.xany.window);
1622#endif 1586#endif
1623 } 1587 }
1624 break; 1588 break;
1625 1589
1626 case MotionNotify: 1590 case MotionNotify:
1627#ifdef POINTER_BLANK 1591#ifdef POINTER_BLANK
1628 if (hidden_pointer) 1592 if (hidden_pointer)
1629 pointer_unblank (); 1593 pointer_unblank ();
1630#endif 1594#endif
1631#if MENUBAR
1632 if (isMenuBarWindow (ev.xany.window))
1633 {
1634 menubar_control (ev.xbutton);
1635 break;
1636 }
1637#endif
1638 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1639 break; 1596 break;
1640 1597
1641 if (ev.xany.window == vt) 1598 if (ev.xany.window == vt)
1642 { 1599 {
1600 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1643 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1601 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1644 ; // nop 1602 ; // nop
1645 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1603 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1646 { 1604 {
1647 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1605 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1648 ; 1606 ;
1649 1607
1650 XQueryPointer (disp, vt, 1608 XQueryPointer (dpy, vt,
1651 &unused_root, &unused_child, 1609 &unused_root, &unused_child,
1652 &unused_root_x, &unused_root_y, 1610 &unused_root_x, &unused_root_y,
1653 &ev.xbutton.x, &ev.xbutton.y, 1611 &ev.xbutton.x, &ev.xbutton.y,
1654 &ev.xbutton.state); 1612 &ev.xbutton.state);
1655#ifdef MOUSE_THRESHOLD 1613#ifdef MOUSE_THRESHOLD
… …
1719#endif 1677#endif
1720 } 1678 }
1721 } 1679 }
1722 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1723 { 1681 {
1724 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1725 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1726 ; 1684 ;
1727 1685
1728 XQueryPointer (disp, scrollBar.win, 1686 XQueryPointer (dpy, scrollBar.win,
1729 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1730 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1731 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1732 &unused_mask); 1690 &unused_mask);
1733 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1734 scrollbar_size ()); 1692 scrollbar_size ());
1735 scr_refresh (refresh_type);
1736 refresh_limit = 0; 1693 want_refresh = 1;
1737 scrollbar_show (1); 1694 scrollbar_show (1);
1738 } 1695 }
1739 break; 1696 break;
1740 } 1697 }
1698
1699#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1709 }
1710#endif
1711
1712#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 {
1715 if (ev.type == MotionNotify
1716 || ev.type == ButtonPress
1717 || ev.type == ButtonRelease)
1718 if (hidden_pointer)
1719 pointer_unblank ();
1720
1721 if (ev.type == KeyPress && hidden_pointer == 0)
1722 pointer_blank ();
1723 }
1724#endif
1741} 1725}
1742 1726
1743void 1727void
1744rxvt_term::focus_in () 1728rxvt_term::focus_in ()
1745{ 1729{
1746 if (!focus) 1730 if (!focus)
1747 { 1731 {
1748 focus = 1; 1732 focus = 1;
1749 want_refresh = 1; 1733 want_refresh = 1;
1750 1734
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1752 1736
1753#if USE_XIM 1737#if USE_XIM
1754 if (Input_Context != NULL) 1738 if (Input_Context != NULL)
1755 { 1739 {
1756 IMSetStatusPosition (); 1740 IMSetPosition ();
1757 XSetICFocus (Input_Context); 1741 XSetICFocus (Input_Context);
1758 } 1742 }
1759#endif 1743#endif
1760#if CURSOR_BLINK 1744#if CURSOR_BLINK
1761 if (OPTION (Opt_cursorBlink)) 1745 if (option (Opt_cursorBlink))
1762 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1763#endif 1747#endif
1764#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1766 { 1750 {
1767 pix_colors = pix_colors_focused; 1751 pix_colors = pix_colors_focused;
1768 scr_recolour (); 1752 scr_recolour ();
1769 } 1753 }
1770#endif 1754#endif
1755#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell))
1757 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]);
1761 if (h != NULL)
1762 {
1763 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h);
1765 }
1766 }
1767#endif
1771 } 1768 }
1772} 1769}
1773 1770
1774void 1771void
1775rxvt_term::focus_out () 1772rxvt_term::focus_out ()
… …
1783 1780
1784#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1782 if (iso14755buf)
1786 { 1783 {
1787 iso14755buf = 0; 1784 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1785# if ISO_14755
1789 scr_overlay_off (); 1786 scr_overlay_off ();
1790# endif 1787# endif
1791 } 1788 }
1792#endif 1789#endif
1793#if USE_XIM 1790#if USE_XIM
1794 if (Input_Context != NULL) 1791 if (Input_Context != NULL)
1795 XUnsetICFocus (Input_Context); 1792 XUnsetICFocus (Input_Context);
1796#endif 1793#endif
1797#if CURSOR_BLINK 1794#if CURSOR_BLINK
1798 if (OPTION (Opt_cursorBlink)) 1795 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1796 cursor_blink_ev.stop ();
1800 hidden_cursor = 0; 1797 hidden_cursor = 0;
1801#endif 1798#endif
1802#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
… …
1807 } 1804 }
1808#endif 1805#endif
1809 } 1806 }
1810} 1807}
1811 1808
1812#if TRANSPARENT 1809void
1810rxvt_term::update_fade_color (unsigned int idx)
1811{
1812#if OFF_FOCUS_FADING
1813 if (rs[Rs_fade])
1814 {
1815 rgba c;
1816 pix_colors [Color_fade].get (c);
1817 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1818 }
1819#endif
1820}
1821
1822#if ENABLE_TRANSPARENCY || ENABLE_PERL
1813void 1823void
1814rxvt_term::rootwin_cb (XEvent &ev) 1824rxvt_term::rootwin_cb (XEvent &ev)
1815{ 1825{
1816 SET_R (this); 1826 make_current ();
1817 SET_LOCALE (locale);
1818 1827
1828 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1829 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1832# if ENABLE_TRANSPARENCY
1819 switch (ev.type) 1833 switch (ev.type)
1820 { 1834 {
1821 case PropertyNotify: 1835 case PropertyNotify:
1822 /* 1836 /*
1823 * if user used some Esetroot compatible prog to set the root bg, 1837 * if user used some Esetroot compatible prog to set the root bg,
… …
1827 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1828 return; 1842 return;
1829 1843
1830 /* FALLTHROUGH */ 1844 /* FALLTHROUGH */
1831 case ReparentNotify: 1845 case ReparentNotify:
1832 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1846 if (option (Opt_transparent))
1833 want_refresh = want_full_refresh = 1; 1847 check_our_parents ();
1834 break; 1848 break;
1835 } 1849 }
1850# endif
1836} 1851}
1837#endif 1852#endif
1838 1853
1839void 1854void
1840rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
… …
1849 /* 1864 /*
1850 * VT window processing of button press 1865 * VT window processing of button press
1851 */ 1866 */
1852 if (ev.window == vt) 1867 if (ev.window == vt)
1853 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1854#if ISO_14755 1872#if ISO_14755
1855 // 5.4 1873 // 5.4
1856 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1857 { 1875 {
1858 iso14755_54 (ev.x, ev.y); 1876 iso14755_54 (ev.x, ev.y);
… …
1870#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1871 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1872 { 1890 {
1873 /* same button, within alloted time */ 1891 /* same button, within alloted time */
1874 MEvent.clicks++; 1892 MEvent.clicks++;
1893
1875 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1876 { 1895 {
1877 /* only report double clicks */ 1896 /* only report double clicks */
1878 MEvent.clicks = 2; 1897 MEvent.clicks = 2;
1879 mouse_report (ev); 1898 mouse_report (ev);
… …
1899 else 1918 else
1900 { 1919 {
1901 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1902 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1903 1922
1904 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1905 switch (ev.button) 1923 switch (ev.button)
1906 { 1924 {
1907 case Button1: 1925 case Button1:
1908 /* allow meta + click to select rectangular areas */ 1926 /* allow meta + click to select rectangular areas */
1909 /* should be done in screen.C */ 1927 /* should be done in screen.C */
1910#if ENABLE_FRILLS 1928#if ENABLE_FRILLS
1911 selection.rect = !!(ev.state & ModMetaMask); 1929 selection.rect = !!(ev.state & ModMetaMask);
1912#else 1930#else
1913 selection.rect = false; 1931 selection.rect = false;
1914#endif 1932#endif
1915 1933
1916 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1917 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1918 { 1936 {
1919 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1920 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1921 else 1939 else
1922 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
1923 } 1941 }
1924 else 1942 else
1925 { 1943 {
1926 if (MEvent.button == Button1 && clickintime) 1944 if (MEvent.button == Button1 && clickintime)
1927 MEvent.clicks++; 1945 MEvent.clicks++;
1928 else 1946 else
1929 MEvent.clicks = 1; 1947 MEvent.clicks = 1;
1930 1948
1931 selection_click (MEvent.clicks, ev.x, ev.y); 1949 selection_click (MEvent.clicks, ev.x, ev.y);
1932 } 1950 }
1933 1951
1934 MEvent.button = Button1; 1952 MEvent.button = Button1;
1935 break; 1953 break;
1936 1954
1937 case Button3: 1955 case Button3:
1938 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1939 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1940 else 1958 else
1941 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1942 1960
1943 MEvent.button = Button3; 1961 MEvent.button = Button3;
1944 break; 1962 break;
1945 } 1963 }
1946 } 1964 }
1947 1965
1948 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1949 return; 1967 return;
1950 } 1968 }
1951 1969
… …
2087 } 2105 }
2088 2106
2089 break; 2107 break;
2090 } 2108 }
2091 } 2109 }
2110
2092 return; 2111 return;
2093 } 2112 }
2094#if MENUBAR
2095 /*
2096 * Menubar window processing of button press
2097 */
2098 if (isMenuBarWindow (ev.window))
2099 menubar_control (ev);
2100#endif
2101} 2113}
2102 2114
2103void 2115void
2104rxvt_term::button_release (XButtonEvent &ev) 2116rxvt_term::button_release (XButtonEvent &ev)
2105{ 2117{
… …
2111 2123
2112 if (scrollbar_isUpDn ()) 2124 if (scrollbar_isUpDn ())
2113 { 2125 {
2114 scrollBar.setIdle (); 2126 scrollBar.setIdle ();
2115 scrollbar_show (0); 2127 scrollbar_show (0);
2116#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2117 refresh_type &= ~SMOOTH_REFRESH;
2118#endif
2119 } 2128 }
2120 2129
2121#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2122 if (sel_scroll_ev.active) 2131 if (sel_scroll_ev.active)
2123 sel_scroll_ev.stop(); 2132 sel_scroll_ev.stop();
2124#endif 2133#endif
2125 2134
2126 if (ev.window == vt) 2135 if (ev.window == vt)
2127 { 2136 {
2137 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2138 return;
2139
2128#if ISO_14755 2140#if ISO_14755
2129 // 5.4 2141 // 5.4
2130 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2131 return; 2143 return;
2132#endif 2144#endif
2145
2133 if (reportmode) 2146 if (reportmode)
2134 { 2147 {
2135 /* mouse report from vt window */ 2148 /* mouse report from vt window */
2136 /* don't report release of wheel "buttons" */ 2149 /* don't report release of wheel "buttons" */
2137 if (ev.button >= 4) 2150 if (ev.button >= 4)
… …
2161 if (priv_modes & PrivMode_mouse_report 2174 if (priv_modes & PrivMode_mouse_report
2162 && bypass_keystate 2175 && bypass_keystate
2163 && ev.button == Button1 && MEvent.clicks <= 1) 2176 && ev.button == Button1 && MEvent.clicks <= 1)
2164 selection_extend (ev.x, ev.y, 0); 2177 selection_extend (ev.x, ev.y, 0);
2165 2178
2166 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167 return;
2168
2169 switch (ev.button) 2179 switch (ev.button)
2170 { 2180 {
2171 case Button1: 2181 case Button1:
2172 case Button3: 2182 case Button3:
2173 selection_make (ev.time); 2183 selection_make (ev.time);
2174 break; 2184 break;
2185
2175 case Button2: 2186 case Button2:
2176 selection_request (ev.time, ev.x, ev.y); 2187 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2188 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2177 break; 2189 break;
2190
2178#ifdef MOUSE_WHEEL 2191#ifdef MOUSE_WHEEL
2179 case Button4: 2192 case Button4:
2180 case Button5: 2193 case Button5:
2181 { 2194 {
2182 int i; 2195 int i;
… …
2184 2197
2185 v = ev.button == Button4 ? UP : DN; 2198 v = ev.button == Button4 ? UP : DN;
2186 2199
2187 if (ev.state & ShiftMask) 2200 if (ev.state & ShiftMask)
2188 i = 1; 2201 i = 1;
2189 else if (OPTION (Opt_mouseWheelScrollPage)) 2202 else if (option (Opt_mouseWheelScrollPage))
2190 i = nrow - 1; 2203 i = nrow - 1;
2191 else 2204 else
2192 i = 5; 2205 i = 5;
2193 2206
2194# ifdef MOUSE_SLIP_WHEELING 2207# ifdef MOUSE_SLIP_WHEELING
… …
2204 slip_wheel_ev.start (); 2217 slip_wheel_ev.start ();
2205 } 2218 }
2206 else 2219 else
2207 { 2220 {
2208# endif 2221# endif
2209# ifdef JUMP_MOUSE_WHEEL
2210 scr_page (v, i); 2222 scr_page (v, i);
2211 scr_refresh (SMOOTH_REFRESH);
2212 scrollbar_show (1); 2223 scrollbar_show (1);
2213# else
2214 while (i--)
2215 {
2216 scr_page (v, 1);
2217 scr_refresh (SMOOTH_REFRESH);
2218 scrollbar_show (1);
2219 }
2220# endif
2221# ifdef MOUSE_SLIP_WHEELING 2224# ifdef MOUSE_SLIP_WHEELING
2222 } 2225 }
2223#endif 2226# endif
2224 } 2227 }
2225 break; 2228 break;
2226#endif 2229#endif
2227 } 2230 }
2228 } 2231 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2232}
2234
2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
2467/*
2468 * Check our parents are still who we think they are.
2469 * Do transparency updates if required
2470 */
2471int
2472rxvt_term::check_our_parents ()
2473{
2474 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after;
2476 Atom atype;
2477 unsigned char *prop = NULL;
2478 Window root, oldp, *list;
2479 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482
2483 pchanged = 0;
2484
2485 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */
2487
2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth;
2490
2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
2493 if (rootdepth != wattr.depth)
2494 {
2495 if (am_transparent)
2496 {
2497 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0;
2500 }
2501
2502 return pchanged; /* Don't try any more */
2503 }
2504
2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False);
2507
2508 /*
2509 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that.
2512 */
2513 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success);
2517
2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
2529 have_pixmap = 0;
2530 else
2531 {
2532 have_pixmap = 1;
2533 rootpixmap = *(Pixmap *)prop;
2534 XFree (prop);
2535 }
2536
2537 if (have_pixmap)
2538 {
2539 /*
2540 * Copy display->root pixmap transparency
2541 */
2542 int sx, sy, nx, ny;
2543 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height;
2553 nx = ny = 0;
2554
2555 if (sx < 0)
2556 {
2557 nw += sx;
2558 nx = -sx;
2559 sx = 0;
2560 }
2561
2562 if (sy < 0)
2563 {
2564 nh += sy;
2565 ny = -sy;
2566 sy = 0;
2567 }
2568
2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2573 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */
2578 allowedxerror = 0;
2579
2580 if (image == NULL)
2581 {
2582 if (am_transparent && am_pixmap_trans)
2583 {
2584 pchanged = 1;
2585 if (pixmap != None)
2586 {
2587 XFreePixmap (disp, pixmap);
2588 pixmap = None;
2589 }
2590 }
2591
2592 am_pixmap_trans = 0;
2593 }
2594 else
2595 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]);
2620
2621 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1;
2623
2624 am_transparent = am_pixmap_trans = 1;
2625 }
2626 }
2627
2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2631 {
2632 unsigned int n;
2633 /*
2634 * InheritPixmap transparency
2635 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 {
2638 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root,
2640 &parent[i], &list, &n);
2641 XFree (list);
2642
2643 if (parent[i] == display->root)
2644 {
2645 if (oldp != None)
2646 pchanged = 1;
2647
2648 break;
2649 }
2650
2651 if (oldp != parent[i])
2652 pchanged = 1;
2653 }
2654
2655 n = 0;
2656
2657 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++)
2660 {
2661 XGetWindowAttributes (disp, parent[n], &wattr);
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break;
2666 }
2667 }
2668 }
2669
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */
2676 }
2677 else
2678 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2691 am_transparent = 1;
2692 }
2693
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2712 return pchanged;
2713}
2714#endif
2715 2233
2716/*}}} */ 2234/*}}} */
2717 2235
2718bool 2236bool
2719rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2720{ 2238{
2721 bool flag = false; 2239 bool flag = false;
2722 unicode_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2724 2242
2725 for (;;) 2243 for (;;)
2726 { 2244 {
2727 if (ch == NOCHAR) 2245 if (ch == NOCHAR)
… …
2748 if (seen_resize && cmd_pid) 2266 if (seen_resize && cmd_pid)
2749 kill (-cmd_pid, SIGWINCH); 2267 kill (-cmd_pid, SIGWINCH);
2750 } 2268 }
2751 2269
2752 /* Read a text string from the input buffer */ 2270 /* Read a text string from the input buffer */
2753 unicode_t buf[UBUFSIZ]; 2271 wchar_t buf[UBUFSIZ];
2754 bool refreshnow = false; 2272 bool refreshnow = false;
2755 int nlines = 0; 2273 int nlines = 0;
2756 unicode_t *str = buf; 2274 wchar_t *str = buf;
2757 unicode_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758 2276
2759 for (;;) 2277 for (;;)
2760 { 2278 {
2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2762 break; 2280 break;
… …
2768 if (ch == C0_LF) 2286 if (ch == C0_LF)
2769 nlines++; 2287 nlines++;
2770 2288
2771 refresh_count++; 2289 refresh_count++;
2772 2290
2773 if (!OPTION (Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2292 {
2776 refreshnow = true;
2777 refresh_count = 0; 2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2296 {
2297 refreshnow = true;
2778 ch = NOCHAR; 2298 ch = NOCHAR;
2779 break; 2299 break;
2300 }
2780 } 2301 }
2781 2302
2782 // scr_add_lines only works for nlines <= nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2304 if (nlines >= nrow - 1)
2784 { 2305 {
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2787 2309
2788 nlines = 0; 2310 nlines = 0;
2789 str = buf; 2311 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2312 eol = str + min (ncol, UBUFSIZ);
2791 } 2313 }
… …
2805 2327
2806 seq_begin = cmdbuf_ptr; 2328 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2329 ch = next_char ();
2808 } 2330 }
2809 2331
2332 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, nlines, str - buf); 2334 scr_add_lines (buf, str - buf, nlines);
2812 2335
2813 /* 2336 /*
2814 * If there have been a lot of new lines, then update the screen 2337 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2816 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2817 * is incremented here because we must be doing flat-out scrolling.
2818 */ 2340 */
2819 if (refreshnow) 2341 if (refreshnow)
2820 { 2342 {
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++;
2823 else
2824 {
2825 flag = true; 2343 flag = true;
2826 scr_refresh (refresh_type); 2344 scr_refresh ();
2827 flush_ev.stop (); 2345 want_refresh = 1;
2828 }
2829 } 2346 }
2830 2347
2831 } 2348 }
2832 else 2349 else
2833 { 2350 {
… …
2847 } 2364 }
2848 2365
2849 return flag; 2366 return flag;
2850} 2367}
2851 2368
2852// read the next octet
2853unicode_t
2854rxvt_term::next_octet ()
2855{
2856 return cmdbuf_ptr < cmdbuf_endp
2857 ? *cmdbuf_ptr++
2858 : NOCHAR;
2859}
2860
2861// read the next character 2369// read the next character
2862unicode_t 2370wchar_t
2863rxvt_term::next_char () 2371rxvt_term::next_char () NOTHROW
2864{ 2372{
2865 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2866 { 2374 {
2867 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2877 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2878 break; 2386 break;
2879 } 2387 }
2880 2388
2881 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2882 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2883 2391
2884 // assume wchar == unicode 2392 // assume wchar == unicode
2885 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
2886 return wc & UNICODE_MASK; 2394 return wc & UNICODE_MASK;
2887 } 2395 }
2888 2396
2889 return NOCHAR; 2397 return NOCHAR;
2890} 2398}
2399
2400// read the next octet
2401uint32_t
2402rxvt_term::next_octet () NOTHROW
2403{
2404 return cmdbuf_ptr < cmdbuf_endp
2405 ? (unsigned char)*cmdbuf_ptr++
2406 : NOCHAR;
2407}
2408
2409static class out_of_input out_of_input;
2891 2410
2892/* rxvt_cmd_getc () - Return next input character */ 2411/* rxvt_cmd_getc () - Return next input character */
2893/* 2412/*
2894 * Return the next input character after first passing any keyboard input 2413 * Return the next input character after first passing any keyboard input
2895 * to the command. 2414 * to the command.
2896 */ 2415 */
2897unicode_t 2416wchar_t
2898rxvt_term::cmd_getc () 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2899{ 2418{
2900 unicode_t c = next_char (); 2419 wchar_t c = next_char ();
2901 2420
2902 if (c == NOCHAR) 2421 if (c == NOCHAR)
2903 throw out_of_input; 2422 throw out_of_input;
2904 2423
2905 return c; 2424 return c;
2906} 2425}
2907 2426
2908unicode_t 2427uint32_t
2909rxvt_term::cmd_get8 () 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 2429{
2911 unicode_t c = next_octet (); 2430 uint32_t c = next_octet ();
2912 2431
2913 if (c == NOCHAR) 2432 if (c == NOCHAR)
2914 throw out_of_input; 2433 throw out_of_input;
2915 2434
2916 return c; 2435 return c;
… …
2980 { 2499 {
2981 if ((buf[len++] = cmd_getc ()) == 'i') 2500 if ((buf[len++] = cmd_getc ()) == 'i')
2982 break; /* done = 1 */ 2501 break; /* done = 1 */
2983 } 2502 }
2984 } 2503 }
2985 2504
2986 for (i = 0; i < len; i++) 2505 for (i = 0; i < len; i++)
2987 if (putc (buf[i], fd) == EOF) 2506 if (putc (buf[i], fd) == EOF)
2988 { 2507 {
2989 done = 1; 2508 done = 1;
2990 break; 2509 break;
… …
3052 process_dcs_seq (); 2571 process_dcs_seq ();
3053 break; 2572 break;
3054 case 0x9b: /* CSI */ 2573 case 0x9b: /* CSI */
3055 process_csi_seq (); 2574 process_csi_seq ();
3056 break; 2575 break;
3057 case 0x9d: /* CSI */ 2576 case 0x9d: /* OSC */
3058 process_osc_seq (); 2577 process_osc_seq ();
3059 break; 2578 break;
3060#endif 2579#endif
3061 } 2580 }
3062} 2581}
… …
3152 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
3153 break; 2672 break;
3154 case '+': 2673 case '+':
3155 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
3156 break; 2675 break;
3157#if ENABLE_FRILLS 2676#if !ENABLE_MINIMAL
3158 case '6': 2677 case '6':
3159 scr_backindex (); 2678 scr_backindex ();
3160 break; 2679 break;
3161#endif 2680#endif
3162 case '7': 2681 case '7':
3163 scr_cursor (SAVE); 2682 scr_cursor (SAVE);
3164 break; 2683 break;
3165 case '8': 2684 case '8':
3166 scr_cursor (RESTORE); 2685 scr_cursor (RESTORE);
3167 break; 2686 break;
3168#if ENABLE_FRILLS 2687#if !ENABLE_MINIMAL
3169 case '9': 2688 case '9':
3170 scr_forwardindex (); 2689 scr_forwardindex ();
3171 break; 2690 break;
3172#endif 2691#endif
3173 case '=': 2692 case '=':
… …
3183 break; 2702 break;
3184 2703
3185 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
3186 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
3187 { 2706 {
3188 unicode_t nlcr[] = { C0_LF, C0_CR }; 2707 wchar_t nlcr[] = { C0_LF, C0_CR };
3189 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3190 } 2709 }
3191 break; 2710 break;
3192 2711
3193 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
3194 case C1_ESA: /* ESC G */ 2713 case C1_ESA: /* ESC G */
… …
3290 unicode_t ch, priv, i; 2809 unicode_t ch, priv, i;
3291 unsigned int nargs, p; 2810 unsigned int nargs, p;
3292 int n, ndef; 2811 int n, ndef;
3293 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
3294 2813
3295 for (nargs = ESC_ARGS; nargs > 0;) 2814 memset (arg, 0, sizeof (arg));
3296 arg[--nargs] = 0; 2815 nargs = 0;
3297 2816
3298 priv = 0; 2817 priv = 0;
3299 ch = cmd_getc (); 2818 ch = cmd_getc ();
3300 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
3301 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
… …
3335 ndef = get_byte_array_bit (csi_defaults, i); 2854 ndef = get_byte_array_bit (csi_defaults, i);
3336 for (p = 0; p < nargs; p++) 2855 for (p = 0; p < nargs; p++)
3337 if (arg[p] == -1) 2856 if (arg[p] == -1)
3338 arg[p] = ndef; 2857 arg[p] = ndef;
3339 2858
3340#ifdef DEBUG_CMD
3341 fprintf (stderr, "CSI ");
3342 for (p = 0; p < nargs; p++)
3343 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344 fprintf (stderr, "%c\n", ch);
3345#endif
3346
3347 /* 2859 /*
3348 * private mode handling 2860 * private mode handling
3349 */ 2861 */
3350 if (priv) 2862 if (priv)
3351 { 2863 {
3352 switch (priv) 2864 switch (priv)
3353 { 2865 {
3354 case '>': 2866 case '>':
3355 if (ch == CSI_DA) /* secondary device attributes */ 2867 if (ch == CSI_DA) /* secondary device attributes */
3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2868 {
2869 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2870 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2871 //
2872 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2873 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2874 // that we do not support xterm mouse reporting (should be 95 when we do).
2875 //
2876 tt_printf ("\033[>%d;94;0c", 'U');
2877 }
3357 break; 2878 break;
3358 case '?': 2879 case '?':
3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
3361 break; 2882 break;
… …
3487 break; 3008 break;
3488 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
3489 scr_report_position (); 3010 scr_report_position ();
3490 break; 3011 break;
3491 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3492 if (OPTION (Opt_insecure)) 3013 if (option (Opt_insecure))
3493 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3494 break; 3015 break;
3495 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3497 break; 3018 break;
… …
3564 break; 3085 break;
3565 case CSI_75: 3086 case CSI_75:
3566 scr_cursor (RESTORE); 3087 scr_cursor (RESTORE);
3567 break; 3088 break;
3568 3089
3569#if ENABLE_FRILLS 3090#if !ENABLE_MINIMAL
3570 case CSI_74: 3091 case CSI_74:
3571 process_window_ops (arg, nargs); 3092 process_window_ops (arg, nargs);
3572 break; 3093 break;
3573#endif 3094#endif
3574 3095
… …
3581 break; 3102 break;
3582 } 3103 }
3583} 3104}
3584/*}}} */ 3105/*}}} */
3585 3106
3586#if ENABLE_FRILLS 3107#if !ENABLE_MINIMAL
3587/* ARGSUSED */ 3108/* ARGSUSED */
3588void 3109void
3589rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3110rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590{ 3111{
3591 int x, y; 3112 int x, y;
3592 XWindowAttributes wattr; 3113 XWindowAttributes wattr;
3593 Window wdummy; 3114 Window wdummy;
3594 dDisp; 3115
3116 dLocal (Display *, dpy);
3595 3117
3596 if (nargs == 0) 3118 if (nargs == 0)
3597 return; 3119 return;
3598 3120
3599 switch (args[0]) 3121 switch (args[0])
3600 { 3122 {
3601 /* 3123 /*
3602 * commands 3124 * commands
3603 */ 3125 */
3604 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3605 XMapWindow (disp, parent[0]); 3127 XMapWindow (dpy, parent[0]);
3606 break; 3128 break;
3607 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3608 XIconifyWindow (disp, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent[0], display->screen);
3609 break; 3131 break;
3610 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3611 XMoveWindow (disp, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent[0], args[1], args[2]);
3612 break; 3134 break;
3613 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615 break; 3137 break;
3616 case 5: /* raise window */ 3138 case 5: /* raise window */
3617 XRaiseWindow (disp, parent[0]); 3139 XRaiseWindow (dpy, parent[0]);
3618 break; 3140 break;
3619 case 6: /* lower window */ 3141 case 6: /* lower window */
3620 XLowerWindow (disp, parent[0]); 3142 XLowerWindow (dpy, parent[0]);
3621 break; 3143 break;
3622 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3623 scr_touch (true); 3145 scr_touch (true);
3624 break; 3146 break;
3625 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3632 if (args[0] >= 24) /* set height (chars) */ 3154 if (args[0] >= 24) /* set height (chars) */
3633 set_widthheight ((unsigned int)width, 3155 set_widthheight ((unsigned int)width,
3634 (unsigned int) (args[1] * fheight)); 3156 (unsigned int) (args[1] * fheight));
3635 break; 3157 break;
3636 3158
3637
3638 /* 3159 /*
3639 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3640 */ 3161 */
3641 case 11: /* report window state */ 3162 case 11: /* report window state */
3642 XGetWindowAttributes (disp, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent[0], &wattr);
3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644 break; 3165 break;
3645 case 13: /* report window position */ 3166 case 13: /* report window position */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
3647 XTranslateCoordinates (disp, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent[0], wattr.root,
3648 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3649 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3650 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3651 break; 3172 break;
3652 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655 break; 3176 break;
3656 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break; 3179 break;
… …
3660 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661 break; 3182 break;
3662 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3663 { 3184 {
3664 char *s; 3185 char *s;
3665 XGetIconName (disp, parent[0], &s); 3186 XGetIconName (dpy, parent[0], &s);
3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s); 3188 XFree (s);
3668 } 3189 }
3669 break; 3190 break;
3670 case 21: /* report window title */ 3191 case 21: /* report window title */
3671 { 3192 {
3672 char *s; 3193 char *s;
3673 XFetchName (disp, parent[0], &s); 3194 XFetchName (dpy, parent[0], &s);
3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675 XFree (s); 3196 XFree (s);
3676 } 3197 }
3677 break; 3198 break;
3678 } 3199 }
3679} 3200}
… …
3706 seen_esc = true; 3227 seen_esc = true;
3707 continue; 3228 continue;
3708 } 3229 }
3709 else if (ch == C0_BEL || ch == CHAR_ST) 3230 else if (ch == C0_BEL || ch == CHAR_ST)
3710 break; 3231 break;
3232 else if (ch == C0_SYN)
3233 ch = cmd_get8 ();
3711 else if (ch < 0x20) 3234 else if (ch < 0x20)
3712 return NULL; /* other control character - exit */ 3235 return NULL; /* other control character - exit */
3713 3236
3714 seen_esc = false; 3237 seen_esc = false;
3715 3238
3716 if (n >= STRING_MAX - 1) 3239 if (n >= STRING_MAX - 1)
3717 // stop at some sane length 3240 // stop at some sane length
3718 return NULL; 3241 return NULL;
3719 3242
3720 if (ch == C0_SYN)
3721 string[n++] = cmd_get8 ();
3722 else
3723 string[n++] = ch; 3243 string[n++] = ch;
3724 } 3244 }
3725 3245
3726 string[n++] = '\0'; 3246 string[n++] = '\0';
3727 3247
3728 ends_how = (ch == 0x5c ? C0_ESC : ch); 3248 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3779void 3299void
3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3300rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781{ 3301{
3782 if (str[0] == '?' && !str[1]) 3302 if (str[0] == '?' && !str[1])
3783 { 3303 {
3784 unsigned short r, g, b; 3304 rgba c;
3785 pix_colors_focused[color].get (display, r, g, b); 3305 pix_colors_focused[color].get (c);
3306
3307#if XFT
3308 if (c.a != rgba::MAX_CC)
3309 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3310 else
3311#endif
3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3312 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3787 } 3313 }
3788 else 3314 else
3789 set_window_color (color, str); 3315 set_window_color (color, str);
3790} 3316}
3791 3317
… …
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3319 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3320 */
3795void 3321void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3322rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797{ 3323{
3798 int changed = 0;
3799 int color; 3324 int color;
3800 char *buf, *name; 3325 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3326 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3327 int saveop = op;
3803 dDisp; 3328
3329 dLocal (Display *, dpy);
3804 3330
3805 assert (str != NULL); 3331 assert (str != NULL);
3332
3333 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3334 return;
3335
3806 switch (op) 3336 switch (op)
3807 { 3337 {
3808 case XTerm_name: 3338 case XTerm_name:
3809 set_title (str); 3339 set_title (str);
3810 /* FALLTHROUGH */ 3340 /* FALLTHROUGH */
… …
3824 unsigned long bytes_after; 3354 unsigned long bytes_after;
3825 unsigned char *value = 0; 3355 unsigned char *value = 0;
3826 const char *str = ""; 3356 const char *str = "";
3827 3357
3828 if (prop 3358 if (prop
3829 && XGetWindowProperty (disp, parent[0], 3359 && XGetWindowProperty (dpy, parent[0],
3830 prop, 0, 1<<16, 0, AnyPropertyType, 3360 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format, 3361 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success 3362 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None 3363 && actual_type != None
3834 && actual_format == 8) 3364 && actual_format == 8)
3835 str = (const char *)(value); 3365 str = (const char *)(value);
3836 3366
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3367 tt_printf ("\033]%d;%s%c", op, str, resp);
3838 3368
3839 XFree (value); 3369 XFree (value);
3840 } 3370 }
3841 else 3371 else
3842 { 3372 {
… …
3846 { 3376 {
3847 *eq = 0; 3377 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1); 3378 set_utf8_property (display->atom (str), eq + 1);
3849 } 3379 }
3850 else 3380 else
3851 XDeleteProperty (disp, parent[0], 3381 XDeleteProperty (dpy, parent[0],
3852 display->atom (str)); 3382 display->atom (str));
3853 } 3383 }
3854 break; 3384 break;
3855 3385
3856 case XTerm_Color: 3386 case XTerm_Color:
… …
3858 { 3388 {
3859 if ((name = strchr (buf, ';')) == NULL) 3389 if ((name = strchr (buf, ';')) == NULL)
3860 break; 3390 break;
3861 3391
3862 *name++ = '\0'; 3392 *name++ = '\0';
3863 color = atoi (buf); 3393 color = atoi (buf) + minCOLOR;
3864 3394
3865 if (color < 0 || color >= TOTAL_COLORS) 3395 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3396 break;
3867 3397
3868 if ((buf = strchr (name, ';')) != NULL) 3398 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3399 *buf++ = '\0';
3870 3400
3871 if (name[0] == '?' && !name[1]) 3401 process_color_seq (op, color, name, resp);
3872 {
3873 unsigned short r, g, b;
3874 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 }
3877 else
3878 set_window_color (color + minCOLOR, name);
3879 } 3402 }
3880 break; 3403 break;
3881 case XTerm_Color00: 3404 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3405 process_color_seq (op, Color_fg, str, resp);
3883 break; 3406 break;
3884 case XTerm_Color01: 3407 case XTerm_Color01:
3885 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3408 process_color_seq (op, Color_bg, str, resp);
3886 break; 3409 break;
3887#ifndef NO_CURSORCOLOR 3410#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 3411 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3412 process_color_seq (op, Color_cursor, str, resp);
3890 break; 3413 break;
3891#endif 3414#endif
3892 case XTerm_Color_pointer_fg: 3415 case XTerm_Color_pointer_fg:
3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3416 process_color_seq (op, Color_pointer_fg, str, resp);
3894 break; 3417 break;
3895 case XTerm_Color_pointer_bg: 3418 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3419 process_color_seq (op, Color_pointer_bg, str, resp);
3897 break; 3420 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_BD:
3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901 break;
3902 case XTerm_Color_UL:
3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904 break;
3905 case XTerm_Color_RV: 3422 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3423 process_color_seq (op, Color_RV, str, resp);
3424 break;
3425 case Rxvt_Color_BD:
3426 case URxvt_Color_BD:
3427 process_color_seq (op, Color_BD, str, resp);
3428 break;
3429 case Rxvt_Color_UL:
3430 case URxvt_Color_UL:
3431 process_color_seq (op, Color_UL, str, resp);
3907 break; 3432 break;
3908 case URxvt_Color_IT: 3433 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3434 process_color_seq (op, Color_IT, str, resp);
3910 break; 3435 break;
3911#endif 3436#endif
3912#if TRANSPARENT && TINTING 3437#if ENABLE_TRANSPARENCY && TINTING
3913 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3440
3915 check_our_parents (); 3441 check_our_parents ();
3442
3916 if (am_transparent) 3443 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3444 want_full_refresh = want_refresh = 1;
3918 break;
3919#endif
3920 3445
3921 case XTerm_Pixmap: 3446 break;
3922 if (*str != ';') 3447#endif
3923 { 3448
3924#if XPM_BACKGROUND 3449#if XPM_BACKGROUND
3450 case Rxvt_Pixmap:
3451 {
3452 if (*str != ';')
3453 {
3925 scale_pixmap (""); /* reset to default scaling */ 3454 bgPixmap.handle_geometry (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3455 set_bgPixmap (str); /* change pixmap */
3927#endif
3928 scr_touch (true); 3456 scr_touch (true);
3929 } 3457 }
3458
3459 int changed = 0;
3460
3930 while ((str = strchr (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3931 { 3462 {
3932 str++; 3463 str++;
3933#if XPM_BACKGROUND 3464 changed += bgPixmap.handle_geometry (str);
3934 changed += scale_pixmap (str);
3935#endif
3936 } 3465 }
3937 3466
3938 if (changed) 3467 if (changed)
3939 { 3468 {
3940#ifdef XPM_BACKGROUND
3941 resize_pixmap (); 3469 resize_pixmap ();
3942#endif
3943 scr_touch (true); 3470 scr_touch (true);
3944 } 3471 }
3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473 if (option (Opt_transparent))
3474 check_our_parents ();
3475#endif
3476 }
3945 break; 3477 break;
3478#endif
3946 3479
3947 case XTerm_restoreFG: 3480 case Rxvt_restoreFG:
3948 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3949 break; 3482 break;
3950 case XTerm_restoreBG: 3483 case Rxvt_restoreBG:
3951 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3952 break; 3485 break;
3953 3486
3954 case XTerm_logfile: 3487 case XTerm_logfile:
3955 // TODO, when secure mode? 3488 // TODO, when secure mode?
3956 break; 3489 break;
3957 3490
3958#ifdef MENUBAR
3959 case URxvt_Menu:
3960 if (OPTION (Opt_insecure))
3961 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962 break;
3963#endif
3964#if 0 3491#if 0
3965 case XTerm_dumpscreen: /* no error notices */ 3492 case Rxvt_dumpscreen: /* no error notices */
3966 { 3493 {
3967 int fd; 3494 int fd;
3968 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3495 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3969 { 3496 {
3970 scr_dump (fd); 3497 scr_dump (fd);
… …
3981 case URxvt_italicFont: 3508 case URxvt_italicFont:
3982 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3983#endif 3510#endif
3984 if (query) 3511 if (query)
3985 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3986 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3987 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
3988 resp); 3515 resp);
3989 else 3516 else
3990 { 3517 {
3991 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3994 allocated.push_back ((void *)res); 3521 allocated.push_back ((void *)res);
3995 set_fonts (); 3522 set_fonts ();
3996 } 3523 }
3997 break; 3524 break;
3998 3525
3999#if ENABLE_FRILLS 3526 case URxvt_version:
3527 if (query)
3528 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3529 op,
3530 rs[Rs_name], VERSION[0], VERSION[2],
3531 resp);
3532 break;
3533
3534#if !ENABLE_MINIMAL
4000 case URxvt_locale: 3535 case URxvt_locale:
4001 if (query) 3536 if (query)
4002 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3537 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4003 else 3538 else
4004 { 3539 {
4005 set_locale (str); 3540 set_locale (str);
4006 pty.set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
4007 init_xlocale (); 3542 init_xlocale ();
4008 } 3543 }
4009 break; 3544 break;
4010 3545
4011 case URxvt_view_up: 3546 case URxvt_view_up:
… …
4022 break; 3557 break;
4023#endif 3558#endif
4024 3559
4025#if ENABLE_PERL 3560#if ENABLE_PERL
4026 case URxvt_perl: 3561 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4028 ; // no responses yet 3563 ; // no responses yet
4029 break; 3564 break;
4030#endif 3565#endif
4031 } 3566 }
4032} 3567}
… …
4064 return state; 3599 return state;
4065} 3600}
4066 3601
4067/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
4068void 3603void
4069rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4070{ 3605{
4071 unsigned int i, j; 3606 unsigned int i, j;
4072 int state; 3607 int state;
4073 3608
4074 static const struct 3609 static const struct
… …
4085 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
4086 { 6, PrivMode_relOrigin }, 3621 { 6, PrivMode_relOrigin },
4087 { 7, PrivMode_Autowrap }, 3622 { 7, PrivMode_Autowrap },
4088 // 8, bi-directional support mode 3623 // 8, bi-directional support mode
4089 { 9, PrivMode_MouseX10 }, 3624 { 9, PrivMode_MouseX10 },
4090#ifdef menuBar_esc
4091 { menuBar_esc, PrivMode_menuBar },
4092#endif
4093 // 18, 19 printing-related 3625 // 18, 19 printing-related
4094 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor },
4095#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
4096 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
4097#endif 3629#endif
… …
4144 /* extra handling for values with state unkept */ 3676 /* extra handling for values with state unkept */
4145 switch (arg[i]) 3677 switch (arg[i])
4146 { 3678 {
4147#if ENABLE_STYLES 3679#if ENABLE_STYLES
4148 case 1021: 3680 case 1021:
4149 if (mode) 3681 set_option (Opt_intensityStyles, mode);
4150 SET_OPTION (Opt_intensityStyles);
4151 else
4152 CLR_OPTION (Opt_intensityStyles);
4153 3682
4154 scr_touch (true); 3683 scr_touch (true);
4155 break; 3684 break;
4156#endif 3685#endif
4157 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4158 case 1049: 3687 case 1049:
4159 if (OPTION (Opt_secondaryScreen)) 3688 if (option (Opt_secondaryScreen))
4160 if (mode == 0) 3689 if (mode == 0)
4161 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4162 else if (mode == 1) 3691 else if (mode == 1)
4163 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4164 break; 3693 break;
… …
4179 case 3: /* 80/132 */ 3708 case 3: /* 80/132 */
4180 if (priv_modes & PrivMode_132OK) 3709 if (priv_modes & PrivMode_132OK)
4181 set_widthheight (((state ? 132 : 80) * fwidth), height); 3710 set_widthheight (((state ? 132 : 80) * fwidth), height);
4182 break; 3711 break;
4183 case 4: /* smooth scrolling */ 3712 case 4: /* smooth scrolling */
4184 if (!state) 3713 set_option (Opt_jumpScroll, !state);
4185 SET_OPTION (Opt_jumpScroll);
4186 else
4187 CLR_OPTION (Opt_jumpScroll);
4188 break; 3714 break;
4189 case 5: /* reverse video */ 3715 case 5: /* reverse video */
4190 scr_rvideo_mode (state); 3716 scr_rvideo_mode (state);
4191 break; 3717 break;
4192 case 6: /* relative/absolute origins */ 3718 case 6: /* relative/absolute origins */
… …
4198 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
4199 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
4200 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~PrivMode_MouseX11;
4202 break; 3728 break;
4203#ifdef menuBar_esc
4204 case menuBar_esc:
4205#ifdef MENUBAR
4206 map_menuBar (state);
4207#endif
4208 break;
4209#endif
4210#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
4211 case scrollBar_esc: 3730 case scrollBar_esc:
4212 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
4213 { 3732 {
4214 resize_all_windows (0, 0, 0); 3733 resize_all_windows (0, 0, 0);
… …
4233#if 0 3752#if 0
4234 case 1001: 3753 case 1001:
4235 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
4236#endif 3755#endif
4237 case 1010: /* scroll to bottom on TTY output inhibit */ 3756 case 1010: /* scroll to bottom on TTY output inhibit */
4238 if (!state) 3757 set_option (Opt_scrollTtyOutput, !state);
4239 SET_OPTION (Opt_scrollTtyOutput);
4240 else
4241 CLR_OPTION (Opt_scrollTtyOutput);
4242 break; 3758 break;
4243 case 1011: /* scroll to bottom on key press */ 3759 case 1011: /* scroll to bottom on key press */
4244 if (state) 3760 set_option (Opt_scrollTtyKeypress, state);
4245 SET_OPTION (Opt_scrollTtyKeypress);
4246 else
4247 CLR_OPTION (Opt_scrollTtyKeypress);
4248 break; 3761 break;
4249 case 1047: /* secondary screen w/ clearing last */ 3762 case 1047: /* secondary screen w/ clearing last */
4250 if (OPTION (Opt_secondaryScreen)) 3763 if (option (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 3764 if (current_screen != PRIMARY)
4252 scr_erase_screen (2); 3765 scr_erase_screen (2);
4253 scr_change_screen (state); 3766 scr_change_screen (state);
4254 break; 3767 break;
4255 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
4256 scr_change_screen (state); 3769 scr_change_screen (state);
4257 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4259 scr_erase_screen (2); 3772 scr_erase_screen (2);
4260 break; 3773 break;
4261 default: 3774 default:
4262 break; 3775 break;
… …
4390 scr_color (Color_bg, Color_bg); 3903 scr_color (Color_bg, Color_bg);
4391 break; 3904 break;
4392 3905
4393 //case 50: // not variable spacing 3906 //case 50: // not variable spacing
4394 3907
4395#if ENABLE_FRILLS 3908#if !ENABLE_MINIMAL
4396 case 90: 3909 case 90:
4397 case 91: /* set bright fg color */ 3910 case 91: /* set bright fg color */
4398 case 92: 3911 case 92:
4399 case 93: 3912 case 93:
4400 case 94: 3913 case 94:
… …
4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3975const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463 3976
4464void 3977void
4465rxvt_term::tt_write (const char *data, unsigned int len) 3978rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 3979{
4467 if (pty.pty < 0) 3980 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468 return; 3981 return;
4469 3982
3983 if (pty->pty < 0)
3984 return;
3985
4470 if (v_buflen == 0) 3986 if (v_buflen == 0)
4471 { 3987 {
4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3988 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4473 3989
4474 if ((unsigned int)written == len) 3990 if ((unsigned int)written == len)
4475 return; 3991 return;
4476 3992
4477 data += written; 3993 data += written;
… …
4486 pty_ev.set (EVENT_READ | EVENT_WRITE); 4002 pty_ev.set (EVENT_READ | EVENT_WRITE);
4487} 4003}
4488 4004
4489void rxvt_term::pty_write () 4005void rxvt_term::pty_write ()
4490{ 4006{
4491 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4007 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4492 4008
4493 if (written > 0) 4009 if (written > 0)
4494 { 4010 {
4495 v_buflen -= written; 4011 v_buflen -= written;
4496 4012

Diff Legend

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