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.209 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 2006 UTC

… …
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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
… …
57#include <csignal> 58#include <csignal>
58 59
59/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
60 61
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 63
66#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
67 65
68#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 133rxvt_term::iso14755_54 (int x, int y)
136{ 134{
137 x = Pixel2Col (x); 135 x = Pixel2Col (x);
138 y = Pixel2Row (y); 136 y = Pixel2Row (y);
139 137
140 if (x < 0 || x >= ncol 138 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= nrow) 139 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 140 return;
143 141
144 for (;;) 142 for (;;)
145 { 143 {
146 const line_t &l = save[y + saveLines - view_start]; 144 const line_t &l = ROW(y + view_start);
147 145
148 text_t t = l.t[x]; 146 text_t t = l.t[x];
149 147
150 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
151 { 149 {
152 iso14755_51 (l.t[x], l.r[x]); 150 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 151 iso14755buf = ISO_14755_54;
154 break; 152 break;
155 } 153 }
156 154
157 x--; 155 x--;
158 } 156 }
159
160} 157}
161#endif
162 158
163#if ENABLE_OVERLAY
164void 159void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 160rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 161{
167 rxvt_fontset *fs = FONTSET (r); 162 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)]; 163 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 164 wchar_t *chr, *alloc, ch2, *fname;
170 int len; 165 int len;
171 166
172 fname = rxvt_utf8towcs (f->name); 167 fname = rxvt_utf8towcs (f->name);
173 168
174#if ENABLE_COMBINING 169# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 170 if (IS_COMPOSE (ch))
176 { 171 {
177 len = rxvt_composite.expand (ch, 0); 172 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len]; 173 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr); 174 rxvt_composite.expand (ch, chr);
180 } 175 }
181 else 176 else
182#endif 177# endif
183 { 178 {
184 ch2 = ch; 179 ch2 = ch;
185 180
186 alloc = 0; 181 alloc = 0;
187 chr = &ch2; 182 chr = &ch2;
188 len = 1; 183 len = 1;
189 } 184 }
190 185
186 char attr[80]; // plenty
187
188 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
189 (int)r,
190 fgcolor_of (r), bgcolor_of (r),
191 r & RS_Bold ? " bold" : "",
192 r & RS_Italic ? " italic" : "",
193 r & RS_Blink ? " blink" : "",
194 r & RS_RVid ? " rvid" : "",
195 r & RS_Uline ? " uline" : "",
196 r & RS_Careful ? " careful" : "");
197
191 int width = wcswidth (fname, wcslen (fname)); 198 int width = wcswidth (fname, wcslen (fname));
192 199
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 200 max_it (width, 8+5); // for char + hey
201 max_it (width, strlen (attr));
202
203 if (y >= 0)
204 {
205 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
206 x = 0;
207 }
208
209 scr_overlay_new (x, y, width, len + 2);
194 210
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 211 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196 212
197 for (int y = 0; y < len; y++) 213 for (int y = 0; y < len; y++)
198 { 214 {
… …
201 ch = *chr++; 217 ch = *chr++;
202 218
203 sprintf (buf, "%8x", ch); 219 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf); 220 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '='); 221 scr_overlay_set (9, y, '=');
206#if !UNICODE3 222# if !UNICODE3
207 if (ch >= 0x10000) 223 if (ch >= 0x10000)
208 ch = 0xfffd; 224 ch = 0xfffd;
209#endif 225# endif
210 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
211 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
212 } 230 }
213 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
237 scr_overlay_set (0, len , attr);
214 scr_overlay_set (0, len, fname); 238 scr_overlay_set (0, len + 1, fname);
215 239
216 free (fname); 240 free (fname);
217 241
218#if ENABLE_COMBINING 242# if ENABLE_COMBINING
219 if (alloc) 243 if (alloc)
220 delete [] alloc; 244 delete [] alloc;
221#endif 245# endif
222} 246}
223#endif 247#endif
224 248
225void 249void
226rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
243 mb[0] = ch[0]; 267 mb[0] = ch[0];
244 len = 1; 268 len = 1;
245 } 269 }
246 270
247 if (len > 0) 271 if (len > 0)
248 tt_write ((unsigned char *)mb, len); 272 tt_write (mb, len);
249 else 273 else
250 scr_bell (); 274 scr_bell ();
251 } 275 }
252 276
253 iso14755buf = 0; 277 iso14755buf = 0;
… …
277rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
278{ 302{
279 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
280 unsigned int newlen; 304 unsigned int newlen;
281 KeySym keysym; 305 KeySym keysym;
282#ifdef DEBUG_CMD
283 static int debug_key = 1; /* accessible by a debugger only */
284#endif
285 int valid_keysym; 306 int valid_keysym;
286 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
287 308
288 /* 309 /*
289 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
290 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
291 * 312 *
… …
309 Status status_return; 330 Status status_return;
310 331
311#if 0 332#if 0
312#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
313 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
314 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
315 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
316 else 337 else
317#endif 338#endif
318#endif 339#endif
319 { 340 {
… …
356 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
357 } 378 }
358 else 379 else
359#endif 380#endif
360 { 381 {
361 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
362 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
363 } 384 }
364 385
365 if (valid_keysym) 386 if (valid_keysym)
366 { 387 {
… …
418 scr_move_to (0, 1); 439 scr_move_to (0, 1);
419 return; 440 return;
420 } 441 }
421 else if (keysym == XK_End) 442 else if (keysym == XK_End)
422 { 443 {
423 scr_move_to (1, 0); 444 scr_move_to (1, 1);
424 return; 445 return;
425 } 446 }
426 } 447 }
427#endif 448#endif
428 } 449 }
… …
439 { 460 {
440 switch (keysym) 461 switch (keysym)
441 { 462 {
442 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
443 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
444 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
445 return; 466 return;
446#if TODO 467#if TODO
447 /* rxvt extras */ 468 /* rxvt extras */
448 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
449 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
830 { 851 {
831#ifdef META8_OPTION 852#ifdef META8_OPTION
832 /* set 8-bit on */ 853 /* set 8-bit on */
833 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
834 { 855 {
835 unsigned char *ch; 856 char *ch;
836 857
837 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
838 *ch |= 0x80; 859 *ch |= 0x80;
839 860
840 meta = 0; 861 meta = 0;
… …
842#endif 863#endif
843 /* nil */ ; 864 /* nil */ ;
844 } 865 }
845 } 866 }
846 867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870
847 if (len <= 0) 871 if (len <= 0)
848 return; /* not mapped */ 872 return; /* not mapped */
849 873
850 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
851 if (view_start) 875 if (view_start)
852 { 876 {
853 view_start = 0; 877 view_start = 0;
854 want_refresh = 1; 878 want_refresh = 1;
855 } 879 }
… …
873#ifdef META8_OPTION 897#ifdef META8_OPTION
874 && meta_char == C0_ESC 898 && meta_char == C0_ESC
875#endif 899#endif
876 ) 900 )
877 { 901 {
878 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
879 tt_write (&ch, 1); 903 tt_write (&ch, 1);
880 } 904 }
881 905
882#if defined(DEBUG_CMD)
883 /* Display keyboard buffer contents */
884 unsigned char *p;
885 int i;
886
887 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
888 for (i = 0, p = kbuf; i < len; i++, p++)
889 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
890 fprintf (stderr, "'\n");
891#endif /* DEBUG_CMD */
892 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
893} 907}
894/*}}} */ 908/*}}} */
895 909
896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
898/* attempt to `write' count to the input buffer */
899unsigned int 911unsigned int
900rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
901{ 913{
902 unsigned int n, s; 914 unsigned int n, s;
903 915
904 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
905 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
942 } 954 }
943#endif 955#endif
944 956
945 if (want_refresh) 957 if (want_refresh)
946 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
947 scr_refresh (refresh_type); 997 scr_refresh ();
948 scrollbar_show (1); 998 scrollbar_show (1);
949#ifdef USE_XIM 999#ifdef USE_XIM
950 IMSendSpot (); 1000 IMSendSpot ();
951#endif 1001#endif
952 } 1002 }
… …
955} 1005}
956 1006
957void 1007void
958rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
959{ 1009{
960 SET_R (this); 1010 make_current ();
961 SET_LOCALE (locale);
962 1011
963 display->flush (); 1012 display->flush ();
964 1013
965 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
966 flush_ev.start (NOW + 0.01); 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
967} 1016}
968 1017
969void 1018void
970rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
971{ 1020{
972 SET_R (this); 1021 make_current ();
973 SET_LOCALE (locale);
974 1022
975 refresh_limit = 1; 1023 refresh_limit = 1;
976 refresh_count = 0; 1024 refresh_count = 0;
977 flush (); 1025 flush ();
978} 1026}
… …
982rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
983{ 1031{
984 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
985 want_refresh = 1; 1033 want_refresh = 1;
986 1034
987 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
988} 1036}
989#endif 1037#endif
990 1038
991#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
992void 1040void
… …
1006rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1007{ 1055{
1008 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1009 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1010 { 1058 {
1011 refresh_type |= SMOOTH_REFRESH;
1012 want_refresh = 1; 1059 want_refresh = 1;
1013 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1014 } 1061 }
1015} 1062}
1016#endif 1063#endif
… …
1020rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1021{ 1068{
1022 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1023 { 1070 {
1024 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1025 refresh_type |= SMOOTH_REFRESH;
1026 want_refresh = 1; 1072 want_refresh = 1;
1027 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1028 } 1074 }
1029} 1075}
1030#endif 1076#endif
… …
1035{ 1081{
1036 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1038 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1039 { 1085 {
1040 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1043 1088
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1089 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1091 }
1048} 1092}
1049#endif 1093#endif
1050 1094
1095#if LINUX_YIELD_HACK
1096static struct event_handler
1097{
1098 check_watcher yield_ev;
1099
1100 void yield_cb (check_watcher &w)
1101 {
1102 usleep (0);
1103 w.stop ();
1104 }
1105
1106 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb)
1108 {
1109 }
1110} event_handler;
1111#endif
1112
1051bool 1113bool
1052rxvt_term::pty_fill () 1114rxvt_term::pty_fill ()
1053{ 1115{
1054 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1116 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1055 1117
1056 if (CBUFSIZ == n) 1118 if (CBUFSIZ == n)
1057 { 1119 {
1058 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1120 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1059 n = 0; 1121 n = 0;
1060 } 1122 }
1061 1123
1062 memmove (cmdbuf_base, cmdbuf_ptr, n); 1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
1063 cmdbuf_ptr = cmdbuf_base; 1125 cmdbuf_ptr = cmdbuf_base;
1064 cmdbuf_endp = cmdbuf_ptr + n; 1126 cmdbuf_endp = cmdbuf_ptr + n;
1065 1127
1066 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1067 1129
1068 if (n > 0) 1130 if (r > 0)
1069 { 1131 {
1070 cmdbuf_endp += n; 1132 cmdbuf_endp += r;
1071 return true; 1133 return true;
1072 } 1134 }
1073 else if (n < 0 && errno != EAGAIN) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1136 {
1137#if LINUX_YIELD_HACK
1138 if (display->is_local)
1139 event_handler.yield_ev.start ();
1140#endif
1141 }
1142 else
1143 {
1144 pty_ev.stop ();
1145
1146 if (!OPTION (Opt_hold))
1074 destroy (); 1147 destroy ();
1148 }
1075 1149
1076 return false; 1150 return false;
1077} 1151}
1078 1152
1079void 1153void
1080rxvt_term::pty_cb (io_watcher &w, short revents) 1154rxvt_term::pty_cb (io_watcher &w, short revents)
1081{ 1155{
1082 SET_R (this); 1156 make_current ();
1083 SET_LOCALE (locale);
1084 1157
1085 if (revents & EVENT_READ) 1158 if (revents & EVENT_READ)
1086 // loop, but don't allow a single term to monopolize us 1159 // loop, but don't allow a single term to monopolize us
1087 while (pty_fill ()) 1160 while (pty_fill ())
1088 if (cmd_parse ()) 1161 if (cmd_parse ())
… …
1093} 1166}
1094 1167
1095void 1168void
1096rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
1097{ 1170{
1098 XDefineCursor (display->display, vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
1099 recolour_cursor (); 1172 recolour_cursor ();
1100 1173
1101#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
1102 hidden_pointer = 0; 1175 hidden_pointer = 0;
1103 1176
1104 if (options & Opt_pointerBlank) 1177 if (OPTION (Opt_pointerBlank))
1105 pointer_ev.start (NOW + pointerBlankDelay); 1178 pointer_ev.start (NOW + pointerBlankDelay);
1106#endif 1179#endif
1107} 1180}
1108 1181
1109#ifdef POINTER_BLANK 1182#ifdef POINTER_BLANK
1110void 1183void
1111rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
1112{ 1185{
1113 if (! (options & Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
1114 return; 1187 return;
1115 1188
1116 XDefineCursor (display->display, vt, display->blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
1117 XFlush (display->display); 1190 XFlush (xdisp);
1118 1191
1119 hidden_pointer = 1; 1192 hidden_pointer = 1;
1120} 1193}
1121 1194
1122void 1195void
1123rxvt_term::pointer_cb (time_watcher &w) 1196rxvt_term::pointer_cb (time_watcher &w)
1124{ 1197{
1125 SET_R (this); 1198 make_current ();
1126 SET_LOCALE (locale);
1127 1199
1128 pointer_blank (); 1200 pointer_blank ();
1129} 1201}
1130#endif 1202#endif
1131 1203
… …
1196 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1197 (32 + x + 1), 1269 (32 + x + 1),
1198 (32 + y + 1)); 1270 (32 + y + 1));
1199} 1271}
1200 1272
1201#ifdef USING_W11LIB
1202void
1203rxvt_W11_process_x_event (XEvent *ev)
1204{
1205 rxvt_t *r = rxvt_get_r ();
1206
1207 x_cb (*ev);
1208}
1209#endif
1210
1211/*{{{ process an X event */ 1273/*{{{ process an X event */
1212void 1274void
1213rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1214{ 1276{
1215 dDisp; 1277 make_current ();
1216 1278
1217 SET_R (this); 1279 dLocal (Display *, xdisp);
1218 SET_LOCALE (locale);
1219 1280
1220#if defined(CURSOR_BLINK) 1281 if (ev.xany.window == vt
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1222 { 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1223 if (hidden_cursor) 1284 return;
1224 {
1225 hidden_cursor = 0;
1226 want_refresh = 1;
1227 }
1228 1285
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 // for XQueryPointer
1230 }
1231#endif
1232
1233#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1235 {
1236 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease)
1239 if (hidden_pointer)
1240 pointer_unblank ();
1241
1242 if (ev.type == KeyPress && hidden_pointer == 0)
1243 pointer_blank ();
1244 }
1245#endif
1246
1247 Window unused_root, unused_child; 1287 Window unused_root, unused_child;
1248 int unused_root_x, unused_root_y; 1288 int unused_root_x, unused_root_y;
1249 unsigned int unused_mask; 1289 unsigned int unused_mask;
1250 1290
1251 switch (ev.type) 1291 switch (ev.type)
… …
1258 1298
1259 break; 1299 break;
1260 1300
1261 case KeyRelease: 1301 case KeyRelease:
1262 { 1302 {
1263#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1264 KeySym ks; 1304 KeySym keysym;
1265 1305
1266 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1267#endif 1307#endif
1268 1308
1269#if ENABLE_FRILLS || ISO_14755 1309#if ENABLE_FRILLS || ISO_14755
1270 // ISO 14755 support 1310 // ISO 14755 support
1271 if (iso14755buf) 1311 if (iso14755buf)
… …
1276# endif 1316# endif
1277# if ISO_14755 1317# if ISO_14755
1278 // iso14755 part 5.2 handling: release time 1318 // iso14755 part 5.2 handling: release time
1279 // first: controls 1319 // first: controls
1280 if ((ev.xkey.state & ControlMask) 1320 if ((ev.xkey.state & ControlMask)
1281 && ((ks >= 0x40 && ks <= 0x5f) 1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1282 || (ks >= 0x61 && ks <= 0x7f))) 1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1283 { 1323 {
1284 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1285 commit_iso14755 (); 1325 commit_iso14755 ();
1286 return; // case-break; 1326 goto skip_switch;
1287 } 1327 }
1288 1328
1289 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1290 if (i[0] == ks) 1330 if (i[0] == keysym)
1291 { 1331 {
1292 iso14755buf = ISO_14755_51 | i[1]; 1332 iso14755buf = ISO_14755_51 | i[1];
1293 commit_iso14755 (); 1333 commit_iso14755 ();
1294 return; // case-break; 1334 goto skip_switch;
1295 } 1335 }
1296 1336
1297 scr_bell (); 1337 scr_bell ();
1298# endif 1338# endif
1299 iso14755buf = 0; 1339 iso14755buf = 0;
… …
1318 else 1358 else
1319 iso14755buf = 0; 1359 iso14755buf = 0;
1320 } 1360 }
1321#endif 1361#endif
1322 1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1365 break;
1366
1323#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1324 if (!(ev.xkey.state & ControlMask)) 1368 if (!(ev.xkey.state & ControlMask))
1325 slip_wheel_ev.stop (); 1369 slip_wheel_ev.stop ();
1326 else if (ks == XK_Control_L || ks == XK_Control_R) 1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1327 mouse_slip_wheel_speed = 0; 1371 mouse_slip_wheel_speed = 0;
1328#endif 1372#endif
1329 break; 1373 break;
1330 } 1374 }
1331 1375
… …
1337 button_release (ev.xbutton); 1381 button_release (ev.xbutton);
1338 break; 1382 break;
1339 1383
1340 case ClientMessage: 1384 case ClientMessage:
1341 if (ev.xclient.format == 32 1385 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1386 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1343 { 1387 {
1388 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1389 {
1390 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1391 {
1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1392 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1393 {
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1345 destroy (); 1395 destroy ();
1396 }
1346#if ENABLE_EWMH 1397#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask, 1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev); 1401 &ev);
1402#endif
1403 }
1404 }
1405#if ENABLE_XEMBED
1406 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1407 {
1408 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1409 focus_in ();
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out ();
1412 }
1351#endif 1413#endif
1352 } 1414 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1362#ifdef OFFIX_DND
1363 /* OffiX Dnd (drag 'n' drop) protocol */
1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1365 && (ev.xclient.data.l[0] == DndFile
1366 || ev.xclient.data.l[0] == DndDir
1367 || ev.xclient.data.l[0] == DndLink))
1368 {
1369 /* Get Dnd data */
1370 Atom ActualType;
1371 int ActualFormat;
1372 unsigned char *data;
1373 unsigned long Size, RemainingBytes;
1374
1375 XGetWindowProperty (disp, display->root,
1376 xa[XA_DNDSELECTION],
1377 0L, 1000000L,
1378 False, AnyPropertyType,
1379 &ActualType, &ActualFormat,
1380 &Size, &RemainingBytes,
1381 &data);
1382 set_string_property (XA_CUT_BUFFER0, data);
1383 XFree (data);
1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1386 }
1387#endif /* OFFIX_DND */
1388 break; 1415 break;
1389 1416
1390 case MappingNotify: 1417 case MappingNotify:
1391 XRefreshKeyboardMapping (&ev.xmapping); 1418 XRefreshKeyboardMapping (&ev.xmapping);
1392 break; 1419 break;
… …
1425 break; 1452 break;
1426 1453
1427 case ConfigureNotify: 1454 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0]) 1455 if (ev.xconfigure.window == parent[0])
1429 { 1456 {
1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1458 ;
1432 1459
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1461 {
1435 seen_resize = 1; 1462 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1464 }
1438 1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1469 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1470 check_our_parents ();
1442#endif 1471#endif
1443 } 1472 }
1444 break; 1473 break;
1445 1474
1446 case PropertyNotify: 1475 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue) 1478 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom); 1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450 1480
1451 break; 1481 break;
1452 1482
1453 case SelectionClear: 1483 case SelectionClear:
1454 selection_clear (); 1484 selection_clear ();
… …
1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1460 break; 1490 break;
1461 1491
1462 case SelectionRequest: 1492 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1493 selection_send (ev.xselectionrequest);
1494 break;
1495
1496 case MapNotify:
1497 mapped = 1;
1498#ifdef TEXT_BLINK
1499 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1500#endif
1501 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 break; 1502 break;
1465 1503
1466 case UnmapNotify: 1504 case UnmapNotify:
1467 mapped = 0; 1505 mapped = 0;
1468#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1507 text_blink_ev.stop ();
1470#endif 1508#endif
1471 break; 1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473 case MapNotify:
1474 mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break; 1510 break;
1479 1511
1480#ifdef TRANSPARENT 1512#ifdef TRANSPARENT
1481 case ReparentNotify: 1513 case ReparentNotify:
1482 rootwin_cb (ev); 1514 rootwin_cb (ev);
… …
1488 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1489 { 1521 {
1490 do 1522 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1494 1526
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1528
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1500 1532
1501 scr_refresh (refresh_type); 1533 want_refresh = 1;
1502 } 1534 }
1503 else 1535 else
1504 { 1536 {
1505 XEvent unused_event; 1537 XEvent unused_event;
1506 1538
1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1508 ; 1540 ;
1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1510 ; 1542 ;
1511 1543
1512 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1513 { 1545 {
1514 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1515 scrollbar_show (0); 1547 scrollbar_show (0);
1516 } 1548 }
1517#ifdef MENUBAR
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose ();
1520#endif
1521 1549
1522#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1525#endif 1553#endif
1526 } 1554 }
1527 break; 1555 break;
1528 1556
1529 case MotionNotify: 1557 case MotionNotify:
1530#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1531 if (hidden_pointer) 1559 if (hidden_pointer)
1532 pointer_unblank (); 1560 pointer_unblank ();
1533#endif 1561#endif
1534#if MENUBAR
1535 if (isMenuBarWindow (ev.xany.window))
1536 {
1537 menubar_control (ev.xbutton);
1538 break;
1539 }
1540#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1563 break;
1543 1564
1544 if (ev.xany.window == vt) 1565 if (ev.xany.window == vt)
1545 { 1566 {
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1571 {
1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1549 ; 1573 ;
1550 1574
1551 XQueryPointer (disp, vt, 1575 XQueryPointer (xdisp, vt,
1552 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1579 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1601 } 1625 }
1602 1626
1603 scroll_selection_lines = Pixel2Height (dist) 1627 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1628 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1629 + 1;
1606 MIN_IT (scroll_selection_lines, 1630 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1631 SELECTION_SCROLL_MAX_LINES);
1608 } 1632 }
1609 else 1633 else
1610 { 1634 {
1611 /* we are within the text window, so we 1635 /* we are within the text window, so we
… …
1620#endif 1644#endif
1621 } 1645 }
1622 } 1646 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1624 { 1648 {
1625 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1626 MotionNotify, &ev)) 1650 MotionNotify, &ev))
1627 ; 1651 ;
1628 1652
1629 XQueryPointer (disp, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1630 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1656 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1657 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1659 scrollbar_size ());
1636 scr_refresh (refresh_type); 1660 want_refresh = 1;
1637 refresh_limit = 0; 1661 refresh_limit = 0;
1638 scrollbar_show (1); 1662 scrollbar_show (1);
1639 } 1663 }
1640 break; 1664 break;
1641 } 1665 }
1666
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1671 {
1672 if (hidden_cursor)
1673 {
1674 hidden_cursor = 0;
1675 want_refresh = 1;
1676 }
1677
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 }
1680#endif
1681
1682#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 {
1685 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease)
1688 if (hidden_pointer)
1689 pointer_unblank ();
1690
1691 if (ev.type == KeyPress && hidden_pointer == 0)
1692 pointer_blank ();
1693 }
1694#endif
1642} 1695}
1643 1696
1644void 1697void
1645rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1646{ 1699{
1647 if (!focus) 1700 if (!focus)
1648 { 1701 {
1649 focus = 1; 1702 focus = 1;
1650 want_refresh = 1; 1703 want_refresh = 1;
1704
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1651#if USE_XIM 1707#if USE_XIM
1652 if (Input_Context != NULL) 1708 if (Input_Context != NULL)
1653 { 1709 {
1654 IMSetStatusPosition (); 1710 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1656 } 1712 }
1657#endif 1713#endif
1658#if CURSOR_BLINK 1714#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661#endif 1717#endif
1662#if OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1664 { 1720 {
1665 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
… …
1675 if (focus) 1731 if (focus)
1676 { 1732 {
1677 focus = 0; 1733 focus = 0;
1678 want_refresh = 1; 1734 want_refresh = 1;
1679 1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1680#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1681 iso14755buf = 0; 1741 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1742# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1743 scr_overlay_off ();
1744# endif
1745 }
1685#endif 1746#endif
1686#if USE_XIM 1747#if USE_XIM
1687 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1689#endif 1750#endif
1690#if CURSOR_BLINK 1751#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1752 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1754 hidden_cursor = 0;
1694#endif 1755#endif
1695#if OFF_FOCUS_FADING 1756#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1757 if (rs[Rs_fade])
… …
1704 1765
1705#if TRANSPARENT 1766#if TRANSPARENT
1706void 1767void
1707rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1708{ 1769{
1709 SET_R (this); 1770 make_current ();
1710 SET_LOCALE (locale);
1711 1771
1712 switch (ev.type) 1772 switch (ev.type)
1713 { 1773 {
1714 case PropertyNotify: 1774 case PropertyNotify:
1715 /* 1775 /*
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1781 return;
1722 1782
1723 /* FALLTHROUGH */ 1783 /* FALLTHROUGH */
1724 case ReparentNotify: 1784 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1786 want_refresh = want_full_refresh = 1;
1727 break; 1787 break;
1728 } 1788 }
1729} 1789}
1730#endif 1790#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1734{ 1794{
1735 int reportmode = 0, clickintime; 1795 int reportmode = 0, clickintime;
1736 1796
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1797 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1798
1738 if (!bypass_keystate) 1799 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1801
1741 /* 1802 /*
1742 * VT window processing of button press 1803 * VT window processing of button press
1743 */ 1804 */
1744 if (ev.window == vt) 1805 if (ev.window == vt)
1745 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1746#if ISO_14755 1810#if ISO_14755
1747 // 5.4 1811 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1813 {
1750 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1764 { 1828 {
1765 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1766 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1767 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1768 { 1833 {
1769 /* only report double clicks */ 1834 /* only report double clicks */
1770 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1771 mouse_report (ev); 1836 mouse_report (ev);
… …
1803#else 1868#else
1804 selection.rect = false; 1869 selection.rect = false;
1805#endif 1870#endif
1806 1871
1807 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1809 { 1874 {
1810 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1812 else 1877 else
1813 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
… …
1978 } 2043 }
1979 2044
1980 break; 2045 break;
1981 } 2046 }
1982 } 2047 }
2048
1983 return; 2049 return;
1984 } 2050 }
1985#if MENUBAR
1986 /*
1987 * Menubar window processing of button press
1988 */
1989 if (isMenuBarWindow (ev.window))
1990 menubar_control (ev);
1991#endif
1992} 2051}
1993 2052
1994void 2053void
1995rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
1996{ 2055{
… …
2002 2061
2003 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
2004 { 2063 {
2005 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
2006 scrollbar_show (0); 2065 scrollbar_show (0);
2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 refresh_type &= ~SMOOTH_REFRESH;
2009#endif
2010 } 2066 }
2011 2067
2012#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2069 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
2015#endif 2071#endif
2016 2072
2017 if (ev.window == vt) 2073 if (ev.window == vt)
2018 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2019#if ISO_14755 2078#if ISO_14755
2020 // 5.4 2079 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2081 return;
2023#endif 2082#endif
2083
2024 if (reportmode) 2084 if (reportmode)
2025 { 2085 {
2026 /* mouse report from vt window */ 2086 /* mouse report from vt window */
2027 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
2028 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
2058 { 2118 {
2059 case Button1: 2119 case Button1:
2060 case Button3: 2120 case Button3:
2061 selection_make (ev.time); 2121 selection_make (ev.time);
2062 break; 2122 break;
2123
2063 case Button2: 2124 case Button2:
2064 selection_request (ev.time, ev.x, ev.y); 2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2065 break; 2127 break;
2128
2066#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
2067 case Button4: 2130 case Button4:
2068 case Button5: 2131 case Button5:
2069 { 2132 {
2070 int i; 2133 int i;
… …
2072 2135
2073 v = ev.button == Button4 ? UP : DN; 2136 v = ev.button == Button4 ? UP : DN;
2074 2137
2075 if (ev.state & ShiftMask) 2138 if (ev.state & ShiftMask)
2076 i = 1; 2139 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2140 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2141 i = nrow - 1;
2079 else 2142 else
2080 i = 5; 2143 i = 5;
2081 2144
2082# ifdef MOUSE_SLIP_WHEELING 2145# ifdef MOUSE_SLIP_WHEELING
… …
2092 slip_wheel_ev.start (); 2155 slip_wheel_ev.start ();
2093 } 2156 }
2094 else 2157 else
2095 { 2158 {
2096# endif 2159# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2160 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2161 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
2110 } 2163 }
2111#endif 2164# endif
2112 } 2165 }
2113 break; 2166 break;
2114#endif 2167#endif
2115 } 2168 }
2116 } 2169 }
2117#ifdef MENUBAR
2118 else if (isMenuBarWindow (ev.window))
2119 menubar_control (ev);
2120#endif
2121} 2170}
2122 2171
2123#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
2124#if TINTING 2173#if TINTING
2125/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2126 2175
2127typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2128 2177
2129void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2130{ 2179{
2131 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2132 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2136 int i; 2185 int i;
2137 2186
2138 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2139 2188
2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2141 2190
2142 /* for convenience */ 2191 /* for convenience */
2143 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2364 Atom atype; 2413 Atom atype;
2365 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2366 Window root, oldp, *list; 2415 Window root, oldp, *list;
2367 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2368 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2370 2418
2371 pchanged = 0; 2419 pchanged = 0;
2372 2420
2373 if (!(options & Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2375 2423
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2378 2426
2379 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2380 2428
2381 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2382 { 2430 {
2383 if (am_transparent) 2431 if (am_transparent)
2384 { 2432 {
2385 pchanged = 1; 2433 pchanged = 1;
2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2388 } 2436 }
2389 2437
2390 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2391 } 2439 }
2392 2440
2393 /* Get all X ops out of the queue so that our information is up-to-date. */ 2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2394 XSync (disp, False); 2442 XSync (xdisp, False);
2395 2443
2396 /* 2444 /*
2397 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2398 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2399 * windows for each client, so we have to take care about that. 2447 * windows for each client, so we have to take care about that.
2400 */ 2448 */
2401 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2404 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2405 2453
2406 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2407 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2411 2459
2412 if (!i || prop == NULL 2460 if (!i || prop == NULL
2413#if TINTING 2461#if TINTING
2414 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2415#endif 2463#endif
2416 ) 2464 )
2417 have_pixmap = 0; 2465 have_pixmap = 0;
2418 else 2466 else
2419 { 2467 {
… …
2432 Window cr; 2480 Window cr;
2433 XImage *image; 2481 XImage *image;
2434 GC gc; 2482 GC gc;
2435 XGCValues gcvalue; 2483 XGCValues gcvalue;
2436 2484
2437 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2489 nx = ny = 0;
2442 2490
… …
2452 nh += sy; 2500 nh += sy;
2453 ny = -sy; 2501 ny = -sy;
2454 sy = 0; 2502 sy = 0;
2455 } 2503 }
2456 2504
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2507
2460 XSync (disp, False); 2508 XSync (xdisp, False);
2461 allowedxerror = -1; 2509 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2511
2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2465 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2466 allowedxerror = 0; 2514 allowedxerror = 0;
2467 2515
… …
2470 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2471 { 2519 {
2472 pchanged = 1; 2520 pchanged = 1;
2473 if (pixmap != None) 2521 if (pixmap != None)
2474 { 2522 {
2475 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2476 pixmap = None; 2524 pixmap = None;
2477 } 2525 }
2478 } 2526 }
2479 2527
2480 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2481 } 2529 }
2482 else 2530 else
2483 { 2531 {
2484 if (pixmap != None) 2532 if (pixmap != None)
2485 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2486 2534
2487#if TINTING 2535#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2537 {
2490 unsigned short rm, gm, bm;
2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2492 2539
2540 rgba c;
2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2494 2542
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2496 } 2544 }
2497#endif 2545#endif
2498 2546
2499 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2500 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2505 XDestroyImage (image); 2552 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2507 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2508 2555
2509 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2557 pchanged = 1;
2511 2558
2512 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2513 } 2560 }
2514 } 2561 }
2515 2562
2516 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2518 else 2565 else
2519 { 2566 {
2520 unsigned int n; 2567 unsigned int n;
2521 /* 2568 /*
2522 * InheritPixmap transparency 2569 * InheritPixmap transparency
2523 */ 2570 */
2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2572 {
2526 oldp = parent[i]; 2573 oldp = parent[i];
2527 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2528 &parent[i], &list, &n);
2529 XFree (list); 2575 XFree (list);
2530 2576
2531 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2532 { 2578 {
2533 if (oldp != None) 2579 if (oldp != None)
… …
2541 } 2587 }
2542 2588
2543 n = 0; 2589 n = 0;
2544 2590
2545 if (pchanged) 2591 if (pchanged)
2546 {
2547 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2548 { 2593 {
2549 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2597 {
2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2599 break;
2554 } 2600 }
2555 } 2601 }
2556 }
2557 2602
2558 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2559 { 2604 {
2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2607 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2564 } 2609 }
2565 else 2610 else
2566 { 2611 {
2567#if WAIT_FOR_WM
2568 /* wait (an arbitrary period) for the WM to do its thing
2569 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1);
2571#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2573 { 2613 {
2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2575 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2576 } 2616 }
2577 2617
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2579 am_transparent = 1; 2619 am_transparent = 1;
2580 } 2620 }
2581 2621
2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 parent[i] = None; 2623 parent[i] = None;
2584 } 2624 }
2585 2625
2586 if (scrollBar.win) 2626 if (scrollBar.win)
2587 { 2627 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2589 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2590 scrollbar_show (0); 2630 scrollbar_show (0);
2591 } 2631 }
2592 2632
2593 if (am_transparent) 2633 if (am_transparent)
… …
2605 2645
2606bool 2646bool
2607rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2608{ 2648{
2609 bool flag = false; 2649 bool flag = false;
2610 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2612 2652
2613 for (;;) 2653 for (;;)
2614 { 2654 {
2615 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2616 { 2656 {
2617 seq_begin = cmdbuf_ptr; 2657 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2658 ch = next_char ();
2619 }
2620 2659
2621 if (ch == NOCHAR) // TODO: improve 2660 if (ch == NOCHAR)
2622 break; 2661 break;
2662 }
2623 2663
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2665 {
2626 if (!seen_input) 2666 if (!seen_input)
2627 { 2667 {
… …
2636 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2638 } 2678 }
2639 2679
2640 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2682 bool refreshnow = false;
2643 int nlines = 0; 2683 int nlines = 0;
2644 unicode_t *str = buf; 2684 wchar_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2646 2686
2647 for (;;) 2687 for (;;)
2648 { 2688 {
2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2650 break; 2690 break;
… …
2656 if (ch == C0_LF) 2696 if (ch == C0_LF)
2657 nlines++; 2697 nlines++;
2658 2698
2659 refresh_count++; 2699 refresh_count++;
2660 2700
2661 if (!(options & Opt_jumpScroll) 2701 if (!OPTION (Opt_jumpScroll)
2662 || (refresh_count >= refresh_limit * (nrow - 1))) 2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2703 {
2664 refreshnow = true; 2704 refreshnow = true;
2705 refresh_count = 0;
2665 ch = NOCHAR; 2706 ch = NOCHAR;
2666 break; 2707 break;
2667 } 2708 }
2668 2709
2669 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2670 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2671 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2672 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2716
2673 nlines = 0; 2717 nlines = 0;
2674 str = buf; 2718 str = buf;
2675 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2676 } 2720 }
2677 2721
… …
2690 2734
2691 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2692 ch = next_char (); 2736 ch = next_char ();
2693 } 2737 }
2694 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2695 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2696 2742
2697 /* 2743 /*
2698 * If there have been a lot of new lines, then update the screen 2744 * If there have been a lot of new lines, then update the screen
2699 * What the heck I'll cheat and only refresh less than every page-full. 2745 * What the heck I'll cheat and only refresh less than every page-full.
2700 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
2701 * is incremented here because we must be doing flat-out scrolling. 2747 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2748 */
2703 if (refreshnow) 2749 if (refreshnow)
2704 { 2750 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++; 2752 refresh_limit++;
2707 else 2753 else
2708 { 2754 {
2709 flag = true; 2755 flag = true;
2710 scr_refresh (refresh_type); 2756 scr_refresh ();
2757 want_refresh = 1;
2711 } 2758 }
2712 } 2759 }
2713 2760
2714 } 2761 }
2715 else 2762 else
… …
2730 } 2777 }
2731 2778
2732 return flag; 2779 return flag;
2733} 2780}
2734 2781
2735// read the next octet
2736unicode_t
2737rxvt_term::next_octet ()
2738{
2739 return cmdbuf_ptr < cmdbuf_endp
2740 ? *cmdbuf_ptr++
2741 : NOCHAR;
2742}
2743
2744// read the next character 2782// read the next character
2745unicode_t 2783wchar_t
2746rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2747{ 2785{
2748 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2749 { 2787 {
2750 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2751 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2752 return *cmdbuf_ptr++; 2790 return *cmdbuf_ptr++;
2753 2791
2754 wchar_t wc; 2792 wchar_t wc;
2755 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2756 2794
2757 if (len == (size_t)-2) 2795 if (len == (size_t)-2)
2758 { 2796 {
2759 // the mbstate stores incomplete sequences. didn't know this :/ 2797 // the mbstate stores incomplete sequences. didn't know this :/
2760 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2761 break; 2799 break;
2762 } 2800 }
2763 2801
2764 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2766 2804
2767 // assume wchar == unicode 2805 // assume wchar == unicode
2768 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2769 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2770 } 2808 }
2771 2809
2772 return NOCHAR; 2810 return NOCHAR;
2773} 2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2774 2823
2775/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2776/* 2825/*
2777 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2778 * to the command. 2827 * to the command.
2779 */ 2828 */
2780unicode_t 2829wchar_t
2781rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2782{ 2831{
2783 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2784 2833
2785 if (c == NOCHAR) 2834 if (c == NOCHAR)
2786 throw out_of_input; 2835 throw out_of_input;
2787 2836
2788 return c; 2837 return c;
2789} 2838}
2790 2839
2791unicode_t 2840uint32_t
2792rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2793{ 2842{
2794 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2795 2844
2796 if (c == NOCHAR) 2845 if (c == NOCHAR)
2797 throw out_of_input; 2846 throw out_of_input;
2798 2847
2799 return c; 2848 return c;
… …
2899 case C0_ESC: 2948 case C0_ESC:
2900 process_escape_seq (); 2949 process_escape_seq ();
2901 break; 2950 break;
2902 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2903 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2904 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2953 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2905 (unsigned int)strlen (rs[Rs_answerbackstring]));
2906 else 2954 else
2907 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2908 (unsigned int)strlen (VT100_ANS));
2909 break; 2956 break;
2910 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2911 scr_bell (); 2958 scr_bell ();
2912 break; 2959 break;
2913 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
3037 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3038 break; 3085 break;
3039 case '+': 3086 case '+':
3040 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3041 break; 3088 break;
3042#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3043 case '6': 3090 case '6':
3044 scr_backindex (); 3091 scr_backindex ();
3045 break; 3092 break;
3046#endif 3093#endif
3047 case '7': 3094 case '7':
3048 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3049 break; 3096 break;
3050 case '8': 3097 case '8':
3051 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3052 break; 3099 break;
3053#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3054 case '9': 3101 case '9':
3055 scr_forwardindex (); 3102 scr_forwardindex ();
3056 break; 3103 break;
3057#endif 3104#endif
3058 case '=': 3105 case '=':
… …
3068 break; 3115 break;
3069 3116
3070 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3071 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3072 { 3119 {
3073 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3074 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3075 } 3122 }
3076 break; 3123 break;
3077 3124
3078 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3079 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3101 process_dcs_seq (); 3148 process_dcs_seq ();
3102 break; 3149 break;
3103 3150
3104 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3105 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
3106 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3107 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3108 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
3109 3155
3110 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3111 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
3112 process_csi_seq (); 3158 process_csi_seq ();
… …
3221 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3222 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3223 if (arg[p] == -1) 3269 if (arg[p] == -1)
3224 arg[p] = ndef; 3270 arg[p] = ndef;
3225 3271
3226#ifdef DEBUG_CMD
3227 fprintf (stderr, "CSI ");
3228 for (p = 0; p < nargs; p++)
3229 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3230 fprintf (stderr, "%c\n", ch);
3231#endif
3232
3233 /* 3272 /*
3234 * private mode handling 3273 * private mode handling
3235 */ 3274 */
3236 if (priv) 3275 if (priv)
3237 { 3276 {
3238 switch (priv) 3277 switch (priv)
3239 { 3278 {
3240 case '>': 3279 case '>':
3241 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
3289 tt_printf ("\033[>%d;94;0c", 'U');
3290 }
3243 break; 3291 break;
3244 case '?': 3292 case '?':
3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3246 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3247 break; 3295 break;
… …
3352 3400
3353 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3401 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3354 arg[0] = -arg[0]; 3402 arg[0] = -arg[0];
3355 /* FALLTHROUGH */ 3403 /* FALLTHROUGH */
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 3406 break;
3359 3407
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3362 (unsigned int) (sizeof (VT100_ANS) - 1));
3363 break; 3410 break;
3364 3411
3365 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3366 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
3367 break; 3414 break;
… …
3374 break; 3421 break;
3375 case 6: /* CPR requested */ 3422 case 6: /* CPR requested */
3376 scr_report_position (); 3423 scr_report_position ();
3377 break; 3424 break;
3378 case 7: /* unofficial extension */ 3425 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 3426 if (OPTION (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3427 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 3428 break;
3382 case 8: /* unofficial extension */ 3429 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 3431 break;
… …
3451 break; 3498 break;
3452 case CSI_75: 3499 case CSI_75:
3453 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3454 break; 3501 break;
3455 3502
3456#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3457 case CSI_74: 3504 case CSI_74:
3458 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3459 break; 3506 break;
3460#endif 3507#endif
3461 3508
… …
3468 break; 3515 break;
3469 } 3516 }
3470} 3517}
3471/*}}} */ 3518/*}}} */
3472 3519
3473#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3474/* ARGSUSED */ 3521/* ARGSUSED */
3475void 3522void
3476rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3477{ 3524{
3478 int x, y; 3525 int x, y;
3479 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3480 Window wdummy; 3527 Window wdummy;
3481 dDisp; 3528
3529 dLocal (Display *, xdisp);
3482 3530
3483 if (nargs == 0) 3531 if (nargs == 0)
3484 return; 3532 return;
3485 3533
3486 switch (args[0]) 3534 switch (args[0])
3487 { 3535 {
3488 /* 3536 /*
3489 * commands 3537 * commands
3490 */ 3538 */
3491 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3492 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3493 break; 3541 break;
3494 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3495 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3496 break; 3544 break;
3497 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3498 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3499 break; 3547 break;
3500 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3502 break; 3550 break;
3503 case 5: /* raise window */ 3551 case 5: /* raise window */
3504 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3505 break; 3553 break;
3506 case 6: /* lower window */ 3554 case 6: /* lower window */
3507 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3508 break; 3556 break;
3509 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3510 scr_touch (true); 3558 scr_touch (true);
3511 break; 3559 break;
3512 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3519 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3520 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3521 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3522 break; 3570 break;
3523 3571
3524
3525 /* 3572 /*
3526 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3527 */ 3574 */
3528 case 11: /* report window state */ 3575 case 11: /* report window state */
3529 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3531 break; 3578 break;
3532 case 13: /* report window position */ 3579 case 13: /* report window position */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3534 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3535 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3536 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3537 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3538 break; 3585 break;
3539 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3540 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3542 break; 3589 break;
3543 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3544 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3545 break; 3592 break;
… …
3547 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3548 break; 3595 break;
3549 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3550 { 3597 {
3551 char *s; 3598 char *s;
3552 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3601 XFree (s);
3555 } 3602 }
3556 break; 3603 break;
3557 case 21: /* report window title */ 3604 case 21: /* report window title */
3558 { 3605 {
3559 char *s; 3606 char *s;
3560 XFetchName (disp, parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3609 XFree (s);
3563 } 3610 }
3564 break; 3611 break;
3565 } 3612 }
3566} 3613}
… …
3569/*----------------------------------------------------------------------*/ 3616/*----------------------------------------------------------------------*/
3570/* 3617/*
3571 * get input up until STRING TERMINATOR (or BEL) 3618 * get input up until STRING TERMINATOR (or BEL)
3572 * ends_how is terminator used. returned input must be free()'d 3619 * ends_how is terminator used. returned input must be free()'d
3573 */ 3620 */
3574unsigned char * 3621char *
3575rxvt_term::get_to_st (unicode_t &ends_how) 3622rxvt_term::get_to_st (unicode_t &ends_how)
3576{ 3623{
3577 unicode_t ch; 3624 unicode_t ch;
3578 bool seen_esc = false; 3625 bool seen_esc = false;
3579 unsigned int n = 0; 3626 unsigned int n = 0;
… …
3612 3659
3613 string[n++] = '\0'; 3660 string[n++] = '\0';
3614 3661
3615 ends_how = (ch == 0x5c ? C0_ESC : ch); 3662 ends_how = (ch == 0x5c ? C0_ESC : ch);
3616 3663
3617 return (unsigned char *)rxvt_wcstombs (string); 3664 return rxvt_wcstombs (string);
3618} 3665}
3619 3666
3620/*----------------------------------------------------------------------*/ 3667/*----------------------------------------------------------------------*/
3621/* 3668/*
3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3669 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3623 */ 3670 */
3624void 3671void
3625rxvt_term::process_dcs_seq () 3672rxvt_term::process_dcs_seq ()
3626{ 3673{
3627 unsigned char *s; 3674 char *s;
3628 unicode_t eh; 3675 unicode_t eh;
3629 3676
3630 /* 3677 /*
3631 * Not handled yet 3678 * Not handled yet
3632 */ 3679 */
… …
3651 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3698 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3652 arg = arg * 10 + (ch - '0'); 3699 arg = arg * 10 + (ch - '0');
3653 3700
3654 if (ch == ';') 3701 if (ch == ';')
3655 { 3702 {
3656 unsigned char *s = get_to_st (eh); 3703 char *s = get_to_st (eh);
3657 3704
3658 if (s) 3705 if (s)
3659 { 3706 {
3660 process_xterm_seq (arg, (char *)s, eh); 3707 process_xterm_seq (arg, s, eh);
3661 free (s); 3708 free (s);
3662 } 3709 }
3663 } 3710 }
3664} 3711}
3665 3712
3666void 3713void
3667rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3668{ 3715{
3669 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3670 { 3717 {
3671 unsigned short r, g, b; 3718 rgba c;
3672 pix_colors_focused[color].get (display, r, g, b); 3719 pix_colors_focused[color].get (c);
3720
3721#if XFT
3722 if (c.a != rgba::MAX_CC)
3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3724 else
3725#endif
3673 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3674 } 3727 }
3675 else 3728 else
3676 set_window_color (color, str); 3729 set_window_color (color, str);
3677} 3730}
3678 3731
3679/* 3732/*
3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3681 */ 3734 */
3682void 3735void
3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3684{ 3737{
3685 int changed = 0;
3686 int color; 3738 int color;
3687 char *buf, *name; 3739 char *buf, *name;
3688 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3689 int saveop = op; 3741 int saveop = op;
3690 dDisp; 3742
3743 dLocal (Display *, xdisp);
3691 3744
3692 assert (str != NULL); 3745 assert (str != NULL);
3693 switch (op) 3746 switch (op)
3694 { 3747 {
3695 case XTerm_name: 3748 case XTerm_name:
… …
3711 unsigned long bytes_after; 3764 unsigned long bytes_after;
3712 unsigned char *value = 0; 3765 unsigned char *value = 0;
3713 const char *str = ""; 3766 const char *str = "";
3714 3767
3715 if (prop 3768 if (prop
3716 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3717 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3718 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3719 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3720 && actual_type != None 3773 && actual_type != None
3721 && actual_format == 8) 3774 && actual_format == 8)
3722 str = (const char *)(value); 3775 str = (const char *)(value);
3723 3776
3724 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3725 3778
3726 XFree (value); 3779 XFree (value);
3727 } 3780 }
3728 else 3781 else
3729 { 3782 {
… …
3733 { 3786 {
3734 *eq = 0; 3787 *eq = 0;
3735 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3736 } 3789 }
3737 else 3790 else
3738 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3739 display->atom (str)); 3792 display->atom (str));
3740 } 3793 }
3741 break; 3794 break;
3742 3795
3743 case XTerm_Color: 3796 case XTerm_Color:
… …
3745 { 3798 {
3746 if ((name = strchr (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
3747 break; 3800 break;
3748 3801
3749 *name++ = '\0'; 3802 *name++ = '\0';
3750 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
3751 3804
3752 if (color < 0 || color >= TOTAL_COLORS) 3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3753 break; 3806 break;
3754 3807
3755 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3756 *buf++ = '\0'; 3809 *buf++ = '\0';
3757 3810
3758 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3759 {
3760 unsigned short r, g, b;
3761 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3762 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3763 }
3764 else
3765 set_window_color (color + minCOLOR, name);
3766 } 3812 }
3767 break; 3813 break;
3768 case XTerm_Color00: 3814 case XTerm_Color00:
3769 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3770 break; 3816 break;
3771 case XTerm_Color01: 3817 case XTerm_Color01:
3772 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3773 break; 3819 break;
3774#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3775 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3776 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3777 break; 3823 break;
3778#endif 3824#endif
3779 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3780 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3781 break; 3827 break;
3782 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3783 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3784 break; 3830 break;
3785#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3786 case XTerm_Color_BD:
3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3788 break;
3789 case XTerm_Color_UL:
3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3791 break;
3792 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3833 process_color_seq (op, Color_RV, str, resp);
3834 break;
3835 case Rxvt_Color_BD:
3836 case URxvt_Color_BD:
3837 process_color_seq (op, Color_BD, str, resp);
3838 break;
3839 case Rxvt_Color_UL:
3840 case URxvt_Color_UL:
3841 process_color_seq (op, Color_UL, str, resp);
3794 break; 3842 break;
3795 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3797 break; 3845 break;
3798#endif 3846#endif
3799#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3800 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3802 check_our_parents (); 3851 check_our_parents ();
3852
3803 if (am_transparent) 3853 if (am_transparent)
3804 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3805 break;
3806#endif
3807 3855
3856 break;
3857#endif
3858
3808 case XTerm_Pixmap: 3859 case Rxvt_Pixmap:
3860 {
3809 if (*str != ';') 3861 if (*str != ';')
3810 { 3862 {
3811#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3812 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3813 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3814#endif
3815 scr_touch (true); 3866 scr_touch (true);
3867#endif
3816 } 3868 }
3869
3870 int changed = 0;
3871
3817 while ((str = strchr (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3818 { 3873 {
3819 str++; 3874 str++;
3820#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3821 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3822#endif 3877#endif
3823 } 3878 }
3824 3879
3825 if (changed) 3880 if (changed)
3826 { 3881 {
3827#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3828 resize_pixmap (); 3883 resize_pixmap ();
3829#endif
3830 scr_touch (true); 3884 scr_touch (true);
3885#endif
3831 } 3886 }
3887 }
3832 break; 3888 break;
3833 3889
3834 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3835 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3836 break; 3892 break;
3837 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3838 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3839 break; 3895 break;
3840 3896
3841 case XTerm_logfile: 3897 case XTerm_logfile:
3842 // TODO, when secure mode? 3898 // TODO, when secure mode?
3843 break; 3899 break;
3844 3900
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0 3901#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3853 { 3903 {
3854 int fd; 3904 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3905 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 { 3906 {
3857 scr_dump (fd); 3907 scr_dump (fd);
… …
3868 case URxvt_italicFont: 3918 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3919 case URxvt_boldItalicFont:
3870#endif 3920#endif
3871 if (query) 3921 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3922 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3924 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3925 resp);
3876 else 3926 else
3877 { 3927 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3928 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3881 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3882 set_fonts (); 3932 set_fonts ();
3883 } 3933 }
3884 break; 3934 break;
3885 3935
3886#if ENABLE_FRILLS 3936 case URxvt_version:
3937 if (query)
3938 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3939 op,
3940 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp);
3942 break;
3943
3944#if !ENABLE_MINIMAL
3887 case URxvt_locale: 3945 case URxvt_locale:
3888 if (query) 3946 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3890 else 3948 else
3891 { 3949 {
3892 set_locale (str); 3950 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
3894 init_xlocale (); 3952 init_xlocale ();
3895 } 3953 }
3896 break; 3954 break;
3897 3955
3898 case URxvt_view_up: 3956 case URxvt_view_up:
3899 case URxvt_view_down: 3957 case URxvt_view_down:
3958 {
3900 int lines = atoi (str); 3959 int lines = atoi (str);
3901 3960
3902 if (lines) 3961 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines); 3962 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else 3963 else
3905 {
3906 scr_erase_savelines (); 3964 scr_erase_savelines ();
3907 } 3965 }
3908 3966
3967 break;
3968#endif
3969
3970#if ENABLE_PERL
3971 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3973 ; // no responses yet
3909 break; 3974 break;
3910#endif 3975#endif
3911 } 3976 }
3912} 3977}
3913/*----------------------------------------------------------------------*/ 3978/*----------------------------------------------------------------------*/
… …
3944 return state; 4009 return state;
3945} 4010}
3946 4011
3947/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
3948void 4013void
3949rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4014rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3950{ 4015{
3951 unsigned int i, j; 4016 unsigned int i, j;
3952 int state; 4017 int state;
3953 4018
3954 static const struct 4019 static const struct
… …
3965 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
3966 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
3967 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
3968 // 8, bi-directional support mode 4033 // 8, bi-directional support mode
3969 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
3970#ifdef menuBar_esc
3971 { menuBar_esc, PrivMode_menuBar },
3972#endif
3973 // 18, 19 printing-related 4035 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor }, 4036 { 25, PrivMode_VisibleCursor },
3975#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
3976 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
3977#endif 4039#endif
… …
4022 } 4084 }
4023 4085
4024 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4087 switch (arg[i])
4026 { 4088 {
4089#if ENABLE_STYLES
4090 case 1021:
4091 set_option (Opt_intensityStyles, mode);
4092
4093 scr_touch (true);
4094 break;
4095#endif
4027 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
4028 case 1049: 4097 case 1049:
4029 if (options & Opt_secondaryScreen) 4098 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4099 if (mode == 0)
4031 scr_cursor (RESTORE); 4100 scr_cursor (RESTORE);
4032 else if (mode == 1) 4101 else if (mode == 1)
4033 scr_cursor (SAVE); 4102 scr_cursor (SAVE);
4034 break; 4103 break;
… …
4049 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4121 break;
4053 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 4123 set_option (Opt_jumpScroll, !state);
4058 break; 4124 break;
4059 case 5: /* reverse video */ 4125 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
4061 break; 4127 break;
4062 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
… …
4068 /* case 8: - auto repeat, can't do on a per window basis */ 4134 /* case 8: - auto repeat, can't do on a per window basis */
4069 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
4070 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
4071 priv_modes &= ~PrivMode_MouseX11; 4137 priv_modes &= ~PrivMode_MouseX11;
4072 break; 4138 break;
4073#ifdef menuBar_esc
4074 case menuBar_esc:
4075#ifdef MENUBAR
4076 map_menuBar (state);
4077#endif
4078 break;
4079#endif
4080#ifdef scrollBar_esc 4139#ifdef scrollBar_esc
4081 case scrollBar_esc: 4140 case scrollBar_esc:
4082 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
4083 { 4142 {
4084 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
… …
4103#if 0 4162#if 0
4104 case 1001: 4163 case 1001:
4105 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
4106#endif 4165#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 4167 set_option (Opt_scrollTtyOutput, !state);
4112 break; 4168 break;
4113 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 4170 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 4171 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4172 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4175 scr_erase_screen (2);
4123 scr_change_screen (state); 4176 scr_change_screen (state);
4124 break; 4177 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4178 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4179 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4180 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4181 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4182 scr_erase_screen (2);
4130 break; 4183 break;
4131 default: 4184 default:
4132 break; 4185 break;
… …
4260 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4261 break; 4314 break;
4262 4315
4263 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4264 4317
4265#ifndef NO_BRIGHTCOLOR 4318#if !ENABLE_MINIMAL
4266 case 90: 4319 case 90:
4267 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4268 case 92: 4321 case 92:
4269 case 93: 4322 case 93:
4270 case 94: 4323 case 94:
… …
4282 case 106: 4335 case 106:
4283 case 107: 4336 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4337 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4338 break;
4286#endif 4339#endif
4287
4288 } 4340 }
4289 } 4341 }
4290} 4342}
4291/*}}} */ 4343/*}}} */
4292 4344
… …
4316 */ 4368 */
4317void 4369void
4318rxvt_term::tt_printf (const char *fmt,...) 4370rxvt_term::tt_printf (const char *fmt,...)
4319{ 4371{
4320 va_list arg_ptr; 4372 va_list arg_ptr;
4321 unsigned char buf[256]; 4373 char buf[256];
4322 4374
4323 va_start (arg_ptr, fmt); 4375 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4376 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 4377 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 4378 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 4383 * or generated by us in response to a query ESC sequence.
4332 */ 4384 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 4386
4335void 4387void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 4389{
4390 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4391 return;
4392
4393 if (pty->pty < 0)
4394 return;
4395
4338 if (v_buflen == 0) 4396 if (v_buflen == 0)
4339 { 4397 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4398 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4341 4399
4342 if ((unsigned int)written == len) 4400 if ((unsigned int)written == len)
4343 return; 4401 return;
4344 4402
4345 data += written; 4403 data += written;
4346 len -= written; 4404 len -= written;
4347 } 4405 }
4348 4406
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 4408
4351 memcpy (v_buffer + v_buflen, data, len); 4409 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4410 v_buflen += len;
4353 4411
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355} 4413}
4356 4414
4357void rxvt_term::pty_write () 4415void rxvt_term::pty_write ()
4358{ 4416{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360 4418
4361 if (written > 0) 4419 if (written > 0)
4362 { 4420 {
4363 v_buflen -= written; 4421 v_buflen -= written;
4364 4422
… …
4373 } 4431 }
4374 4432
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4433 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4434 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4435 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4436 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4437}
4381 4438
4382/*----------------------- end-of-file (C source) -----------------------*/ 4439/*----------------------- end-of-file (C source) -----------------------*/
4383 4440

Diff Legend

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