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

Diff Legend

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