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

Diff Legend

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