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.274 by root, Fri Jan 20 10:27:08 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;
… …
276 KeySym keysym; 303 KeySym keysym;
277#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
278 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
279#endif 306#endif
280 int valid_keysym; 307 int valid_keysym;
281 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
282 309
283 /* 310 /*
284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
285 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
286 * 313 *
… …
304 Status status_return; 331 Status status_return;
305 332
306#if 0 333#if 0
307#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
308 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
309 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
310 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
311 else 338 else
312#endif 339#endif
313#endif 340#endif
314 { 341 {
… …
351 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
352 } 379 }
353 else 380 else
354#endif 381#endif
355 { 382 {
356 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
357 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
358 } 385 }
359 386
360 if (valid_keysym) 387 if (valid_keysym)
361 { 388 {
362#ifdef KEYSYM_RESOURCE 389#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state)) 390 if (keyboard->dispatch (this, keysym, ev.state))
364 return; 391 return;
365#endif 392#endif
366 393
367 if (TermWin.saveLines) 394 if (saveLines)
368 { 395 {
369#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
370 if (!ctrl && !meta) 397 if (!ctrl && !meta)
371#else 398#else
372 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
373#endif 400#endif
374 { 401 {
375 int lnsppg; 402 int lnsppg;
376 403
377#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
379#else 406#else
380 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
381#endif 408#endif
382 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
383 { 410 {
384 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
385 return; 412 return;
… …
413 scr_move_to (0, 1); 440 scr_move_to (0, 1);
414 return; 441 return;
415 } 442 }
416 else if (keysym == XK_End) 443 else if (keysym == XK_End)
417 { 444 {
418 scr_move_to (1, 0); 445 scr_move_to (1, 1);
419 return; 446 return;
420 } 447 }
421 } 448 }
422#endif 449#endif
423 } 450 }
… …
434 { 461 {
435 switch (keysym) 462 switch (keysym)
436 { 463 {
437 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
438 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
439 selection_request (ev.time, 0, 0); 466 selection_request (ev.time, Sel_Primary);
440 return; 467 return;
441#if TODO 468#if TODO
442 /* rxvt extras */ 469 /* rxvt extras */
443 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
444 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
825 { 852 {
826#ifdef META8_OPTION 853#ifdef META8_OPTION
827 /* set 8-bit on */ 854 /* set 8-bit on */
828 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
829 { 856 {
830 unsigned char *ch; 857 char *ch;
831 858
832 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
833 *ch |= 0x80; 860 *ch |= 0x80;
834 861
835 meta = 0; 862 meta = 0;
… …
837#endif 864#endif
838 /* nil */ ; 865 /* nil */ ;
839 } 866 }
840 } 867 }
841 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
842 if (len <= 0) 872 if (len <= 0)
843 return; /* not mapped */ 873 return; /* not mapped */
844 874
845 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
846 if (TermWin.view_start) 876 if (view_start)
847 { 877 {
848 TermWin.view_start = 0; 878 view_start = 0;
849 want_refresh = 1; 879 want_refresh = 1;
850 } 880 }
851 881
852 /* 882 /*
853 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
868#ifdef META8_OPTION 898#ifdef META8_OPTION
869 && meta_char == C0_ESC 899 && meta_char == C0_ESC
870#endif 900#endif
871 ) 901 )
872 { 902 {
873 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
874 tt_write (&ch, 1); 904 tt_write (&ch, 1);
875 } 905 }
876 906
877#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
878 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
886#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
887 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
888} 918}
889/*}}} */ 919/*}}} */
890 920
891#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
892/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
893/* attempt to `write' count to the input buffer */
894unsigned int 922unsigned int
895rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
896{ 924{
897 unsigned int n, s; 925 unsigned int n, s;
898 926
899 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
900 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
937 } 965 }
938#endif 966#endif
939 967
940 if (want_refresh) 968 if (want_refresh)
941 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
942 scr_refresh (refresh_type); 1008 scr_refresh ();
943 scrollbar_show (1); 1009 scrollbar_show (1);
944#ifdef USE_XIM 1010#ifdef USE_XIM
945 IMSendSpot (); 1011 IMSendSpot ();
946#endif 1012#endif
947 } 1013 }
… …
950} 1016}
951 1017
952void 1018void
953rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
954{ 1020{
955 SET_R (this); 1021 make_current ();
956 SET_LOCALE (locale);
957 1022
958 display->flush (); 1023 display->flush ();
959 1024
960 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
961 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
962} 1027}
963 1028
964void 1029void
965rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
966{ 1031{
967 SET_R (this); 1032 make_current ();
968 SET_LOCALE (locale);
969 1033
970 refresh_limit = 1; 1034 refresh_limit = 1;
971 refresh_count = 0; 1035 refresh_count = 0;
972 flush (); 1036 flush ();
973} 1037}
… …
977rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
978{ 1042{
979 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
980 want_refresh = 1; 1044 want_refresh = 1;
981 1045
982 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
983} 1047}
984#endif 1048#endif
985 1049
986#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
987void 1051void
… …
1001rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1002{ 1066{
1003 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1004 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1005 { 1069 {
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1; 1070 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1009 } 1072 }
1010} 1073}
1011#endif 1074#endif
… …
1015rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1016{ 1079{
1017 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1018 { 1081 {
1019 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1020 refresh_type |= SMOOTH_REFRESH;
1021 want_refresh = 1; 1083 want_refresh = 1;
1022 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1023 } 1085 }
1024} 1086}
1025#endif 1087#endif
… …
1030{ 1092{
1031 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1032 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1033 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1034 { 1096 {
1035 if (TermWin.view_start == TermWin.nscrolled || 1097 if (view_start == top_row || view_start == 0)
1036 TermWin.view_start == 0)
1037 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1038 1099
1039 refresh_type |= SMOOTH_REFRESH;
1040 want_refresh = 1; 1100 want_refresh = 1;
1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1042 } 1102 }
1043} 1103}
1044#endif 1104#endif
1045 1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1046bool 1124bool
1047rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1048{ 1126{
1049 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1050 1128
1051 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1052 { 1130 {
1053 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1054 n = 0; 1132 n = 0;
1055 } 1133 }
1056 1134
1057 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1058 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1059 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1060 1138
1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1062 1140
1063 if (n > 0) 1141 if (r > 0)
1064 { 1142 {
1065 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1066 return true; 1144 return true;
1067 } 1145 }
1068 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
1069 destroy (); 1158 destroy ();
1159 }
1070 1160
1071 return false; 1161 return false;
1072} 1162}
1073 1163
1074void 1164void
1075rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1076{ 1166{
1077 SET_R (this); 1167 make_current ();
1078 SET_LOCALE (locale);
1079 1168
1080 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1081 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1082 while (pty_fill ()) 1171 while (pty_fill ())
1083 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1088} 1177}
1089 1178
1090void 1179void
1091rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1092{ 1181{
1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1094 recolour_cursor (); 1183 recolour_cursor ();
1095 1184
1096#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1097 hidden_pointer = 0; 1186 hidden_pointer = 0;
1098 1187
1099 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1100 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1101#endif 1190#endif
1102} 1191}
1103 1192
1104#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1105void 1194void
1106rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1107{ 1196{
1108 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1109 return; 1198 return;
1110 1199
1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1112 XFlush (display->display); 1201 XFlush (display->display);
1113 1202
1114 hidden_pointer = 1; 1203 hidden_pointer = 1;
1115} 1204}
1116 1205
1117void 1206void
1118rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1119{ 1208{
1120 SET_R (this); 1209 make_current ();
1121 SET_LOCALE (locale);
1122 1210
1123 pointer_blank (); 1211 pointer_blank ();
1124} 1212}
1125#endif 1213#endif
1126 1214
… …
1205 1293
1206/*{{{ process an X event */ 1294/*{{{ process an X event */
1207void 1295void
1208rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1209{ 1297{
1298 make_current ();
1299
1210 dDisp; 1300 dDisp;
1211 1301
1212 SET_R (this); 1302 if (ev.xany.window == vt
1213 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1214 1306
1215#if defined(CURSOR_BLINK) 1307 // for XQueryPointer
1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1217 {
1218 if (hidden_cursor)
1219 {
1220 hidden_cursor = 0;
1221 want_refresh = 1;
1222 }
1223
1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
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; 1308 Window unused_root, unused_child;
1243 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1244 unsigned int unused_mask; 1310 unsigned int unused_mask;
1245 1311
1246 switch (ev.type) 1312 switch (ev.type)
… …
1253 1319
1254 break; 1320 break;
1255 1321
1256 case KeyRelease: 1322 case KeyRelease:
1257 { 1323 {
1258#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1259 KeySym ks; 1325 KeySym keysym;
1260 1326
1261 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1262#endif 1328#endif
1263 1329
1264#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1265 // ISO 14755 support 1331 // ISO 14755 support
1266 if (iso14755buf) 1332 if (iso14755buf)
… …
1271# endif 1337# endif
1272# if ISO_14755 1338# if ISO_14755
1273 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1274 // first: controls 1340 // first: controls
1275 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1276 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1277 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1278 { 1344 {
1279 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1280 commit_iso14755 (); 1346 commit_iso14755 ();
1281 return; // case-break; 1347 goto skip_switch;
1282 } 1348 }
1283 1349
1284 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1285 if (i[0] == ks) 1351 if (i[0] == keysym)
1286 { 1352 {
1287 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1288 commit_iso14755 (); 1354 commit_iso14755 ();
1289 return; // case-break; 1355 goto skip_switch;
1290 } 1356 }
1291 1357
1292 scr_bell (); 1358 scr_bell ();
1293# endif 1359# endif
1294 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1313 else 1379 else
1314 iso14755buf = 0; 1380 iso14755buf = 0;
1315 } 1381 }
1316#endif 1382#endif
1317 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1318#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1319 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1320 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1321 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1322 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1323#endif 1393#endif
1324 break; 1394 break;
1325 } 1395 }
1326 1396
… …
1418 case FocusOut: 1488 case FocusOut:
1419 focus_out (); 1489 focus_out ();
1420 break; 1490 break;
1421 1491
1422 case ConfigureNotify: 1492 case ConfigureNotify:
1423 if (ev.xconfigure.window == TermWin.parent[0]) 1493 if (ev.xconfigure.window == parent[0])
1424 { 1494 {
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)); 1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ;
1434 1497
1435 if (szHint.width != width || szHint.height != height) 1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1499 {
1437 seen_resize = 1; 1500 seen_resize = 1;
1438 resize_all_windows (width, height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1502 }
1440 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1442 if (options & Opt_transparent) 1507 if (OPTION (Opt_transparent))
1443 check_our_parents (); 1508 check_our_parents ();
1444#endif 1509#endif
1445 } 1510 }
1446 break; 1511 break;
1447 1512
… …
1463 1528
1464 case SelectionRequest: 1529 case SelectionRequest:
1465 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1466 break; 1531 break;
1467 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1468 case UnmapNotify: 1541 case UnmapNotify:
1469 TermWin.mapped = 0; 1542 mapped = 0;
1470#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1471 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1472#endif 1545#endif
1473 break; 1546 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; 1547 break;
1481 1548
1482#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1483 case ReparentNotify: 1550 case ReparentNotify:
1484 rootwin_cb (ev); 1551 rootwin_cb (ev);
1485 break; 1552 break;
1486#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1487 1554
1488 case GraphicsExpose: 1555 case GraphicsExpose:
1489 case Expose: 1556 case Expose:
1490 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1491 { 1558 {
1492 do 1559 do
1493 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1494 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1496 1563
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498 1565
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1502 1569
1503 scr_refresh (refresh_type); 1570 want_refresh = 1;
1504 } 1571 }
1505 else 1572 else
1506 { 1573 {
1507 XEvent unused_event; 1574 XEvent unused_event;
1508 1575
… …
1514 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1515 { 1582 {
1516 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1517 scrollbar_show (0); 1584 scrollbar_show (0);
1518 } 1585 }
1519#ifdef MENUBAR
1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1521 menubar_expose ();
1522#endif
1523 1586
1524#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1526 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1527#endif 1590#endif
1528 } 1591 }
1529 break; 1592 break;
1530 1593
1531 case MotionNotify: 1594 case MotionNotify:
1532#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1533 if (hidden_pointer) 1596 if (hidden_pointer)
1534 pointer_unblank (); 1597 pointer_unblank ();
1535#endif 1598#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) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1544 break; 1600 break;
1545 1601
1546 if (ev.xany.window == TermWin.vt) 1602 if (ev.xany.window == vt)
1547 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1548 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1549 { 1608 {
1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1551 ; 1610 ;
1552 1611
1553 XQueryPointer (disp, TermWin.vt, 1612 XQueryPointer (disp, vt,
1554 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1555 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1556 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1557 &ev.xbutton.state); 1616 &ev.xbutton.state);
1558#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1570#endif 1629#endif
1571 selection_extend (ev.xbutton.x, ev.xbutton.y, 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1572 ev.xbutton.state & Button3Mask ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1573 1632
1574#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1575 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1577 { 1636 {
1578 int dist; 1637 int dist;
1579 1638
1580 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1581 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1589 selection_save_x = ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1590 selection_save_y = ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1592 1651
1593 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1594 if (ev.xbutton.y < TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1595 { 1654 {
1596 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1597 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1598 } 1657 }
1599 else 1658 else
1600 { 1659 {
1601 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1661 dist = ev.xbutton.y - (int_bwidth + height);
1603 } 1662 }
1604 1663
1605 scroll_selection_lines = Pixel2Height (dist) 1664 scroll_selection_lines = Pixel2Height (dist)
1606 / SELECTION_SCROLL_LINE_SPEEDUP 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1; 1666 + 1;
1608 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1609 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1610 } 1669 }
1611 else 1670 else
1612 { 1671 {
1613 /* we are within the text window, so we 1672 /* we are within the text window, so we
… …
1633 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1634 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1635 &unused_mask); 1694 &unused_mask);
1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1637 scrollbar_size ()); 1696 scrollbar_size ());
1638 scr_refresh (refresh_type); 1697 want_refresh = 1;
1639 refresh_limit = 0; 1698 refresh_limit = 0;
1640 scrollbar_show (1); 1699 scrollbar_show (1);
1641 } 1700 }
1642 break; 1701 break;
1643 } 1702 }
1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 {
1709 if (hidden_cursor)
1710 {
1711 hidden_cursor = 0;
1712 want_refresh = 1;
1713 }
1714
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 }
1717#endif
1718
1719#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 {
1722 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease)
1725 if (hidden_pointer)
1726 pointer_unblank ();
1727
1728 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank ();
1730 }
1731#endif
1644} 1732}
1645 1733
1646void 1734void
1647rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1648{ 1736{
1649 if (!TermWin.focus) 1737 if (!focus)
1650 { 1738 {
1651 TermWin.focus = 1; 1739 focus = 1;
1652 want_refresh = 1; 1740 want_refresh = 1;
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1743
1653#ifdef USE_XIM 1744#if USE_XIM
1654 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1655 { 1746 {
1656 IMSetStatusPosition (); 1747 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1658 } 1749 }
1659#endif 1750#endif
1660#ifdef CURSOR_BLINK 1751#if CURSOR_BLINK
1661 if (options & Opt_cursorBlink) 1752 if (OPTION (Opt_cursorBlink))
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1663#endif 1754#endif
1664#ifdef OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1665 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1666 { 1757 {
1667 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1668 scr_recolour (); 1759 scr_recolour ();
1669 } 1760 }
… …
1672} 1763}
1673 1764
1674void 1765void
1675rxvt_term::focus_out () 1766rxvt_term::focus_out ()
1676{ 1767{
1677 if (TermWin.focus) 1768 if (focus)
1678 { 1769 {
1679 TermWin.focus = 0; 1770 focus = 0;
1680 want_refresh = 1; 1771 want_refresh = 1;
1681 1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1682#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1683 iso14755buf = 0; 1778 iso14755buf = 0;
1684#endif
1685#if ENABLE_OVERLAY 1779# if ENABLE_OVERLAY
1686 scr_overlay_off (); 1780 scr_overlay_off ();
1687#endif 1781# endif
1782 }
1783#endif
1688#ifdef USE_XIM 1784#if USE_XIM
1689 if (Input_Context != NULL) 1785 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context); 1786 XUnsetICFocus (Input_Context);
1691#endif 1787#endif
1692#ifdef CURSOR_BLINK 1788#if CURSOR_BLINK
1693 if (options & Opt_cursorBlink) 1789 if (OPTION (Opt_cursorBlink))
1694 cursor_blink_ev.stop (); 1790 cursor_blink_ev.stop ();
1695 hidden_cursor = 0; 1791 hidden_cursor = 0;
1696#endif 1792#endif
1697#ifdef OFF_FOCUS_FADING 1793#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1794 if (rs[Rs_fade])
1699 { 1795 {
1700 pix_colors = pix_colors_unfocused; 1796 pix_colors = pix_colors_unfocused;
1701 scr_recolour (); 1797 scr_recolour ();
1702 } 1798 }
… …
1706 1802
1707#if TRANSPARENT 1803#if TRANSPARENT
1708void 1804void
1709rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1710{ 1806{
1711 SET_R (this); 1807 make_current ();
1712 SET_LOCALE (locale);
1713 1808
1714 switch (ev.type) 1809 switch (ev.type)
1715 { 1810 {
1716 case PropertyNotify: 1811 case PropertyNotify:
1717 /* 1812 /*
… …
1722 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1723 return; 1818 return;
1724 1819
1725 /* FALLTHROUGH */ 1820 /* FALLTHROUGH */
1726 case ReparentNotify: 1821 case ReparentNotify:
1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1728 want_refresh = want_full_refresh = 1; 1823 want_refresh = want_full_refresh = 1;
1729 break; 1824 break;
1730 } 1825 }
1731} 1826}
1732#endif 1827#endif
… …
1735rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1736{ 1831{
1737 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1738 1833
1739 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1740 if (!bypass_keystate) 1836 if (!bypass_keystate)
1741 reportmode = !! (priv_modes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742 1838
1743 /* 1839 /*
1744 * VT window processing of button press 1840 * VT window processing of button press
1745 */ 1841 */
1746 if (ev.window == TermWin.vt) 1842 if (ev.window == vt)
1747 { 1843 {
1748#if ISO_14755 1844#if ISO_14755
1749 // 5.4 1845 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 { 1847 {
… …
1764#ifdef MOUSE_REPORT_DOUBLECLICK 1860#ifdef MOUSE_REPORT_DOUBLECLICK
1765 if (ev.button == MEvent.button && clickintime) 1861 if (ev.button == MEvent.button && clickintime)
1766 { 1862 {
1767 /* same button, within alloted time */ 1863 /* same button, within alloted time */
1768 MEvent.clicks++; 1864 MEvent.clicks++;
1865
1769 if (MEvent.clicks > 1) 1866 if (MEvent.clicks > 1)
1770 { 1867 {
1771 /* only report double clicks */ 1868 /* only report double clicks */
1772 MEvent.clicks = 2; 1869 MEvent.clicks = 2;
1773 mouse_report (ev); 1870 mouse_report (ev);
… …
1793 else 1890 else
1794 { 1891 {
1795 if (ev.button != MEvent.button) 1892 if (ev.button != MEvent.button)
1796 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1797 1894
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1798 switch (ev.button) 1896 switch (ev.button)
1799 { 1897 {
1800 case Button1: 1898 case Button1:
1801 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1802 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1803#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1804 selection.rect = !!(ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1805#else 1903#else
1806 selection.rect = false; 1904 selection.rect = false;
1807#endif 1905#endif
1808 1906
1809 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1810 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1811 { 1909 {
1812 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1813 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1814 else 1912 else
1815 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1816 } 1914 }
1817 else 1915 else
1818 { 1916 {
1819 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1820 MEvent.clicks++; 1918 MEvent.clicks++;
1821 else 1919 else
1822 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1823 1921
1824 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1825 } 1923 }
1826 1924
1827 MEvent.button = Button1; 1925 MEvent.button = Button1;
1828 break; 1926 break;
1829 1927
1830 case Button3: 1928 case Button3:
1831 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1832 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1833 else 1931 else
1834 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1835 1933
1836 MEvent.button = Button3; 1934 MEvent.button = Button3;
1837 break; 1935 break;
1838 } 1936 }
1839 } 1937 }
1840 1938
1841 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1842 return; 1940 return;
1843 } 1941 }
1844 1942
… …
1956 case Button3: 2054 case Button3:
1957 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1958 { 2056 {
1959 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1960# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1961 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1962# else 2060# else
1963 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1964# endif 2062# endif
1965 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1966# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1967 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1968# else 2066# else
1969 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1970# endif 2068# endif
1971 else 2069 else
1972 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1973 } 2071 }
1974 else 2072 else
1975 { 2073 {
1976 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1977 (TermWin.nrow 2075 (nrow
1978 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1979 / scrollbar_size ())); 2077 / scrollbar_size ()));
1980 } 2078 }
1981 2079
1982 break; 2080 break;
1983 } 2081 }
1984 } 2082 }
2083
1985 return; 2084 return;
1986 } 2085 }
1987#if MENUBAR
1988 /*
1989 * Menubar window processing of button press
1990 */
1991 if (isMenuBarWindow (ev.window))
1992 menubar_control (ev);
1993#endif
1994} 2086}
1995 2087
1996void 2088void
1997rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1998{ 2090{
… …
2004 2096
2005 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2006 { 2098 {
2007 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2008 scrollbar_show (0); 2100 scrollbar_show (0);
2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2010 refresh_type &= ~SMOOTH_REFRESH;
2011#endif
2012 } 2101 }
2013 2102
2014#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2015 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
2017#endif 2106#endif
2018 2107
2019 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
2020 { 2109 {
2021#if ISO_14755 2110#if ISO_14755
2022 // 5.4 2111 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return; 2113 return;
… …
2054 if (priv_modes & PrivMode_mouse_report 2143 if (priv_modes & PrivMode_mouse_report
2055 && bypass_keystate 2144 && bypass_keystate
2056 && ev.button == Button1 && MEvent.clicks <= 1) 2145 && ev.button == Button1 && MEvent.clicks <= 1)
2057 selection_extend (ev.x, ev.y, 0); 2146 selection_extend (ev.x, ev.y, 0);
2058 2147
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2059 switch (ev.button) 2151 switch (ev.button)
2060 { 2152 {
2061 case Button1: 2153 case Button1:
2062 case Button3: 2154 case Button3:
2063 selection_make (ev.time); 2155 selection_make (ev.time);
2064 break; 2156 break;
2157
2065 case Button2: 2158 case Button2:
2066 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width)
2160 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 {
2162 if (ev.state & ShiftMask)
2163 selection_request (ev.time, Sel_Clipboard);
2164 else
2165 selection_request (ev.time, Sel_Primary);
2166 }
2067 break; 2167 break;
2168
2068#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2069 case Button4: 2170 case Button4:
2070 case Button5: 2171 case Button5:
2071 { 2172 {
2072 int i; 2173 int i;
… …
2074 2175
2075 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2076 2177
2077 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2078 i = 1; 2179 i = 1;
2079 else if (options & Opt_mouseWheelScrollPage) 2180 else if (OPTION (Opt_mouseWheelScrollPage))
2080 i = TermWin.nrow - 1; 2181 i = nrow - 1;
2081 else 2182 else
2082 i = 5; 2183 i = 5;
2083 2184
2084# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
2085 if (ev.state & ControlMask) 2186 if (ev.state & ControlMask)
2086 { 2187 {
2087 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2088 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2189 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; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2090 2191
2091 if (slip_wheel_ev.at < NOW) 2192 if (slip_wheel_ev.at < NOW)
2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093 2194
2094 slip_wheel_ev.start (); 2195 slip_wheel_ev.start ();
2095 } 2196 }
2096 else 2197 else
2097 { 2198 {
2098# endif 2199# endif
2099# ifdef JUMP_MOUSE_WHEEL
2100 scr_page (v, i); 2200 scr_page (v, i);
2101 scr_refresh (SMOOTH_REFRESH);
2102 scrollbar_show (1); 2201 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 2202# ifdef MOUSE_SLIP_WHEELING
2112 } 2203 }
2113#endif 2204# endif
2114 } 2205 }
2115 break; 2206 break;
2116#endif 2207#endif
2117 } 2208 }
2118 } 2209 }
2119#ifdef MENUBAR
2120 else if (isMenuBarWindow (ev.window))
2121 menubar_control (ev);
2122#endif
2123} 2210}
2124 2211
2125#ifdef TRANSPARENT 2212#ifdef TRANSPARENT
2126#if TINTING 2213#if TINTING
2127/* taken from aterm-0.4.2 */ 2214/* taken from aterm-0.4.2 */
… …
2370 XWindowAttributes wattr, wrootattr; 2457 XWindowAttributes wattr, wrootattr;
2371 dDisp; 2458 dDisp;
2372 2459
2373 pchanged = 0; 2460 pchanged = 0;
2374 2461
2375 if (!(options & Opt_transparent)) 2462 if (!OPTION (Opt_transparent))
2376 return pchanged; /* Don't try any more */ 2463 return pchanged; /* Don't try any more */
2377 2464
2378 XGetWindowAttributes (disp, display->root, &wrootattr); 2465 XGetWindowAttributes (disp, display->root, &wrootattr);
2379 rootdepth = wrootattr.depth; 2466 rootdepth = wrootattr.depth;
2380 2467
2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2468 XGetWindowAttributes (disp, parent[0], &wattr);
2382 2469
2383 if (rootdepth != wattr.depth) 2470 if (rootdepth != wattr.depth)
2384 { 2471 {
2385 if (am_transparent) 2472 if (am_transparent)
2386 { 2473 {
2387 pchanged = 1; 2474 pchanged = 1;
2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2475 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2389 am_transparent = am_pixmap_trans = 0; 2476 am_transparent = am_pixmap_trans = 0;
2390 } 2477 }
2391 2478
2392 return pchanged; /* Don't try any more */ 2479 return pchanged; /* Don't try any more */
2393 } 2480 }
… …
2434 Window cr; 2521 Window cr;
2435 XImage *image; 2522 XImage *image;
2436 GC gc; 2523 GC gc;
2437 XGCValues gcvalue; 2524 XGCValues gcvalue;
2438 2525
2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2526 XTranslateCoordinates (disp, parent[0], display->root,
2440 0, 0, &sx, &sy, &cr); 2527 0, 0, &sx, &sy, &cr);
2441 nw = (unsigned int)szHint.width; 2528 nw = (unsigned int)szHint.width;
2442 nh = (unsigned int)szHint.height; 2529 nh = (unsigned int)szHint.height;
2443 nx = ny = 0; 2530 nx = ny = 0;
2444 2531
… …
2454 nh += sy; 2541 nh += sy;
2455 ny = -sy; 2542 ny = -sy;
2456 sy = 0; 2543 sy = 0;
2457 } 2544 }
2458 2545
2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2546 min_it (nw, (unsigned int) (wrootattr.width - sx));
2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2547 min_it (nh, (unsigned int) (wrootattr.height - sy));
2461 2548
2462 XSync (disp, False); 2549 XSync (disp, False);
2463 allowedxerror = -1; 2550 allowedxerror = -1;
2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2551 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2465 2552
… …
2470 if (image == NULL) 2557 if (image == NULL)
2471 { 2558 {
2472 if (am_transparent && am_pixmap_trans) 2559 if (am_transparent && am_pixmap_trans)
2473 { 2560 {
2474 pchanged = 1; 2561 pchanged = 1;
2475 if (TermWin.pixmap != None) 2562 if (pixmap != None)
2476 { 2563 {
2477 XFreePixmap (disp, TermWin.pixmap); 2564 XFreePixmap (disp, pixmap);
2478 TermWin.pixmap = None; 2565 pixmap = None;
2479 } 2566 }
2480 } 2567 }
2481 2568
2482 am_pixmap_trans = 0; 2569 am_pixmap_trans = 0;
2483 } 2570 }
2484 else 2571 else
2485 { 2572 {
2486 if (TermWin.pixmap != None) 2573 if (pixmap != None)
2487 XFreePixmap (disp, TermWin.pixmap); 2574 XFreePixmap (disp, pixmap);
2488 2575
2489#if TINTING 2576#if TINTING
2490 if (ISSET_PIXCOLOR (Color_tint)) 2577 if (ISSET_PIXCOLOR (Color_tint))
2491 { 2578 {
2492 unsigned short rm, gm, bm; 2579 unsigned short rm, gm, bm;
… …
2496 2583
2497 ShadeXImage (display, image, shade, rm, gm, bm); 2584 ShadeXImage (display, image, shade, rm, gm, bm);
2498 } 2585 }
2499#endif 2586#endif
2500 2587
2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2588 pixmap = XCreatePixmap (disp, vt,
2502 szHint.width, szHint.height, image->depth); 2589 szHint.width, szHint.height, image->depth);
2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2590 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2591 XPutImage (disp, pixmap, gc, image, 0, 0,
2505 nx, ny, image->width, image->height); 2592 nx, ny, image->width, image->height);
2506 XFreeGC (disp, gc); 2593 XFreeGC (disp, gc);
2507 XDestroyImage (image); 2594 XDestroyImage (image);
2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2595 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2509 XClearWindow (disp, TermWin.parent[0]); 2596 XClearWindow (disp, parent[0]);
2510 2597
2511 if (!am_transparent || !am_pixmap_trans) 2598 if (!am_transparent || !am_pixmap_trans)
2512 pchanged = 1; 2599 pchanged = 1;
2513 2600
2514 am_transparent = am_pixmap_trans = 1; 2601 am_transparent = am_pixmap_trans = 1;
2515 } 2602 }
2516 } 2603 }
2517 2604
2518 if (am_pixmap_trans) 2605 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2606 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2520 else 2607 else
2521 { 2608 {
2522 unsigned int n; 2609 unsigned int n;
2523 /* 2610 /*
2524 * InheritPixmap transparency 2611 * InheritPixmap transparency
2525 */ 2612 */
2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2613 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2527 { 2614 {
2528 oldp = TermWin.parent[i]; 2615 oldp = parent[i];
2529 XQueryTree (disp, TermWin.parent[i - 1], &root, 2616 XQueryTree (disp, parent[i - 1], &root,
2530 &TermWin.parent[i], &list, &n); 2617 &parent[i], &list, &n);
2531 XFree (list); 2618 XFree (list);
2532 2619
2533 if (TermWin.parent[i] == display->root) 2620 if (parent[i] == display->root)
2534 { 2621 {
2535 if (oldp != None) 2622 if (oldp != None)
2536 pchanged = 1; 2623 pchanged = 1;
2537 2624
2538 break; 2625 break;
2539 } 2626 }
2540 2627
2541 if (oldp != TermWin.parent[i]) 2628 if (oldp != parent[i])
2542 pchanged = 1; 2629 pchanged = 1;
2543 } 2630 }
2544 2631
2545 n = 0; 2632 n = 0;
2546 2633
2547 if (pchanged) 2634 if (pchanged)
2548 { 2635 {
2549 for (; n < (unsigned int)i; n++) 2636 for (; n < (unsigned int)i; n++)
2550 { 2637 {
2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2638 XGetWindowAttributes (disp, parent[n], &wattr);
2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2639 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2553 { 2640 {
2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2641 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2555 break; 2642 break;
2556 } 2643 }
2557 } 2644 }
2558 } 2645 }
2559 2646
2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2647 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2561 { 2648 {
2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2649 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2650 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2564 am_transparent = 0; 2651 am_transparent = 0;
2565 /* XXX: also turn off Opt_transparent? */ 2652 /* XXX: also turn off Opt_transparent? */
2566 } 2653 }
2567 else 2654 else
2568 { 2655 {
… …
2571 * needed for fvwm2.2.2 (and before?) */ 2658 * needed for fvwm2.2.2 (and before?) */
2572 sleep (1); 2659 sleep (1);
2573#endif 2660#endif
2574 for (n = 0; n < (unsigned int)i; n++) 2661 for (n = 0; n < (unsigned int)i; n++)
2575 { 2662 {
2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2663 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]); 2664 XClearWindow (disp, parent[n]);
2578 } 2665 }
2579 2666
2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2667 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2581 am_transparent = 1; 2668 am_transparent = 1;
2582 } 2669 }
2583 2670
2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2671 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2585 TermWin.parent[i] = None; 2672 parent[i] = None;
2586 } 2673 }
2587 2674
2588 if (scrollBar.win) 2675 if (scrollBar.win)
2589 { 2676 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2677 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2607 2694
2608bool 2695bool
2609rxvt_term::cmd_parse () 2696rxvt_term::cmd_parse ()
2610{ 2697{
2611 bool flag = false; 2698 bool flag = false;
2612 unicode_t ch = NOCHAR; 2699 wchar_t ch = NOCHAR;
2613 unsigned char *seq_begin; // remember start of esc-sequence here 2700 char *seq_begin; // remember start of esc-sequence here
2614 2701
2615 for (;;) 2702 for (;;)
2616 { 2703 {
2617 if (ch == NOCHAR) 2704 if (ch == NOCHAR)
2618 { 2705 {
2619 seq_begin = cmdbuf_ptr; 2706 seq_begin = cmdbuf_ptr;
2620 ch = next_char (); 2707 ch = next_char ();
2621 }
2622 2708
2623 if (ch == NOCHAR) // TODO: improve 2709 if (ch == NOCHAR)
2624 break; 2710 break;
2711 }
2625 2712
2626 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2713 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2627 { 2714 {
2628 if (!seen_input) 2715 if (!seen_input)
2629 { 2716 {
… …
2638 if (seen_resize && cmd_pid) 2725 if (seen_resize && cmd_pid)
2639 kill (-cmd_pid, SIGWINCH); 2726 kill (-cmd_pid, SIGWINCH);
2640 } 2727 }
2641 2728
2642 /* Read a text string from the input buffer */ 2729 /* Read a text string from the input buffer */
2643 unicode_t buf[UBUFSIZ]; 2730 wchar_t buf[UBUFSIZ];
2644 bool refreshnow = false; 2731 bool refreshnow = false;
2645 int nlines = 0; 2732 int nlines = 0;
2646 unicode_t *str = buf; 2733 wchar_t *str = buf;
2734 wchar_t *eol = str + min (ncol, UBUFSIZ);
2647 2735
2648 for (;;) 2736 for (;;)
2649 { 2737 {
2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2738 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2651 break; 2739 break;
2652 2740
2653 *str++ = ch; 2741 *str++ = ch;
2654 2742
2655 if (ch == C0_LF) 2743 if (ch == C0_LF || str >= eol)
2656 { 2744 {
2745 if (ch == C0_LF)
2657 nlines++; 2746 nlines++;
2747
2658 refresh_count++; 2748 refresh_count++;
2659 2749
2660 if (!(options & Opt_jumpScroll) 2750 if (!OPTION (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2751 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2752 {
2663 refreshnow = true; 2753 refreshnow = true;
2754 refresh_count = 0;
2664 ch = NOCHAR; 2755 ch = NOCHAR;
2665 break; 2756 break;
2666 } 2757 }
2667 2758
2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2759 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= TermWin.nrow - 1) 2760 if (nlines >= nrow - 1)
2670 { 2761 {
2762 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2763 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2764 scr_add_lines (buf, str - buf, nlines);
2765
2672 nlines = 0; 2766 nlines = 0;
2673 str = buf; 2767 str = buf;
2768 eol = str + min (ncol, UBUFSIZ);
2674 } 2769 }
2675 }
2676 2770
2677 if (str >= buf + UBUFSIZ) 2771 if (str >= eol)
2678 { 2772 {
2773 if (eol >= buf + UBUFSIZ)
2774 {
2679 ch = NOCHAR; 2775 ch = NOCHAR;
2680 break; 2776 break;
2777 }
2778 else
2779 eol = min (eol + ncol, buf + UBUFSIZ);
2780 }
2781
2681 } 2782 }
2682 2783
2683 seq_begin = cmdbuf_ptr; 2784 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2785 ch = next_char ();
2685 } 2786 }
2686 2787
2788 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2687 scr_add_lines (buf, nlines, str - buf); 2790 scr_add_lines (buf, str - buf, nlines);
2688 2791
2689 /* 2792 /*
2690 * If there have been a lot of new lines, then update the screen 2793 * 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. 2794 * 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 2795 * the number of pages between refreshes is refresh_limit, which
2693 * is incremented here because we must be doing flat-out scrolling. 2796 * is incremented here because we must be doing flat-out scrolling.
2694 */ 2797 */
2695 if (refreshnow) 2798 if (refreshnow)
2696 { 2799 {
2697 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2800 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2698 refresh_limit++; 2801 refresh_limit++;
2699 else 2802 else
2700 { 2803 {
2701 flag = true; 2804 flag = true;
2702 scr_refresh (refresh_type); 2805 scr_refresh ();
2806 want_refresh = 1;
2703 } 2807 }
2704 } 2808 }
2705 2809
2706 } 2810 }
2707 else 2811 else
… …
2722 } 2826 }
2723 2827
2724 return flag; 2828 return flag;
2725} 2829}
2726 2830
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 2831// read the next character
2737unicode_t 2832wchar_t
2738rxvt_term::next_char () 2833rxvt_term::next_char () NOTHROW
2739{ 2834{
2740 while (cmdbuf_ptr < cmdbuf_endp) 2835 while (cmdbuf_ptr < cmdbuf_endp)
2741 { 2836 {
2742 // assume 7-bit to be ascii ALWAYS 2837 // assume 7-bit to be ascii ALWAYS
2743 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2838 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2744 return *cmdbuf_ptr++; 2839 return *cmdbuf_ptr++;
2745 2840
2746 wchar_t wc; 2841 wchar_t wc;
2747 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2842 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2748 2843
2749 if (len == (size_t)-2) 2844 if (len == (size_t)-2)
2750 { 2845 {
2751 // the mbstate stores incomplete sequences. didn't know this :/ 2846 // the mbstate stores incomplete sequences. didn't know this :/
2752 cmdbuf_ptr = cmdbuf_endp; 2847 cmdbuf_ptr = cmdbuf_endp;
2753 break; 2848 break;
2754 } 2849 }
2755 2850
2756 if (len == (size_t)-1) 2851 if (len == (size_t)-1)
2757 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2852 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2758 2853
2759 // assume wchar == unicode 2854 // assume wchar == unicode
2760 cmdbuf_ptr += len; 2855 cmdbuf_ptr += len;
2761 return wc & UNICODE_MASK; 2856 return wc & UNICODE_MASK;
2762 } 2857 }
2763 2858
2764 return NOCHAR; 2859 return NOCHAR;
2765} 2860}
2861
2862// read the next octet
2863uint32_t
2864rxvt_term::next_octet () NOTHROW
2865{
2866 return cmdbuf_ptr < cmdbuf_endp
2867 ? (unsigned char)*cmdbuf_ptr++
2868 : NOCHAR;
2869}
2870
2871static class out_of_input out_of_input;
2766 2872
2767/* rxvt_cmd_getc () - Return next input character */ 2873/* rxvt_cmd_getc () - Return next input character */
2768/* 2874/*
2769 * Return the next input character after first passing any keyboard input 2875 * Return the next input character after first passing any keyboard input
2770 * to the command. 2876 * to the command.
2771 */ 2877 */
2772unicode_t 2878wchar_t
2773rxvt_term::cmd_getc () 2879rxvt_term::cmd_getc () THROW ((class out_of_input))
2774{ 2880{
2775 unicode_t c = next_char (); 2881 wchar_t c = next_char ();
2776 2882
2777 if (c == NOCHAR) 2883 if (c == NOCHAR)
2778 throw out_of_input; 2884 throw out_of_input;
2779 2885
2780 return c; 2886 return c;
2781} 2887}
2782 2888
2783unicode_t 2889uint32_t
2784rxvt_term::cmd_get8 () 2890rxvt_term::cmd_get8 () THROW ((class out_of_input))
2785{ 2891{
2786 unicode_t c = next_octet (); 2892 uint32_t c = next_octet ();
2787 2893
2788 if (c == NOCHAR) 2894 if (c == NOCHAR)
2789 throw out_of_input; 2895 throw out_of_input;
2790 2896
2791 return c; 2897 return c;
… …
2891 case C0_ESC: 2997 case C0_ESC:
2892 process_escape_seq (); 2998 process_escape_seq ();
2893 break; 2999 break;
2894 case C0_ENQ: /* terminal Status */ 3000 case C0_ENQ: /* terminal Status */
2895 if (rs[Rs_answerbackstring]) 3001 if (rs[Rs_answerbackstring])
2896 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3002 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2897 (unsigned int)strlen (rs[Rs_answerbackstring]));
2898 else 3003 else
2899 tt_write ((unsigned char *)VT100_ANS, 3004 tt_write (VT100_ANS, strlen (VT100_ANS));
2900 (unsigned int)strlen (VT100_ANS));
2901 break; 3005 break;
2902 case C0_BEL: /* bell */ 3006 case C0_BEL: /* bell */
2903 scr_bell (); 3007 scr_bell ();
2904 break; 3008 break;
2905 case C0_BS: /* backspace */ 3009 case C0_BS: /* backspace */
… …
3060 break; 3164 break;
3061 3165
3062 /* 8.3.87: NEXT LINE */ 3166 /* 8.3.87: NEXT LINE */
3063 case C1_NEL: /* ESC E */ 3167 case C1_NEL: /* ESC E */
3064 { 3168 {
3065 unicode_t nlcr[] = { C0_LF, C0_CR }; 3169 wchar_t nlcr[] = { C0_LF, C0_CR };
3066 scr_add_lines (nlcr, 1, 2); 3170 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3067 } 3171 }
3068 break; 3172 break;
3069 3173
3070 /* kidnapped escape sequence: Should be 8.3.48 */ 3174 /* kidnapped escape sequence: Should be 8.3.48 */
3071 case C1_ESA: /* ESC G */ 3175 case C1_ESA: /* ESC G */
… …
3093 process_dcs_seq (); 3197 process_dcs_seq ();
3094 break; 3198 break;
3095 3199
3096 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3200 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3097 case C1_SCI: /* ESC Z */ 3201 case C1_SCI: /* ESC Z */
3098 tt_write ((const unsigned char *)ESCZ_ANSWER, 3202 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3099 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3100 break; /* steal obsolete ESC [ c */ 3203 break; /* steal obsolete ESC [ c */
3101 3204
3102 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3205 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3103 case C1_CSI: /* ESC [ */ 3206 case C1_CSI: /* ESC [ */
3104 process_csi_seq (); 3207 process_csi_seq ();
… …
3344 3447
3345 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3448 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3346 arg[0] = -arg[0]; 3449 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 3450 /* FALLTHROUGH */
3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3451 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3452 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3350 break; 3453 break;
3351 3454
3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3455 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3353 tt_write ((const unsigned char *)VT100_ANS, 3456 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3354 (unsigned int) (sizeof (VT100_ANS) - 1));
3355 break; 3457 break;
3356 3458
3357 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3459 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3358 process_sgr_mode (nargs, arg); 3460 process_sgr_mode (nargs, arg);
3359 break; 3461 break;
… …
3366 break; 3468 break;
3367 case 6: /* CPR requested */ 3469 case 6: /* CPR requested */
3368 scr_report_position (); 3470 scr_report_position ();
3369 break; 3471 break;
3370 case 7: /* unofficial extension */ 3472 case 7: /* unofficial extension */
3371 if (options & Opt_insecure) 3473 if (OPTION (Opt_insecure))
3372 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3474 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3373 break; 3475 break;
3374 case 8: /* unofficial extension */ 3476 case 8: /* unofficial extension */
3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3477 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3376 break; 3478 break;
… …
3479 { 3581 {
3480 /* 3582 /*
3481 * commands 3583 * commands
3482 */ 3584 */
3483 case 1: /* deiconify window */ 3585 case 1: /* deiconify window */
3484 XMapWindow (disp, TermWin.parent[0]); 3586 XMapWindow (disp, parent[0]);
3485 break; 3587 break;
3486 case 2: /* iconify window */ 3588 case 2: /* iconify window */
3487 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3589 XIconifyWindow (disp, parent[0], display->screen);
3488 break; 3590 break;
3489 case 3: /* set position (pixels) */ 3591 case 3: /* set position (pixels) */
3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3592 XMoveWindow (disp, parent[0], args[1], args[2]);
3491 break; 3593 break;
3492 case 4: /* set size (pixels) */ 3594 case 4: /* set size (pixels) */
3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3595 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3494 break; 3596 break;
3495 case 5: /* raise window */ 3597 case 5: /* raise window */
3496 XRaiseWindow (disp, TermWin.parent[0]); 3598 XRaiseWindow (disp, parent[0]);
3497 break; 3599 break;
3498 case 6: /* lower window */ 3600 case 6: /* lower window */
3499 XLowerWindow (disp, TermWin.parent[0]); 3601 XLowerWindow (disp, parent[0]);
3500 break; 3602 break;
3501 case 7: /* refresh window */ 3603 case 7: /* refresh window */
3502 scr_touch (true); 3604 scr_touch (true);
3503 break; 3605 break;
3504 case 8: /* set size (chars) */ 3606 case 8: /* set size (chars) */
3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3607 set_widthheight ((unsigned int) (args[2] * fwidth),
3506 (unsigned int) (args[1] * TermWin.fheight)); 3608 (unsigned int) (args[1] * fheight));
3507 break; 3609 break;
3508 3610
3509 //case 9: NYI, TODO, restore maximized window or maximize window 3611 //case 9: NYI, TODO, restore maximized window or maximize window
3510 default: 3612 default:
3511 if (args[0] >= 24) /* set height (chars) */ 3613 if (args[0] >= 24) /* set height (chars) */
3512 set_widthheight ((unsigned int)TermWin.width, 3614 set_widthheight ((unsigned int)width,
3513 (unsigned int) (args[1] * TermWin.fheight)); 3615 (unsigned int) (args[1] * fheight));
3514 break; 3616 break;
3515 3617
3516 3618
3517 /* 3619 /*
3518 * reports - some output format copied from XTerm 3620 * reports - some output format copied from XTerm
3519 */ 3621 */
3520 case 11: /* report window state */ 3622 case 11: /* report window state */
3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3623 XGetWindowAttributes (disp, parent[0], &wattr);
3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3624 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3523 break; 3625 break;
3524 case 13: /* report window position */ 3626 case 13: /* report window position */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3627 XGetWindowAttributes (disp, parent[0], &wattr);
3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3628 XTranslateCoordinates (disp, parent[0], wattr.root,
3527 -wattr.border_width, -wattr.border_width, 3629 -wattr.border_width, -wattr.border_width,
3528 &x, &y, &wdummy); 3630 &x, &y, &wdummy);
3529 tt_printf ("\033[3;%d;%dt", x, y); 3631 tt_printf ("\033[3;%d;%dt", x, y);
3530 break; 3632 break;
3531 case 14: /* report window size (pixels) */ 3633 case 14: /* report window size (pixels) */
3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3634 XGetWindowAttributes (disp, parent[0], &wattr);
3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3635 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3534 break; 3636 break;
3535 case 18: /* report text area size (chars) */ 3637 case 18: /* report text area size (chars) */
3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3638 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3537 break; 3639 break;
3538 case 19: /* report window size (chars) */ 3640 case 19: /* report window size (chars) */
3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3641 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3540 break; 3642 break;
3541 case 20: /* report icon label */ 3643 case 20: /* report icon label */
3542 { 3644 {
3543 char *s; 3645 char *s;
3544 XGetIconName (disp, TermWin.parent[0], &s); 3646 XGetIconName (disp, parent[0], &s);
3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3647 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s); 3648 XFree (s);
3547 } 3649 }
3548 break; 3650 break;
3549 case 21: /* report window title */ 3651 case 21: /* report window title */
3550 { 3652 {
3551 char *s; 3653 char *s;
3552 XFetchName (disp, TermWin.parent[0], &s); 3654 XFetchName (disp, parent[0], &s);
3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3655 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3656 XFree (s);
3555 } 3657 }
3556 break; 3658 break;
3557 } 3659 }
3558} 3660}
… …
3561/*----------------------------------------------------------------------*/ 3663/*----------------------------------------------------------------------*/
3562/* 3664/*
3563 * get input up until STRING TERMINATOR (or BEL) 3665 * get input up until STRING TERMINATOR (or BEL)
3564 * ends_how is terminator used. returned input must be free()'d 3666 * ends_how is terminator used. returned input must be free()'d
3565 */ 3667 */
3566unsigned char * 3668char *
3567rxvt_term::get_to_st (unicode_t &ends_how) 3669rxvt_term::get_to_st (unicode_t &ends_how)
3568{ 3670{
3569 unicode_t ch; 3671 unicode_t ch;
3570 bool seen_esc = false; 3672 bool seen_esc = false;
3571 unsigned int n = 0; 3673 unsigned int n = 0;
… …
3604 3706
3605 string[n++] = '\0'; 3707 string[n++] = '\0';
3606 3708
3607 ends_how = (ch == 0x5c ? C0_ESC : ch); 3709 ends_how = (ch == 0x5c ? C0_ESC : ch);
3608 3710
3609 return (unsigned char *)rxvt_wcstombs (string); 3711 return rxvt_wcstombs (string);
3610} 3712}
3611 3713
3612/*----------------------------------------------------------------------*/ 3714/*----------------------------------------------------------------------*/
3613/* 3715/*
3614 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3716 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3615 */ 3717 */
3616void 3718void
3617rxvt_term::process_dcs_seq () 3719rxvt_term::process_dcs_seq ()
3618{ 3720{
3619 unsigned char *s; 3721 char *s;
3620 unicode_t eh; 3722 unicode_t eh;
3621 3723
3622 /* 3724 /*
3623 * Not handled yet 3725 * Not handled yet
3624 */ 3726 */
… …
3643 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3745 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3644 arg = arg * 10 + (ch - '0'); 3746 arg = arg * 10 + (ch - '0');
3645 3747
3646 if (ch == ';') 3748 if (ch == ';')
3647 { 3749 {
3648 unsigned char *s = get_to_st (eh); 3750 char *s = get_to_st (eh);
3649 3751
3650 if (s) 3752 if (s)
3651 { 3753 {
3652 process_xterm_seq (arg, (char *)s, eh); 3754 process_xterm_seq (arg, s, eh);
3653 free (s); 3755 free (s);
3654 } 3756 }
3655 } 3757 }
3656} 3758}
3657 3759
3658void 3760void
3659rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3761rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3660{ 3762{
3661 if (str[0] == '?' && !str[1]) 3763 if (str[0] == '?' && !str[1])
3662 { 3764 {
3663 unsigned short r, g, b; 3765 unsigned short r, g, b;
3664 pix_colors_focused[color].get (display, r, g, b); 3766 pix_colors_focused[color].get (display, r, g, b);
… …
3670 3772
3671/* 3773/*
3672 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3774 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3673 */ 3775 */
3674void 3776void
3675rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3777rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3676{ 3778{
3677 int changed = 0;
3678 int color; 3779 int color;
3679 char *buf, *name; 3780 char *buf, *name;
3680 bool query = str[0] == '?' && !str[1]; 3781 bool query = str[0] == '?' && !str[1];
3681 int saveop = op; 3782 int saveop = op;
3682 dDisp; 3783 dDisp;
… …
3703 unsigned long bytes_after; 3804 unsigned long bytes_after;
3704 unsigned char *value = 0; 3805 unsigned char *value = 0;
3705 const char *str = ""; 3806 const char *str = "";
3706 3807
3707 if (prop 3808 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0], 3809 && XGetWindowProperty (disp, parent[0],
3709 prop, 0, 1<<16, 0, AnyPropertyType, 3810 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format, 3811 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success 3812 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None 3813 && actual_type != None
3713 && actual_format == 8) 3814 && actual_format == 8)
… …
3725 { 3826 {
3726 *eq = 0; 3827 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1); 3828 set_utf8_property (display->atom (str), eq + 1);
3728 } 3829 }
3729 else 3830 else
3730 XDeleteProperty (disp, TermWin.parent[0], 3831 XDeleteProperty (disp, parent[0],
3731 display->atom (str)); 3832 display->atom (str));
3732 } 3833 }
3733 break; 3834 break;
3734 3835
3735 case XTerm_Color: 3836 case XTerm_Color:
… …
3737 { 3838 {
3738 if ((name = strchr (buf, ';')) == NULL) 3839 if ((name = strchr (buf, ';')) == NULL)
3739 break; 3840 break;
3740 3841
3741 *name++ = '\0'; 3842 *name++ = '\0';
3742 color = atoi (buf); 3843 color = atoi (buf) + minCOLOR;
3743 3844
3744 if (color < 0 || color >= TOTAL_COLORS) 3845 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3745 break; 3846 break;
3746 3847
3747 if ((buf = strchr (name, ';')) != NULL) 3848 if ((buf = strchr (name, ';')) != NULL)
3748 *buf++ = '\0'; 3849 *buf++ = '\0';
3749 3850
3750 if (name[0] == '?' && !name[1]) 3851 if (name[0] == '?' && !name[1])
3751 { 3852 {
3752 unsigned short r, g, b; 3853 unsigned short r, g, b;
3753 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3854 pix_colors_focused[color].get (display, r, g, b);
3754 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3855 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3755 } 3856 }
3756 else 3857 else
3757 set_window_color (color + minCOLOR, name); 3858 set_window_color (color, name);
3758 } 3859 }
3759 break; 3860 break;
3760 case XTerm_Color00: 3861 case XTerm_Color00:
3761 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3862 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3762 break; 3863 break;
3763 case XTerm_Color01: 3864 case XTerm_Color01:
3764 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3865 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3765 break; 3866 break;
3766#ifndef NO_CURSORCOLOR 3867#ifndef NO_CURSORCOLOR
3767 case XTerm_Color_cursor: 3868 case XTerm_Color_cursor:
3768 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3869 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3769 break; 3870 break;
… …
3773 break; 3874 break;
3774 case XTerm_Color_pointer_bg: 3875 case XTerm_Color_pointer_bg:
3775 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3876 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3776 break; 3877 break;
3777#ifndef NO_BOLD_UNDERLINE_REVERSE 3878#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: 3879 case XTerm_Color_RV:
3785 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3880 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3881 break;
3882 case Rxvt_Color_BD:
3883 case URxvt_Color_BD:
3884 process_color_seq (op, Color_BD, str, resp);
3885 break;
3886 case Rxvt_Color_UL:
3887 case URxvt_Color_UL:
3888 process_color_seq (op, Color_UL, str, resp);
3786 break; 3889 break;
3787 case URxvt_Color_IT: 3890 case URxvt_Color_IT:
3788 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3891 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3789 break; 3892 break;
3790#endif 3893#endif
… …
3795 if (am_transparent) 3898 if (am_transparent)
3796 want_full_refresh = want_refresh = 1; 3899 want_full_refresh = want_refresh = 1;
3797 break; 3900 break;
3798#endif 3901#endif
3799 3902
3800 case XTerm_Pixmap: 3903 case Rxvt_Pixmap:
3904 {
3801 if (*str != ';') 3905 if (*str != ';')
3802 { 3906 {
3803#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3804 scale_pixmap (""); /* reset to default scaling */ 3908 scale_pixmap (""); /* reset to default scaling */
3805 set_bgPixmap (str); /* change pixmap */ 3909 set_bgPixmap (str); /* change pixmap */
3806#endif
3807 scr_touch (true); 3910 scr_touch (true);
3911#endif
3808 } 3912 }
3913
3914 int changed = 0;
3915
3809 while ((str = strchr (str, ';')) != NULL) 3916 while ((str = strchr (str, ';')) != NULL)
3810 { 3917 {
3811 str++; 3918 str++;
3812#if XPM_BACKGROUND 3919#if XPM_BACKGROUND
3813 changed += scale_pixmap (str); 3920 changed += scale_pixmap (str);
3814#endif 3921#endif
3815 } 3922 }
3816 3923
3817 if (changed) 3924 if (changed)
3818 { 3925 {
3819#ifdef XPM_BACKGROUND 3926#ifdef XPM_BACKGROUND
3820 resize_pixmap (); 3927 resize_pixmap ();
3821#endif
3822 scr_touch (true); 3928 scr_touch (true);
3929#endif
3823 } 3930 }
3931 }
3824 break; 3932 break;
3825 3933
3826 case XTerm_restoreFG: 3934 case Rxvt_restoreFG:
3827 set_window_color (Color_fg, str); 3935 set_window_color (Color_fg, str);
3828 break; 3936 break;
3829 case XTerm_restoreBG: 3937 case Rxvt_restoreBG:
3830 set_window_color (Color_bg, str); 3938 set_window_color (Color_bg, str);
3831 break; 3939 break;
3832 3940
3833 case XTerm_logfile: 3941 case XTerm_logfile:
3834 // TODO, when secure mode? 3942 // TODO, when secure mode?
3835 break; 3943 break;
3836 3944
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 3945#if 0
3844 case XTerm_dumpscreen: /* no error notices */ 3946 case Rxvt_dumpscreen: /* no error notices */
3845 { 3947 {
3846 int fd; 3948 int fd;
3847 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3949 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3848 { 3950 {
3849 scr_dump (fd); 3951 scr_dump (fd);
… …
3860 case URxvt_italicFont: 3962 case URxvt_italicFont:
3861 case URxvt_boldItalicFont: 3963 case URxvt_boldItalicFont:
3862#endif 3964#endif
3863 if (query) 3965 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop, 3966 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3967 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3968 ? fontset[op - URxvt_font]->fontdesc : "",
3867 resp); 3969 resp);
3868 else 3970 else
3869 { 3971 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3972 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871 3973
… …
3876 break; 3978 break;
3877 3979
3878#if ENABLE_FRILLS 3980#if ENABLE_FRILLS
3879 case URxvt_locale: 3981 case URxvt_locale:
3880 if (query) 3982 if (query)
3881 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3983 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3882 else 3984 else
3883 { 3985 {
3884 set_locale (str); 3986 set_locale (str);
3885 pty.set_utf8_mode (enc_utf8); 3987 pty->set_utf8_mode (enc_utf8);
3886 init_xlocale (); 3988 init_xlocale ();
3887 } 3989 }
3888 break; 3990 break;
3889 3991
3890 case URxvt_view_up: 3992 case URxvt_view_up:
3891 case URxvt_view_down: 3993 case URxvt_view_down:
3994 {
3892 int lines = atoi (str); 3995 int lines = atoi (str);
3893 3996
3894 if (lines) 3997 if (lines)
3895 scr_page (op == URxvt_view_up ? UP : DN, lines); 3998 scr_page (op == URxvt_view_up ? UP : DN, lines);
3896 else 3999 else
3897 {
3898 scr_erase_savelines (); 4000 scr_erase_savelines ();
3899 } 4001 }
3900 4002
4003 break;
4004#endif
4005
4006#if ENABLE_PERL
4007 case URxvt_perl:
4008 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4009 ; // no responses yet
3901 break; 4010 break;
3902#endif 4011#endif
3903 } 4012 }
3904} 4013}
3905/*----------------------------------------------------------------------*/ 4014/*----------------------------------------------------------------------*/
… …
3936 return state; 4045 return state;
3937} 4046}
3938 4047
3939/* we're not using priv _yet_ */ 4048/* we're not using priv _yet_ */
3940void 4049void
3941rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4050rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3942{ 4051{
3943 unsigned int i, j; 4052 unsigned int i, j;
3944 int state; 4053 int state;
3945 4054
3946 static const struct 4055 static const struct
… …
3957 { 5, PrivMode_rVideo }, 4066 { 5, PrivMode_rVideo },
3958 { 6, PrivMode_relOrigin }, 4067 { 6, PrivMode_relOrigin },
3959 { 7, PrivMode_Autowrap }, 4068 { 7, PrivMode_Autowrap },
3960 // 8, bi-directional support mode 4069 // 8, bi-directional support mode
3961 { 9, PrivMode_MouseX10 }, 4070 { 9, PrivMode_MouseX10 },
3962#ifdef menuBar_esc
3963 { menuBar_esc, PrivMode_menuBar },
3964#endif
3965 // 18, 19 printing-related 4071 // 18, 19 printing-related
3966 { 25, PrivMode_VisibleCursor }, 4072 { 25, PrivMode_VisibleCursor },
3967#ifdef scrollBar_esc 4073#ifdef scrollBar_esc
3968 { scrollBar_esc, PrivMode_scrollBar }, 4074 { scrollBar_esc, PrivMode_scrollBar },
3969#endif 4075#endif
… …
4014 } 4120 }
4015 4121
4016 /* extra handling for values with state unkept */ 4122 /* extra handling for values with state unkept */
4017 switch (arg[i]) 4123 switch (arg[i])
4018 { 4124 {
4125#if ENABLE_STYLES
4126 case 1021:
4127 set_option (Opt_intensityStyles, mode);
4128
4129 scr_touch (true);
4130 break;
4131#endif
4019 case 1048: /* alternative cursor save */ 4132 case 1048: /* alternative cursor save */
4020 case 1049: 4133 case 1049:
4021 if (options & Opt_secondaryScreen) 4134 if (OPTION (Opt_secondaryScreen))
4022 if (mode == 0) 4135 if (mode == 0)
4023 scr_cursor (RESTORE); 4136 scr_cursor (RESTORE);
4024 else if (mode == 1) 4137 else if (mode == 1)
4025 scr_cursor (SAVE); 4138 scr_cursor (SAVE);
4026 break; 4139 break;
… …
4038 */ 4151 */
4039 PrivMode (1, PrivMode_vt52); 4152 PrivMode (1, PrivMode_vt52);
4040 break; 4153 break;
4041 case 3: /* 80/132 */ 4154 case 3: /* 80/132 */
4042 if (priv_modes & PrivMode_132OK) 4155 if (priv_modes & PrivMode_132OK)
4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4156 set_widthheight (((state ? 132 : 80) * fwidth), height);
4044 break; 4157 break;
4045 case 4: /* smooth scrolling */ 4158 case 4: /* smooth scrolling */
4046 if (state)
4047 options &= ~Opt_jumpScroll;
4048 else
4049 options |= Opt_jumpScroll; 4159 set_option (Opt_jumpScroll, !state);
4050 break; 4160 break;
4051 case 5: /* reverse video */ 4161 case 5: /* reverse video */
4052 scr_rvideo_mode (state); 4162 scr_rvideo_mode (state);
4053 break; 4163 break;
4054 case 6: /* relative/absolute origins */ 4164 case 6: /* relative/absolute origins */
… …
4060 /* case 8: - auto repeat, can't do on a per window basis */ 4170 /* case 8: - auto repeat, can't do on a per window basis */
4061 case 9: /* X10 mouse reporting */ 4171 case 9: /* X10 mouse reporting */
4062 if (state) /* orthogonal */ 4172 if (state) /* orthogonal */
4063 priv_modes &= ~PrivMode_MouseX11; 4173 priv_modes &= ~PrivMode_MouseX11;
4064 break; 4174 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 4175#ifdef scrollBar_esc
4073 case scrollBar_esc: 4176 case scrollBar_esc:
4074 if (scrollbar_mapping (state)) 4177 if (scrollbar_mapping (state))
4075 { 4178 {
4076 resize_all_windows (0, 0, 0); 4179 resize_all_windows (0, 0, 0);
… …
4095#if 0 4198#if 0
4096 case 1001: 4199 case 1001:
4097 break; /* X11 mouse highlighting */ 4200 break; /* X11 mouse highlighting */
4098#endif 4201#endif
4099 case 1010: /* scroll to bottom on TTY output inhibit */ 4202 case 1010: /* scroll to bottom on TTY output inhibit */
4100 if (state)
4101 options &= ~Opt_scrollTtyOutput;
4102 else
4103 options |= Opt_scrollTtyOutput; 4203 set_option (Opt_scrollTtyOutput, !state);
4104 break; 4204 break;
4105 case 1011: /* scroll to bottom on key press */ 4205 case 1011: /* scroll to bottom on key press */
4106 if (state)
4107 options |= Opt_scrollTtyKeypress; 4206 set_option (Opt_scrollTtyKeypress, state);
4108 else
4109 options &= ~Opt_scrollTtyKeypress;
4110 break; 4207 break;
4111 case 1047: /* secondary screen w/ clearing last */ 4208 case 1047: /* secondary screen w/ clearing last */
4112 if (options & Opt_secondaryScreen) 4209 if (OPTION (Opt_secondaryScreen))
4113 if (current_screen != PRIMARY) 4210 if (current_screen != PRIMARY)
4114 scr_erase_screen (2); 4211 scr_erase_screen (2);
4115 scr_change_screen (state); 4212 scr_change_screen (state);
4116 break; 4213 break;
4117 case 1049: /* secondary screen w/ clearing first */ 4214 case 1049: /* secondary screen w/ clearing first */
4118 scr_change_screen (state); 4215 scr_change_screen (state);
4119 if (options & Opt_secondaryScreen) 4216 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4218 scr_erase_screen (2);
4122 break; 4219 break;
4123 default: 4220 default:
4124 break; 4221 break;
… …
4252 scr_color (Color_bg, Color_bg); 4349 scr_color (Color_bg, Color_bg);
4253 break; 4350 break;
4254 4351
4255 //case 50: // not variable spacing 4352 //case 50: // not variable spacing
4256 4353
4257#ifndef NO_BRIGHTCOLOR 4354#if ENABLE_FRILLS
4258 case 90: 4355 case 90:
4259 case 91: /* set bright fg color */ 4356 case 91: /* set bright fg color */
4260 case 92: 4357 case 92:
4261 case 93: 4358 case 93:
4262 case 94: 4359 case 94:
… …
4274 case 106: 4371 case 106:
4275 case 107: 4372 case 107:
4276 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4373 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4277 break; 4374 break;
4278#endif 4375#endif
4279
4280 } 4376 }
4281 } 4377 }
4282} 4378}
4283/*}}} */ 4379/*}}} */
4284 4380
… …
4308 */ 4404 */
4309void 4405void
4310rxvt_term::tt_printf (const char *fmt,...) 4406rxvt_term::tt_printf (const char *fmt,...)
4311{ 4407{
4312 va_list arg_ptr; 4408 va_list arg_ptr;
4313 unsigned char buf[256]; 4409 char buf[256];
4314 4410
4315 va_start (arg_ptr, fmt); 4411 va_start (arg_ptr, fmt);
4316 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4412 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4317 va_end (arg_ptr); 4413 va_end (arg_ptr);
4318 tt_write (buf, strlen (buf)); 4414 tt_write (buf, strlen (buf));
… …
4323 * or generated by us in response to a query ESC sequence. 4419 * or generated by us in response to a query ESC sequence.
4324 */ 4420 */
4325const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4421const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4326 4422
4327void 4423void
4328rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4424rxvt_term::tt_write (const char *data, unsigned int len)
4329{ 4425{
4426 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4427 return;
4428
4429 if (pty->pty < 0)
4430 return;
4431
4330 if (v_buflen == 0) 4432 if (v_buflen == 0)
4331 { 4433 {
4332 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4434 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4333 4435
4334 if ((unsigned int)written == len) 4436 if ((unsigned int)written == len)
4335 return; 4437 return;
4336 4438
4337 data += written; 4439 data += written;
4338 len -= written; 4440 len -= written;
4339 } 4441 }
4340 4442
4341 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4443 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4342 4444
4343 memcpy (v_buffer + v_buflen, data, len); 4445 memcpy (v_buffer + v_buflen, data, len);
4344 v_buflen += len; 4446 v_buflen += len;
4345 4447
4346 pty_ev.set (EVENT_READ | EVENT_WRITE); 4448 pty_ev.set (EVENT_READ | EVENT_WRITE);
4347} 4449}
4348 4450
4349void rxvt_term::pty_write () 4451void rxvt_term::pty_write ()
4350{ 4452{
4351 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4453 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4352 4454
4353 if (written > 0) 4455 if (written > 0)
4354 { 4456 {
4355 v_buflen -= written; 4457 v_buflen -= written;
4356 4458
… …
4365 } 4467 }
4366 4468
4367 memmove (v_buffer, v_buffer + written, v_buflen); 4469 memmove (v_buffer, v_buffer + written, v_buflen);
4368 } 4470 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4471 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this... 4472 pty_ev.set (EVENT_READ);
4371 destroy ();
4372} 4473}
4373 4474
4374/*----------------------- end-of-file (C source) -----------------------*/ 4475/*----------------------- end-of-file (C source) -----------------------*/
4375 4476

Diff Legend

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