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.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC

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

Diff Legend

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