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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <cwchar> 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
54#include <csignal> 63#include <csignal>
55 64
56/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
57 66
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
61class out_of_input { } out_of_input;
62 68
63#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
64 70
65#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
114 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 122 XK_Print, 0x2399,
117 123
118 XK_space, 0x2423, 124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 132 XK_KP_Space, 0x2422,
133#endif
120 0, 134 0,
121}; 135};
122 136
123void 137void
124rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
125{ 139{
126 x = Pixel2Col (x); 140 x = Pixel2Col (x);
127 y = Pixel2Row (y); 141 y = Pixel2Row (y);
128 142
129 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 145 return;
132 146
133 for (;;) 147 for (;;)
134 { 148 {
135 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];
136 152
137 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
138 { 154 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
142 break; 157 break;
143 } 158 }
144 159
145 x--; 160 x--;
146 } 161 }
147
148} 162}
149#endif
150 163
151#if ENABLE_OVERLAY
152void 164void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 166{
155 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 170 int len;
159 171
172 fname = rxvt_utf8towcs (f->name);
173
160#if ENABLE_COMBINING 174# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
162 { 176 {
163 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
166 } 180 }
167 else 181 else
168#endif 182# endif
169 { 183 {
170 ch2 = ch; 184 ch2 = ch;
171 185
172 alloc = 0; 186 alloc = 0;
173 chr = &ch2; 187 chr = &ch2;
174 len = 1; 188 len = 1;
175 } 189 }
176 190
177 int width = strlen (f->name); 191 char attr[80]; // plenty
178 192
179 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);
180 215
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 217
183 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
184 { 219 {
… …
187 ch = *chr++; 222 ch = *chr++;
188 223
189 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
192#if !UNICODE3 227# if !UNICODE3
193 if (ch >= 0x10000) 228 if (ch >= 0x10000)
194 ch = 0xfffd; 229 ch = 0xfffd;
195#endif 230# endif
196 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
198 } 233 }
199 234
235 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 236 scr_overlay_set (0, len + 1, fname);
201 237
238 free (fname);
239
202#if ENABLE_COMBINING 240# if ENABLE_COMBINING
203 if (alloc) 241 if (alloc)
204 delete [] alloc; 242 delete [] alloc;
205#endif 243# endif
206} 244}
207#endif 245#endif
208 246
209void 247void
210rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 265 mb[0] = ch[0];
228 len = 1; 266 len = 1;
229 } 267 }
230 268
231 if (len > 0) 269 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
233 else 271 else
234 scr_bell (); 272 scr_bell ();
235 } 273 }
236 274
237 iso14755buf = 0; 275 iso14755buf = 0;
… …
265 KeySym keysym; 303 KeySym keysym;
266#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
268#endif 306#endif
269 int valid_keysym; 307 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
271 309
272 /* 310 /*
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
275 * 313 *
276 * Always permit `shift' to override the current setting 314 * Always permit `shift' to override the current setting
277 */ 315 */
278 shft = (ev.state & ShiftMask); 316 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 317 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 318 meta = ev.state & ModMetaMask;
281 319
282 if (numlock_state || (ev.state & ModNumLockMask)) 320 if (numlock_state || (ev.state & ModNumLockMask))
283 { 321 {
284 numlock_state = (ev.state & ModNumLockMask); 322 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 323 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 331 Status status_return;
294 332
295#if 0 333#if 0
296#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
300 else 338 else
301#endif 339#endif
302#endif 340#endif
303 { 341 {
… …
305 343
306 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
310 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
313 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 354 SET_LOCALE (locale);
315 355
316 if (status_return == XLookupChars 356 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
339 } 379 }
340 else 380 else
341#endif 381#endif
342 { 382 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
345 } 385 }
346 386
347 if (valid_keysym) 387 if (valid_keysym)
348 { 388 {
389#ifdef KEYSYM_RESOURCE
390 if (keyboard->dispatch (this, keysym, ev.state))
391 return;
392#endif
393
349 if (TermWin.saveLines) 394 if (saveLines)
350 { 395 {
351#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 397 if (!ctrl && !meta)
353#else 398#else
354 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
355#endif 400#endif
356 { 401 {
357 int lnsppg; 402 int lnsppg;
358 403
359#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 406#else
362 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
363#endif 408#endif
364 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
365 { 410 {
366 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
367 return; 412 return;
… …
395 scr_move_to (0, 1); 440 scr_move_to (0, 1);
396 return; 441 return;
397 } 442 }
398 else if (keysym == XK_End) 443 else if (keysym == XK_End)
399 { 444 {
400 scr_move_to (1, 0); 445 scr_move_to (1, 1);
401 return; 446 return;
402 } 447 }
403 } 448 }
404#endif 449#endif
405 } 450 }
… …
416 { 461 {
417 switch (keysym) 462 switch (keysym)
418 { 463 {
419 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
420 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
421 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
422 return; 467 return;
423#if TODO 468#if TODO
424 /* rxvt extras */ 469 /* rxvt extras */
425 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
426 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
487 } 532 }
488#endif 533#endif
489 534
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 535 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 536 {
492#ifdef KEYSYM_RESOURCE
493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 537 {
518 newlen = 1; 538 newlen = 1;
519 switch (keysym) 539 switch (keysym)
520 { 540 {
521#ifndef NO_BACKSPACE_KEY 541#ifndef NO_BACKSPACE_KEY
… …
529 else 549 else
530 strcpy (kbuf, key_backspace); 550 strcpy (kbuf, key_backspace);
531 break; 551 break;
532#endif 552#endif
533#ifndef NO_DELETE_KEY 553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
534 case XK_Delete: 564 case XK_Delete:
535 strcpy (kbuf, key_delete); 565 strcpy (kbuf, key_delete);
536 break; 566 break;
537#endif 567#endif
538 case XK_Tab: 568 case XK_Tab:
… …
641#ifdef XK_KP_Begin 671#ifdef XK_KP_Begin
642 case XK_KP_Begin: 672 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 673 strcpy (kbuf, "\033Ou");
644 break; 674 break;
645 675
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 676#endif
654 case XK_KP_F1: /* "\033OP" */ 677 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 678 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 679 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 680 case XK_KP_F4: /* "\033OS" */
… …
689 break; 712 break;
690 713
691 case XK_Find: 714 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 715 strcpy (kbuf, "\033[1~");
693 break; 716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
694 case XK_Insert: 728 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 729 strcpy (kbuf, "\033[2~");
696 break; 730 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 731#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 732 case DXK_Remove:
… …
785 case XK_F35: /* "\033[49~" */ 819 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 820 FKEY (31, XK_F17);
787 break; 821 break;
788#undef FKEY 822#undef FKEY
789 default: 823 default:
790 if (len == 0 824 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 825 break;
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795 } 826 }
796 827
797 if (newlen) 828 if (newlen)
798 len = strlen (kbuf); 829 len = strlen (kbuf);
799 } 830 }
… …
815 else if (keysym == XK_ISO_Left_Tab) 846 else if (keysym == XK_ISO_Left_Tab)
816 { 847 {
817 strcpy (kbuf, "\033[Z"); 848 strcpy (kbuf, "\033[Z");
818 len = 3; 849 len = 3;
819 } 850 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
827 else 851 else
828 { 852 {
829#ifdef META8_OPTION 853#ifdef META8_OPTION
830 /* set 8-bit on */ 854 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
832 { 856 {
833 unsigned char *ch; 857 char *ch;
834 858
835 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
836 *ch |= 0x80; 860 *ch |= 0x80;
837 861
838 meta = 0; 862 meta = 0;
… …
840#endif 864#endif
841 /* nil */ ; 865 /* nil */ ;
842 } 866 }
843 } 867 }
844 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
845 if (len <= 0) 872 if (len <= 0)
846 return; /* not mapped */ 873 return; /* not mapped */
847 874
848 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
849 if (TermWin.view_start) 876 if (view_start)
850 { 877 {
851 TermWin.view_start = 0; 878 view_start = 0;
852 want_refresh = 1; 879 want_refresh = 1;
853 } 880 }
854 881
855 /* 882 /*
856 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
871#ifdef META8_OPTION 898#ifdef META8_OPTION
872 && meta_char == C0_ESC 899 && meta_char == C0_ESC
873#endif 900#endif
874 ) 901 )
875 { 902 {
876 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
877 tt_write (&ch, 1); 904 tt_write (&ch, 1);
878 } 905 }
879 906
880#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
881 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
889#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
891} 918}
892/*}}} */ 919/*}}} */
893 920
894#if (MENUBAR_MAX) 921#if defined (KEYSYM_RESOURCE)
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896/* attempt to `write' count to the input buffer */
897unsigned int 922unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
899{ 924{
900 unsigned int n, s; 925 unsigned int n, s;
901 926
902 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
922 947
923 cmd_parse (); 948 cmd_parse ();
924 949
925 return 0; 950 return 0;
926} 951}
927#endif /* MENUBAR_MAX */ 952#endif
928 953
929void 954void
930rxvt_term::flush () 955rxvt_term::flush ()
931{ 956{
932 flush_ev.stop (); 957 flush_ev.stop ();
… …
940 } 965 }
941#endif 966#endif
942 967
943 if (want_refresh) 968 if (want_refresh)
944 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
945 scr_refresh (refresh_type); 1008 scr_refresh ();
946 scrollbar_show (1); 1009 scrollbar_show (1);
947#ifdef USE_XIM 1010#ifdef USE_XIM
948 IMSendSpot (); 1011 IMSendSpot ();
949#endif 1012#endif
950 } 1013 }
… …
953} 1016}
954 1017
955void 1018void
956rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
957{ 1020{
958 SET_R (this); 1021 make_current ();
959 SET_LOCALE (locale);
960 1022
961 display->flush (); 1023 display->flush ();
962 1024
963 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965} 1027}
966 1028
967void 1029void
968rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
969{ 1031{
970 SET_R (this); 1032 make_current ();
971 SET_LOCALE (locale);
972 1033
973 refresh_limit = 1; 1034 refresh_limit = 1;
974 refresh_count = 0; 1035 refresh_count = 0;
975 flush (); 1036 flush ();
976} 1037}
… …
980rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
981{ 1042{
982 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
983 want_refresh = 1; 1044 want_refresh = 1;
984 1045
985 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
986} 1047}
987#endif 1048#endif
988 1049
989#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
990void 1051void
… …
1004rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1005{ 1066{
1006 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1007 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1008 { 1069 {
1009 refresh_type |= SMOOTH_REFRESH;
1010 want_refresh = 1; 1070 want_refresh = 1;
1011 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1012 } 1072 }
1013} 1073}
1014#endif 1074#endif
… …
1018rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1019{ 1079{
1020 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1021 { 1081 {
1022 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1023 refresh_type |= SMOOTH_REFRESH;
1024 want_refresh = 1; 1083 want_refresh = 1;
1025 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1026 } 1085 }
1027} 1086}
1028#endif 1087#endif
… …
1033{ 1092{
1034 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1096 {
1038 refresh_type |= SMOOTH_REFRESH; 1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1039 want_refresh = 1; 1100 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1102 }
1042} 1103}
1043#endif 1104#endif
1044 1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1045bool 1124bool
1046rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1047{ 1126{
1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049 1128
1050 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1051 { 1130 {
1052 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1053 n = 0; 1132 n = 0;
1054 } 1133 }
1055 1134
1056 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1057 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1058 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1059 1138
1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1061 1140
1062 if (n > 0) 1141 if (r > 0)
1063 { 1142 {
1064 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1065 return true; 1144 return true;
1066 } 1145 }
1067 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
1068 destroy (); 1158 destroy ();
1159 }
1069 1160
1070 return false; 1161 return false;
1071} 1162}
1072 1163
1073void 1164void
1074rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1075{ 1166{
1076 SET_R (this); 1167 make_current ();
1077 SET_LOCALE (locale);
1078 1168
1079 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1080 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1081 while (pty_fill ()) 1171 while (pty_fill ())
1082 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1087} 1177}
1088 1178
1089void 1179void
1090rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1091{ 1181{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1093 recolour_cursor (); 1183 recolour_cursor ();
1094 1184
1095#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1186 hidden_pointer = 0;
1097 1187
1098 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1099 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1100#endif 1190#endif
1101} 1191}
1102 1192
1103#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1104void 1194void
1105rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1106{ 1196{
1107 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1108 return; 1198 return;
1109 1199
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1111 XFlush (display->display); 1201 XFlush (display->display);
1112 1202
1113 hidden_pointer = 1; 1203 hidden_pointer = 1;
1114} 1204}
1115 1205
1116void 1206void
1117rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1118{ 1208{
1119 SET_R (this); 1209 make_current ();
1120 SET_LOCALE (locale);
1121 1210
1122 pointer_blank (); 1211 pointer_blank ();
1123} 1212}
1124#endif 1213#endif
1125 1214
… …
1204 1293
1205/*{{{ process an X event */ 1294/*{{{ process an X event */
1206void 1295void
1207rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1208{ 1297{
1209 SET_R (this); 1298 make_current ();
1210 SET_LOCALE (locale);
1211 1299
1212#if defined(CURSOR_BLINK) 1300 dDisp;
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1214 {
1215 if (hidden_cursor)
1216 {
1217 hidden_cursor = 0;
1218 want_refresh = 1;
1219 }
1220 1301
1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1302 if (ev.xany.window == vt
1222 } 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1223#endif 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1224 1306
1225#if defined(POINTER_BLANK) 1307 // for XQueryPointer
1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1227 {
1228 if (ev.type == MotionNotify
1229 || ev.type == ButtonPress
1230 || ev.type == ButtonRelease)
1231 if (hidden_pointer)
1232 pointer_unblank ();
1233
1234 if (ev.type == KeyPress && hidden_pointer == 0)
1235 pointer_blank ();
1236 }
1237#endif
1238
1239 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1240 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1241 unsigned int unused_mask; 1310 unsigned int unused_mask;
1242 1311
1243 switch (ev.type) 1312 switch (ev.type)
… …
1250 1319
1251 break; 1320 break;
1252 1321
1253 case KeyRelease: 1322 case KeyRelease:
1254 { 1323 {
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1256 KeySym ks; 1325 KeySym keysym;
1257 1326
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif 1328#endif
1260 1329
1261#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support 1331 // ISO 14755 support
1263 if (iso14755buf) 1332 if (iso14755buf)
… …
1268# endif 1337# endif
1269# if ISO_14755 1338# if ISO_14755
1270 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1271 // first: controls 1340 // first: controls
1272 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1275 { 1344 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1277 commit_iso14755 (); 1346 commit_iso14755 ();
1278 return; // case-break; 1347 goto skip_switch;
1279 } 1348 }
1280 1349
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks) 1351 if (i[0] == keysym)
1283 { 1352 {
1284 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 (); 1354 commit_iso14755 ();
1286 return; // case-break; 1355 goto skip_switch;
1287 } 1356 }
1288 1357
1289 scr_bell (); 1358 scr_bell ();
1290# endif 1359# endif
1291 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1310 else 1379 else
1311 iso14755buf = 0; 1380 iso14755buf = 0;
1312 } 1381 }
1313#endif 1382#endif
1314 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1316 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1319 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1320#endif 1393#endif
1321 break; 1394 break;
1322 } 1395 }
1323 1396
… …
1329 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1330 break; 1403 break;
1331 1404
1332 case ClientMessage: 1405 case ClientMessage:
1333 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1408 {
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335 destroy (); 1410 destroy ();
1411#if ENABLE_EWMH
1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413 XSendEvent (disp, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev);
1416#endif
1417 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1336#ifdef OFFIX_DND 1427#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */ 1428 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile 1430 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir 1431 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink)) 1432 || ev.xclient.data.l[0] == DndLink))
1342 { 1433 {
1343 /* Get Dnd data */ 1434 /* Get Dnd data */
1344 Atom ActualType; 1435 Atom ActualType;
1345 int ActualFormat; 1436 int ActualFormat;
1346 unsigned char *data; 1437 unsigned char *data;
1347 unsigned long Size, RemainingBytes; 1438 unsigned long Size, RemainingBytes;
1348 1439
1349 XGetWindowProperty (display->display, display->root, 1440 XGetWindowProperty (disp, display->root,
1350 xa[XA_DNDSELECTION], 1441 xa[XA_DNDSELECTION],
1351 0L, 1000000L, 1442 0L, 1000000L,
1352 False, AnyPropertyType, 1443 False, AnyPropertyType,
1353 &ActualType, &ActualFormat, 1444 &ActualType, &ActualFormat,
1354 &Size, &RemainingBytes, 1445 &Size, &RemainingBytes,
1355 &data); 1446 &data);
1356 set_string_property (XA_CUT_BUFFER0, data); 1447 set_string_property (XA_CUT_BUFFER0, data);
1357 XFree (data); 1448 XFree (data);
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360 } 1451 }
1361#endif /* OFFIX_DND */ 1452#endif /* OFFIX_DND */
1362 break; 1453 break;
1363 1454
1364 case MappingNotify: 1455 case MappingNotify:
… …
1389 break; 1480 break;
1390 } 1481 }
1391 break; 1482 break;
1392 1483
1393 case FocusIn: 1484 case FocusIn:
1394 if (!TermWin.focus) 1485 focus_in ();
1486 break;
1487
1488 case FocusOut:
1489 focus_out ();
1490 break;
1491
1492 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0])
1395 { 1494 {
1396 TermWin.focus = 1;
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1402 XSetICFocus (Input_Context);
1403 }
1404#endif
1405#ifdef CURSOR_BLINK
1406 if (options & Opt_cursorBlink)
1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1415#endif
1416
1417 }
1418 break;
1419
1420 case FocusOut:
1421 if (TermWin.focus)
1422 {
1423 TermWin.focus = 0;
1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1432#ifdef USE_XIM
1433 if (Input_Context != NULL)
1434 XUnsetICFocus (Input_Context);
1435#endif
1436#ifdef CURSOR_BLINK
1437 if (options & Opt_cursorBlink)
1438 cursor_blink_ev.stop ();
1439 hidden_cursor = 0;
1440#endif
1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1448 }
1449 break;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == TermWin.parent[0])
1453 {
1454 int height, width;
1455
1456 do
1457 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ;
1463 1497
1464 if (szHint.width != width || szHint.height != height) 1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1499 {
1466 seen_resize = 1; 1500 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1502 }
1469 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471 if (options & Opt_transparent) 1507 if (OPTION (Opt_transparent))
1472 check_our_parents (); 1508 check_our_parents ();
1473#endif 1509#endif
1474 } 1510 }
1475 break; 1511 break;
1476 1512
… …
1492 1528
1493 case SelectionRequest: 1529 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1495 break; 1531 break;
1496 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1497 case UnmapNotify: 1541 case UnmapNotify:
1498 TermWin.mapped = 0; 1542 mapped = 0;
1499#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1501#endif 1545#endif
1502 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504 case MapNotify:
1505 TermWin.mapped = 1;
1506#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif
1509 break; 1547 break;
1510 1548
1511#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1512 case ReparentNotify: 1550 case ReparentNotify:
1513 rootwin_cb (ev); 1551 rootwin_cb (ev);
1514 break; 1552 break;
1515#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1516 1554
1517 case GraphicsExpose: 1555 case GraphicsExpose:
1518 case Expose: 1556 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1520 { 1558 {
1521 do 1559 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525 1563
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1565
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1531 1569
1532 scr_refresh (refresh_type); 1570 want_refresh = 1;
1533 } 1571 }
1534 else 1572 else
1535 { 1573 {
1536 XEvent unused_event; 1574 XEvent unused_event;
1537 1575
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539 ; 1577 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1579 ;
1542 1580
1543 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1544 { 1582 {
1545 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1546 scrollbar_show (0); 1584 scrollbar_show (0);
1547 } 1585 }
1548#ifdef MENUBAR
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose ();
1551#endif
1552 1586
1553#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1556#endif 1590#endif
1557 } 1591 }
1558 break; 1592 break;
1559 1593
1560 case MotionNotify: 1594 case MotionNotify:
1561#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1562 if (hidden_pointer) 1596 if (hidden_pointer)
1563 pointer_unblank (); 1597 pointer_unblank ();
1564#endif 1598#endif
1565#if MENUBAR
1566 if (isMenuBarWindow (ev.xany.window))
1567 {
1568 menubar_control (ev.xbutton);
1569 break;
1570 }
1571#endif
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1600 break;
1574 1601
1575 if (ev.xany.window == TermWin.vt) 1602 if (ev.xany.window == vt)
1576 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1608 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580 ; 1610 ;
1581 1611
1582 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (disp, vt,
1583 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1616 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1599#endif 1629#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1632
1603#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1636 {
1607 int dist; 1637 int dist;
1608 1638
1609 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1651
1622 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1624 { 1654 {
1625 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1627 } 1657 }
1628 else 1658 else
1629 { 1659 {
1630 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1661 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1662 }
1633 1663
1634 scroll_selection_lines = Pixel2Height (dist) 1664 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1666 + 1;
1637 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1639 } 1669 }
1640 else 1670 else
1641 { 1671 {
1642 /* we are within the text window, so we 1672 /* we are within the text window, so we
… …
1651#endif 1681#endif
1652 } 1682 }
1653 } 1683 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1685 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1658 ; 1688 ;
1659 1689
1660 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (disp, scrollBar.win,
1661 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1694 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1666 scrollbar_size ()); 1696 scrollbar_size ());
1667 scr_refresh (refresh_type); 1697 want_refresh = 1;
1668 refresh_limit = 0; 1698 refresh_limit = 0;
1669 scrollbar_show (1); 1699 scrollbar_show (1);
1670 } 1700 }
1671 break; 1701 break;
1672 } 1702 }
1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 {
1709 if (hidden_cursor)
1710 {
1711 hidden_cursor = 0;
1712 want_refresh = 1;
1713 }
1714
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 }
1717#endif
1718
1719#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 {
1722 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease)
1725 if (hidden_pointer)
1726 pointer_unblank ();
1727
1728 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank ();
1730 }
1731#endif
1732}
1733
1734void
1735rxvt_term::focus_in ()
1736{
1737 if (!focus)
1738 {
1739 focus = 1;
1740 want_refresh = 1;
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1743
1744#if USE_XIM
1745 if (Input_Context != NULL)
1746 {
1747 IMSetStatusPosition ();
1748 XSetICFocus (Input_Context);
1749 }
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1754#endif
1755#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade])
1757 {
1758 pix_colors = pix_colors_focused;
1759 scr_recolour ();
1760 }
1761#endif
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1778 iso14755buf = 0;
1779# if ENABLE_OVERLAY
1780 scr_overlay_off ();
1781# endif
1782 }
1783#endif
1784#if USE_XIM
1785 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context);
1787#endif
1788#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink))
1790 cursor_blink_ev.stop ();
1791 hidden_cursor = 0;
1792#endif
1793#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade])
1795 {
1796 pix_colors = pix_colors_unfocused;
1797 scr_recolour ();
1798 }
1799#endif
1800 }
1673} 1801}
1674 1802
1675#if TRANSPARENT 1803#if TRANSPARENT
1676void 1804void
1677rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1806{
1679 SET_R (this); 1807 make_current ();
1680 SET_LOCALE (locale);
1681 1808
1682 switch (ev.type) 1809 switch (ev.type)
1683 { 1810 {
1684 case PropertyNotify: 1811 case PropertyNotify:
1685 /* 1812 /*
… …
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691 return; 1818 return;
1692 1819
1693 /* FALLTHROUGH */ 1820 /* FALLTHROUGH */
1694 case ReparentNotify: 1821 case ReparentNotify:
1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696 want_refresh = want_full_refresh = 1; 1823 want_refresh = want_full_refresh = 1;
1697 break; 1824 break;
1698 } 1825 }
1699} 1826}
1700#endif 1827#endif
… …
1703rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1704{ 1831{
1705 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1706 1833
1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1708 if (!bypass_keystate) 1836 if (!bypass_keystate)
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1838
1711 /* 1839 /*
1712 * VT window processing of button press 1840 * VT window processing of button press
1713 */ 1841 */
1714 if (ev.window == TermWin.vt) 1842 if (ev.window == vt)
1715 { 1843 {
1716#if ISO_14755 1844#if ISO_14755
1717 // 5.4 1845 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1847 {
… …
1732#ifdef MOUSE_REPORT_DOUBLECLICK 1860#ifdef MOUSE_REPORT_DOUBLECLICK
1733 if (ev.button == MEvent.button && clickintime) 1861 if (ev.button == MEvent.button && clickintime)
1734 { 1862 {
1735 /* same button, within alloted time */ 1863 /* same button, within alloted time */
1736 MEvent.clicks++; 1864 MEvent.clicks++;
1865
1737 if (MEvent.clicks > 1) 1866 if (MEvent.clicks > 1)
1738 { 1867 {
1739 /* only report double clicks */ 1868 /* only report double clicks */
1740 MEvent.clicks = 2; 1869 MEvent.clicks = 2;
1741 mouse_report (ev); 1870 mouse_report (ev);
… …
1761 else 1890 else
1762 { 1891 {
1763 if (ev.button != MEvent.button) 1892 if (ev.button != MEvent.button)
1764 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1765 1894
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1766 switch (ev.button) 1896 switch (ev.button)
1767 { 1897 {
1768 case Button1: 1898 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1903#else
1774 selection.rect = false; 1904 selection.rect = false;
1775#endif 1905#endif
1776 1906
1777 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1779 { 1909 {
1780 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1781 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1782 else 1912 else
1783 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1784 } 1914 }
1785 else 1915 else
1786 { 1916 {
1787 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1788 MEvent.clicks++; 1918 MEvent.clicks++;
1789 else 1919 else
1790 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1791 1921
1792 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1793 } 1923 }
1794 1924
1795 MEvent.button = Button1; 1925 MEvent.button = Button1;
1796 break; 1926 break;
1797 1927
1798 case Button3: 1928 case Button3:
1799 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1800 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1801 else 1931 else
1802 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1803 1933
1804 MEvent.button = Button3; 1934 MEvent.button = Button3;
1805 break; 1935 break;
1806 } 1936 }
1807 } 1937 }
1808 1938
1809 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1810 return; 1940 return;
1811 } 1941 }
1812 1942
… …
1924 case Button3: 2054 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1926 { 2056 {
1927 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1930# else 2060# else
1931 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1932# endif 2062# endif
1933 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1936# else 2066# else
1937 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1938# endif 2068# endif
1939 else 2069 else
1940 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1941 } 2071 }
1942 else 2072 else
1943 { 2073 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 2075 (nrow
1946 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 2077 / scrollbar_size ()));
1948 } 2078 }
1949 2079
1950 break; 2080 break;
1951 } 2081 }
1952 } 2082 }
2083
1953 return; 2084 return;
1954 } 2085 }
1955#if MENUBAR
1956 /*
1957 * Menubar window processing of button press
1958 */
1959 if (isMenuBarWindow (ev.window))
1960 menubar_control (ev);
1961#endif
1962} 2086}
1963 2087
1964void 2088void
1965rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1966{ 2090{
… …
1972 2096
1973 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
1974 { 2098 {
1975 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
1976 scrollbar_show (0); 2100 scrollbar_show (0);
1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1978 refresh_type &= ~SMOOTH_REFRESH;
1979#endif
1980 } 2101 }
1981 2102
1982#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
1985#endif 2106#endif
1986 2107
1987 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
1988 { 2109 {
1989#if ISO_14755 2110#if ISO_14755
1990 // 5.4 2111 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2113 return;
… …
2022 if (priv_modes & PrivMode_mouse_report 2143 if (priv_modes & PrivMode_mouse_report
2023 && bypass_keystate 2144 && bypass_keystate
2024 && ev.button == Button1 && MEvent.clicks <= 1) 2145 && ev.button == Button1 && MEvent.clicks <= 1)
2025 selection_extend (ev.x, ev.y, 0); 2146 selection_extend (ev.x, ev.y, 0);
2026 2147
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2027 switch (ev.button) 2151 switch (ev.button)
2028 { 2152 {
2029 case Button1: 2153 case Button1:
2030 case Button3: 2154 case Button3:
2031 selection_make (ev.time); 2155 selection_make (ev.time);
2032 break; 2156 break;
2157
2033 case Button2: 2158 case Button2:
2034 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2035 break; 2161 break;
2162
2036#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
2037 case Button4: 2164 case Button4:
2038 case Button5: 2165 case Button5:
2039 { 2166 {
2040 int i; 2167 int i;
… …
2042 2169
2043 v = ev.button == Button4 ? UP : DN; 2170 v = ev.button == Button4 ? UP : DN;
2044 2171
2045 if (ev.state & ShiftMask) 2172 if (ev.state & ShiftMask)
2046 i = 1; 2173 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2174 else if (OPTION (Opt_mouseWheelScrollPage))
2048 i = TermWin.nrow - 1; 2175 i = nrow - 1;
2049 else 2176 else
2050 i = 5; 2177 i = 5;
2051 2178
2052# ifdef MOUSE_SLIP_WHEELING 2179# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2180 if (ev.state & ControlMask)
2054 { 2181 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2182 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2057 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058 2185
2059 if (slip_wheel_ev.at < NOW) 2186 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2188
2062 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
2063 } 2190 }
2064 else 2191 else
2065 { 2192 {
2066# endif 2193# endif
2067# ifdef JUMP_MOUSE_WHEEL
2068 scr_page (v, i); 2194 scr_page (v, i);
2069 scr_refresh (SMOOTH_REFRESH);
2070 scrollbar_show (1); 2195 scrollbar_show (1);
2071# else
2072 while (i--)
2073 {
2074 scr_page (v, 1);
2075 scr_refresh (SMOOTH_REFRESH);
2076 scrollbar_show (1);
2077 }
2078# endif
2079# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
2080 } 2197 }
2081#endif 2198# endif
2082 } 2199 }
2083 break; 2200 break;
2084#endif 2201#endif
2085 } 2202 }
2086 } 2203 }
2087#ifdef MENUBAR
2088 else if (isMenuBarWindow (ev.window))
2089 menubar_control (ev);
2090#endif
2091} 2204}
2092 2205
2093#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2094#if TINTING 2207#if TINTING
2095/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2219 int i;
2107 2220
2108 Visual* visual = display->visual; 2221 Visual *visual = display->visual;
2109 2222
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2224
2112 /* for convenience */ 2225 /* for convenience */
2113 mask_r = visual->red_mask; 2226 mask_r = visual->red_mask;
… …
2334 Atom atype; 2447 Atom atype;
2335 unsigned char *prop = NULL; 2448 unsigned char *prop = NULL;
2336 Window root, oldp, *list; 2449 Window root, oldp, *list;
2337 Pixmap rootpixmap = None; 2450 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2339 2453
2340 pchanged = 0; 2454 pchanged = 0;
2341 2455
2342 if (!(options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2344 2458
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2347 2461
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2462 XGetWindowAttributes (disp, parent[0], &wattr);
2349 2463
2350 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2351 { 2465 {
2352 if (am_transparent) 2466 if (am_transparent)
2353 { 2467 {
2354 pchanged = 1; 2468 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2357 } 2471 }
2358 2472
2359 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2360 } 2474 }
2361 2475
2362 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False); 2477 XSync (disp, False);
2364 2478
2365 /* 2479 /*
2366 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2369 */ 2483 */
2370 i = (xa[XA_XROOTPMAP_ID] 2484 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2374 2488
2375 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2380 2494
2381 if (!i || prop == NULL 2495 if (!i || prop == NULL
2382#if TINTING 2496#if TINTING
… …
2401 Window cr; 2515 Window cr;
2402 XImage *image; 2516 XImage *image;
2403 GC gc; 2517 GC gc;
2404 XGCValues gcvalue; 2518 XGCValues gcvalue;
2405 2519
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2520 XTranslateCoordinates (disp, parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2524 nx = ny = 0;
2411 2525
… …
2421 nh += sy; 2535 nh += sy;
2422 ny = -sy; 2536 ny = -sy;
2423 sy = 0; 2537 sy = 0;
2424 } 2538 }
2425 2539
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2428 2542
2429 XSync (display->display, False); 2543 XSync (disp, False);
2430 allowedxerror = -1; 2544 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2546
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2549 allowedxerror = 0;
2436 2550
2437 if (image == NULL) 2551 if (image == NULL)
2438 { 2552 {
2439 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2440 { 2554 {
2441 pchanged = 1; 2555 pchanged = 1;
2442 if (TermWin.pixmap != None) 2556 if (pixmap != None)
2443 { 2557 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2558 XFreePixmap (disp, pixmap);
2445 TermWin.pixmap = None; 2559 pixmap = None;
2446 } 2560 }
2447 } 2561 }
2448 2562
2449 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2450 } 2564 }
2451 else 2565 else
2452 { 2566 {
2453 if (TermWin.pixmap != None) 2567 if (pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2568 XFreePixmap (disp, pixmap);
2455 2569
2456#if TINTING 2570#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2572 {
2459 unsigned short rm, gm, bm; 2573 unsigned short rm, gm, bm;
… …
2463 2577
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (display, image, shade, rm, gm, bm);
2465 } 2579 }
2466#endif 2580#endif
2467 2581
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2582 pixmap = XCreatePixmap (disp, vt,
2469 szHint.width, szHint.height, image->depth); 2583 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2586 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2587 XFreeGC (disp, gc);
2474 XDestroyImage (image); 2588 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2590 XClearWindow (disp, parent[0]);
2477 2591
2478 if (!am_transparent || !am_pixmap_trans) 2592 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2593 pchanged = 1;
2480 2594
2481 am_transparent = am_pixmap_trans = 1; 2595 am_transparent = am_pixmap_trans = 1;
2482 } 2596 }
2483 } 2597 }
2484 2598
2485 if (am_pixmap_trans) 2599 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487 else 2601 else
2488 { 2602 {
2489 unsigned int n; 2603 unsigned int n;
2490 /* 2604 /*
2491 * InheritPixmap transparency 2605 * InheritPixmap transparency
2492 */ 2606 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494 { 2608 {
2495 oldp = TermWin.parent[i]; 2609 oldp = parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2610 XQueryTree (disp, parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n); 2611 &parent[i], &list, &n);
2498 XFree (list); 2612 XFree (list);
2499 2613
2500 if (TermWin.parent[i] == display->root) 2614 if (parent[i] == display->root)
2501 { 2615 {
2502 if (oldp != None) 2616 if (oldp != None)
2503 pchanged = 1; 2617 pchanged = 1;
2504 2618
2505 break; 2619 break;
2506 } 2620 }
2507 2621
2508 if (oldp != TermWin.parent[i]) 2622 if (oldp != parent[i])
2509 pchanged = 1; 2623 pchanged = 1;
2510 } 2624 }
2511 2625
2512 n = 0; 2626 n = 0;
2513 2627
2514 if (pchanged) 2628 if (pchanged)
2515 { 2629 {
2516 for (; n < (unsigned int)i; n++) 2630 for (; n < (unsigned int)i; n++)
2517 { 2631 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2632 XGetWindowAttributes (disp, parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2634 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522 break; 2636 break;
2523 } 2637 }
2524 } 2638 }
2525 } 2639 }
2526 2640
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528 { 2642 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2645 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2646 /* XXX: also turn off Opt_transparent? */
2533 } 2647 }
2534 else 2648 else
2535 { 2649 {
… …
2538 * needed for fvwm2.2.2 (and before?) */ 2652 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1); 2653 sleep (1);
2540#endif 2654#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2655 for (n = 0; n < (unsigned int)i; n++)
2542 { 2656 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2658 XClearWindow (disp, parent[n]);
2545 } 2659 }
2546 2660
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548 am_transparent = 1; 2662 am_transparent = 1;
2549 } 2663 }
2550 2664
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2666 parent[i] = None;
2553 } 2667 }
2554 2668
2555 if (scrollBar.win) 2669 if (scrollBar.win)
2556 { 2670 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2672 scrollBar.setIdle ();
2559 scrollbar_show (0); 2673 scrollbar_show (0);
2560 } 2674 }
2561 2675
2562 if (am_transparent) 2676 if (am_transparent)
… …
2574 2688
2575bool 2689bool
2576rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2577{ 2691{
2578 bool flag = false; 2692 bool flag = false;
2579 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2581 2695
2582 for (;;) 2696 for (;;)
2583 { 2697 {
2584 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2585 { 2699 {
2586 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2587 ch = next_char (); 2701 ch = next_char ();
2588 }
2589 2702
2590 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2591 break; 2704 break;
2705 }
2592 2706
2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 { 2708 {
2595 if (!seen_input) 2709 if (!seen_input)
2596 { 2710 {
… …
2600 // some window managers resize the window early, and these programs 2714 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2715 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2716 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2717 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2718 // resized.
2605 if (seen_resize) 2719 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2720 kill (-cmd_pid, SIGWINCH);
2607 } 2721 }
2608 2722
2609 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2725 bool refreshnow = false;
2612 int nlines = 0; 2726 int nlines = 0;
2613 unicode_t *str = buf; 2727 wchar_t *str = buf;
2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2614 2729
2615 for (;;) 2730 for (;;)
2616 { 2731 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2733 break;
2619 2734
2620 *str++ = ch; 2735 *str++ = ch;
2621 2736
2622 if (ch == C0_LF) 2737 if (ch == C0_LF || str >= eol)
2623 { 2738 {
2739 if (ch == C0_LF)
2624 nlines++; 2740 nlines++;
2741
2625 refresh_count++; 2742 refresh_count++;
2626 2743
2627 if (!(options & Opt_jumpScroll) 2744 if (!OPTION (Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2629 { 2746 {
2630 refreshnow = true; 2747 refreshnow = true;
2748 refresh_count = 0;
2631 ch = NOCHAR; 2749 ch = NOCHAR;
2632 break; 2750 break;
2633 } 2751 }
2634 2752
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2754 if (nlines >= nrow - 1)
2637 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2759
2639 nlines = 0; 2760 nlines = 0;
2640 str = buf; 2761 str = buf;
2762 eol = str + min (ncol, UBUFSIZ);
2641 } 2763 }
2642 }
2643 2764
2644 if (str >= buf + UBUFSIZ) 2765 if (str >= eol)
2645 { 2766 {
2767 if (eol >= buf + UBUFSIZ)
2768 {
2646 ch = NOCHAR; 2769 ch = NOCHAR;
2647 break; 2770 break;
2771 }
2772 else
2773 eol = min (eol + ncol, buf + UBUFSIZ);
2774 }
2775
2648 } 2776 }
2649 2777
2650 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2779 ch = next_char ();
2652 } 2780 }
2653 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2654 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2655 2785
2656 /* 2786 /*
2657 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2658 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
2659 * the number of pages between refreshes is refresh_limit, which 2789 * the number of pages between refreshes is refresh_limit, which
2660 * is incremented here because we must be doing flat-out scrolling. 2790 * is incremented here because we must be doing flat-out scrolling.
2661 */ 2791 */
2662 if (refreshnow) 2792 if (refreshnow)
2663 { 2793 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++; 2795 refresh_limit++;
2666 else 2796 else
2667 { 2797 {
2668 flag = true; 2798 flag = true;
2669 scr_refresh (refresh_type); 2799 scr_refresh ();
2800 want_refresh = 1;
2670 } 2801 }
2671 } 2802 }
2672 2803
2673 } 2804 }
2674 else 2805 else
… …
2689 } 2820 }
2690 2821
2691 return flag; 2822 return flag;
2692} 2823}
2693 2824
2694// read the next octet
2695unicode_t
2696rxvt_term::next_octet ()
2697{
2698 return cmdbuf_ptr < cmdbuf_endp
2699 ? *cmdbuf_ptr++
2700 : NOCHAR;
2701}
2702
2703// read the next character 2825// read the next character
2704unicode_t 2826wchar_t
2705rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2706{ 2828{
2707 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2708 { 2830 {
2709 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++; 2833 return *cmdbuf_ptr++;
2712 2834
2713 wchar_t wc; 2835 wchar_t wc;
2714 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2715 2837
2716 if (len == (size_t)-2) 2838 if (len == (size_t)-2)
2717 { 2839 {
2718 // the mbstate stores incomplete sequences. didn't know this :/ 2840 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2720 break; 2842 break;
2721 } 2843 }
2722 2844
2723 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2725 2847
2726 // assume wchar == unicode 2848 // assume wchar == unicode
2727 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK; 2850 return wc & UNICODE_MASK;
2729 } 2851 }
2730 2852
2731 return NOCHAR; 2853 return NOCHAR;
2732} 2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet () NOTHROW
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2863}
2864
2865static class out_of_input out_of_input;
2733 2866
2734/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2735/* 2868/*
2736 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2737 * to the command. 2870 * to the command.
2738 */ 2871 */
2739unicode_t 2872wchar_t
2740rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2741{ 2874{
2742 unicode_t c = next_char (); 2875 wchar_t c = next_char ();
2743 2876
2744 if (c == NOCHAR) 2877 if (c == NOCHAR)
2745 throw out_of_input; 2878 throw out_of_input;
2746 2879
2747 return c; 2880 return c;
2748} 2881}
2749 2882
2750unicode_t 2883uint32_t
2751rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2752{ 2885{
2753 unicode_t c = next_octet (); 2886 uint32_t c = next_octet ();
2754 2887
2755 if (c == NOCHAR) 2888 if (c == NOCHAR)
2756 throw out_of_input; 2889 throw out_of_input;
2757 2890
2758 return c; 2891 return c;
… …
2858 case C0_ESC: 2991 case C0_ESC:
2859 process_escape_seq (); 2992 process_escape_seq ();
2860 break; 2993 break;
2861 case C0_ENQ: /* terminal Status */ 2994 case C0_ENQ: /* terminal Status */
2862 if (rs[Rs_answerbackstring]) 2995 if (rs[Rs_answerbackstring])
2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2996 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2865 else 2997 else
2866 tt_write ((unsigned char *)VT100_ANS, 2998 tt_write (VT100_ANS, strlen (VT100_ANS));
2867 (unsigned int)strlen (VT100_ANS));
2868 break; 2999 break;
2869 case C0_BEL: /* bell */ 3000 case C0_BEL: /* bell */
2870 scr_bell (); 3001 scr_bell ();
2871 break; 3002 break;
2872 case C0_BS: /* backspace */ 3003 case C0_BS: /* backspace */
… …
3027 break; 3158 break;
3028 3159
3029 /* 8.3.87: NEXT LINE */ 3160 /* 8.3.87: NEXT LINE */
3030 case C1_NEL: /* ESC E */ 3161 case C1_NEL: /* ESC E */
3031 { 3162 {
3032 unicode_t nlcr[] = { C0_LF, C0_CR }; 3163 wchar_t nlcr[] = { C0_LF, C0_CR };
3033 scr_add_lines (nlcr, 1, 2); 3164 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3034 } 3165 }
3035 break; 3166 break;
3036 3167
3037 /* kidnapped escape sequence: Should be 8.3.48 */ 3168 /* kidnapped escape sequence: Should be 8.3.48 */
3038 case C1_ESA: /* ESC G */ 3169 case C1_ESA: /* ESC G */
… …
3060 process_dcs_seq (); 3191 process_dcs_seq ();
3061 break; 3192 break;
3062 3193
3063 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3194 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3064 case C1_SCI: /* ESC Z */ 3195 case C1_SCI: /* ESC Z */
3065 tt_write ((const unsigned char *)ESCZ_ANSWER, 3196 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3066 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3067 break; /* steal obsolete ESC [ c */ 3197 break; /* steal obsolete ESC [ c */
3068 3198
3069 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3199 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3070 case C1_CSI: /* ESC [ */ 3200 case C1_CSI: /* ESC [ */
3071 process_csi_seq (); 3201 process_csi_seq ();
… …
3196 { 3326 {
3197 switch (priv) 3327 switch (priv)
3198 { 3328 {
3199 case '>': 3329 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 3330 if (ch == CSI_DA) /* secondary device attributes */
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3331 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202 break; 3332 break;
3203 case '?': 3333 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3334 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3335 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3336 break;
… …
3311 3441
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3442 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 3443 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 3444 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3445 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3446 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 3447 break;
3318 3448
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3449 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 3450 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3322 break; 3451 break;
3323 3452
3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3453 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3325 process_sgr_mode (nargs, arg); 3454 process_sgr_mode (nargs, arg);
3326 break; 3455 break;
… …
3333 break; 3462 break;
3334 case 6: /* CPR requested */ 3463 case 6: /* CPR requested */
3335 scr_report_position (); 3464 scr_report_position ();
3336 break; 3465 break;
3337 case 7: /* unofficial extension */ 3466 case 7: /* unofficial extension */
3338 if (options & Opt_insecure) 3467 if (OPTION (Opt_insecure))
3339 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3468 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340 break; 3469 break;
3341 case 8: /* unofficial extension */ 3470 case 8: /* unofficial extension */
3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3471 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343 break; 3472 break;
… …
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3564rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3565{
3437 int x, y; 3566 int x, y;
3438 XWindowAttributes wattr; 3567 XWindowAttributes wattr;
3439 Window wdummy; 3568 Window wdummy;
3569 dDisp;
3440 3570
3441 if (nargs == 0) 3571 if (nargs == 0)
3442 return; 3572 return;
3443 3573
3444 switch (args[0]) 3574 switch (args[0])
3445 { 3575 {
3446 /* 3576 /*
3447 * commands 3577 * commands
3448 */ 3578 */
3449 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3580 XMapWindow (disp, parent[0]);
3451 break; 3581 break;
3452 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3583 XIconifyWindow (disp, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3584 break;
3456 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3586 XMoveWindow (disp, parent[0], args[1], args[2]);
3458 break; 3587 break;
3459 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3590 break;
3462 case 5: /* raise window */ 3591 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3592 XRaiseWindow (disp, parent[0]);
3464 break; 3593 break;
3465 case 6: /* lower window */ 3594 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3595 XLowerWindow (disp, parent[0]);
3467 break; 3596 break;
3468 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3469 scr_touch (true); 3598 scr_touch (true);
3470 break; 3599 break;
3471 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3601 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3602 (unsigned int) (args[1] * fheight));
3474 break; 3603 break;
3475 3604
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3605 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3606 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3608 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3609 (unsigned int) (args[1] * fheight));
3481 break; 3610 break;
3482 3611
3483 3612
3484 /* 3613 /*
3485 * reports - some output format copied from XTerm 3614 * reports - some output format copied from XTerm
3486 */ 3615 */
3487 case 11: /* report window state */ 3616 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3618 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3619 break;
3491 case 13: /* report window position */ 3620 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3621 XGetWindowAttributes (disp, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3622 XTranslateCoordinates (disp, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3623 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3624 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3625 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3626 break;
3498 case 14: /* report window size (pixels) */ 3627 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3628 XGetWindowAttributes (disp, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3629 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3630 break;
3502 case 18: /* report text area size (chars) */ 3631 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3632 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3633 break;
3505 case 19: /* report window size (chars) */ 3634 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3635 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3636 break;
3508 case 20: /* report icon label */ 3637 case 20: /* report icon label */
3509 { 3638 {
3510 char *s; 3639 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3640 XGetIconName (disp, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3641 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3642 XFree (s);
3514 } 3643 }
3515 break; 3644 break;
3516 case 21: /* report window title */ 3645 case 21: /* report window title */
3517 { 3646 {
3518 char *s; 3647 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3648 XFetchName (disp, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3649 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3650 XFree (s);
3522 } 3651 }
3523 break; 3652 break;
3524 } 3653 }
3525} 3654}
… …
3528/*----------------------------------------------------------------------*/ 3657/*----------------------------------------------------------------------*/
3529/* 3658/*
3530 * get input up until STRING TERMINATOR (or BEL) 3659 * get input up until STRING TERMINATOR (or BEL)
3531 * ends_how is terminator used. returned input must be free()'d 3660 * ends_how is terminator used. returned input must be free()'d
3532 */ 3661 */
3533unsigned char * 3662char *
3534rxvt_term::get_to_st (unicode_t &ends_how) 3663rxvt_term::get_to_st (unicode_t &ends_how)
3535{ 3664{
3536 unicode_t ch; 3665 unicode_t ch;
3537 bool seen_esc = false; 3666 bool seen_esc = false;
3538 unsigned int n = 0; 3667 unsigned int n = 0;
… …
3557 else if (ch < 0x20) 3686 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3687 return NULL; /* other control character - exit */
3559 3688
3560 seen_esc = false; 3689 seen_esc = false;
3561 3690
3562 if (n >= sizeof (string) - 1) 3691 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3692 // stop at some sane length
3564 return NULL; 3693 return NULL;
3565 3694
3566 if (ch == C0_SYN) 3695 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 (); 3696 string[n++] = cmd_get8 ();
… …
3571 3700
3572 string[n++] = '\0'; 3701 string[n++] = '\0';
3573 3702
3574 ends_how = (ch == 0x5c ? C0_ESC : ch); 3703 ends_how = (ch == 0x5c ? C0_ESC : ch);
3575 3704
3576 return (unsigned char *)rxvt_wcstombs (string); 3705 return rxvt_wcstombs (string);
3577} 3706}
3578 3707
3579/*----------------------------------------------------------------------*/ 3708/*----------------------------------------------------------------------*/
3580/* 3709/*
3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3710 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3582 */ 3711 */
3583void 3712void
3584rxvt_term::process_dcs_seq () 3713rxvt_term::process_dcs_seq ()
3585{ 3714{
3586 unsigned char *s; 3715 char *s;
3587 unicode_t eh; 3716 unicode_t eh;
3588 3717
3589 /* 3718 /*
3590 * Not handled yet 3719 * Not handled yet
3591 */ 3720 */
… …
3610 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3739 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3611 arg = arg * 10 + (ch - '0'); 3740 arg = arg * 10 + (ch - '0');
3612 3741
3613 if (ch == ';') 3742 if (ch == ';')
3614 { 3743 {
3615 unsigned char *s = get_to_st (eh); 3744 char *s = get_to_st (eh);
3616 3745
3617 if (s) 3746 if (s)
3618 { 3747 {
3619 process_xterm_seq (arg, (char *)s, eh); 3748 process_xterm_seq (arg, s, eh);
3620 free (s); 3749 free (s);
3621 } 3750 }
3622 } 3751 }
3623} 3752}
3624 3753
3625void 3754void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3755rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3627{ 3756{
3628 if (str[0] == '?' && !str[1]) 3757 if (str[0] == '?' && !str[1])
3629 { 3758 {
3630 unsigned short r, g, b; 3759 unsigned short r, g, b;
3631 pix_colors_focused[color].get (display, r, g, b); 3760 pix_colors_focused[color].get (display, r, g, b);
… …
3635 set_window_color (color, str); 3764 set_window_color (color, str);
3636} 3765}
3637 3766
3638/* 3767/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640 * 0 = change iconName/title
3641 * 1 = change iconName
3642 * 2 = change title
3643 * 4 = change color
3644 * 10 = change fg color
3645 * 11 = change bg color
3646 * 12 = change text color
3647 * 13 = change mouse foreground color
3648 * 17 = change highlight character colour
3649 * 18 = change bold character color
3650 * 19 = change underlined character color
3651 * 46 = change logfile (not implemented)
3652 * 50 = change font
3653 *
3654 * rxvt extensions:
3655 * 20 = bg pixmap
3656 * 39 = change default fg color
3657 * 49 = change default bg color
3658 * 55 = dump scrollback buffer and all of screen
3659 * 701 = change locale
3660 * 702 = find font
3661 * 703 = menu
3662 */ 3769 */
3663void 3770void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3665{ 3772{
3666 int changed = 0;
3667 int color; 3773 int color;
3668 char *buf, *name; 3774 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3776 int saveop = op;
3777 dDisp;
3671 3778
3672 assert (str != NULL); 3779 assert (str != NULL);
3673 switch (op) 3780 switch (op)
3674 { 3781 {
3675 case XTerm_name: 3782 case XTerm_name:
… …
3691 unsigned long bytes_after; 3798 unsigned long bytes_after;
3692 unsigned char *value = 0; 3799 unsigned char *value = 0;
3693 const char *str = ""; 3800 const char *str = "";
3694 3801
3695 if (prop 3802 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3803 && XGetWindowProperty (disp, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3804 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3805 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3806 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3807 && actual_type != None
3701 && actual_format == 8) 3808 && actual_format == 8)
… …
3713 { 3820 {
3714 *eq = 0; 3821 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3822 set_utf8_property (display->atom (str), eq + 1);
3716 } 3823 }
3717 else 3824 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3825 XDeleteProperty (disp, parent[0],
3719 display->atom (str)); 3826 display->atom (str));
3720 } 3827 }
3721 break; 3828 break;
3722 3829
3723 case XTerm_Color: 3830 case XTerm_Color:
… …
3725 { 3832 {
3726 if ((name = strchr (buf, ';')) == NULL) 3833 if ((name = strchr (buf, ';')) == NULL)
3727 break; 3834 break;
3728 3835
3729 *name++ = '\0'; 3836 *name++ = '\0';
3730 color = atoi (buf); 3837 color = atoi (buf) + minCOLOR;
3731 3838
3732 if (color < 0 || color >= TOTAL_COLORS) 3839 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3733 break; 3840 break;
3734 3841
3735 if ((buf = strchr (name, ';')) != NULL) 3842 if ((buf = strchr (name, ';')) != NULL)
3736 *buf++ = '\0'; 3843 *buf++ = '\0';
3737 3844
3738 if (name[0] == '?' && !name[1]) 3845 if (name[0] == '?' && !name[1])
3739 { 3846 {
3740 unsigned short r, g, b; 3847 unsigned short r, g, b;
3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3848 pix_colors_focused[color].get (display, r, g, b);
3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3743 } 3850 }
3744 else 3851 else
3745 set_window_color (color + minCOLOR, name); 3852 set_window_color (color, name);
3746 } 3853 }
3747 break; 3854 break;
3748 case XTerm_Color00: 3855 case XTerm_Color00:
3749 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3856 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3750 break; 3857 break;
3751 case XTerm_Color01: 3858 case XTerm_Color01:
3752 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3859 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3753 break; 3860 break;
3754#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
3755 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
3756 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3757 break; 3864 break;
… …
3761 break; 3868 break;
3762 case XTerm_Color_pointer_bg: 3869 case XTerm_Color_pointer_bg:
3763 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3764 break; 3871 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break;
3775 case XTerm_Color_RV: 3873 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break; 3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3883 break;
3884 case URxvt_Color_IT:
3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3886 break;
3778#endif 3887#endif
3779#if TRANSPARENT && TINTING 3888#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint: 3889 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3890 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782 check_our_parents (); 3891 check_our_parents ();
3783 if (am_transparent) 3892 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3785 break; 3894 break;
3786#endif 3895#endif
3787 3896
3788 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3789 if (*str != ';') 3899 if (*str != ';')
3790 { 3900 {
3791#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3792 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3793 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3794#endif
3795 scr_touch (true); 3904 scr_touch (true);
3905#endif
3796 } 3906 }
3907
3908 int changed = 0;
3909
3797 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3798 { 3911 {
3799 str++; 3912 str++;
3800#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3802#endif 3915#endif
3803
3804 } 3916 }
3917
3805 if (changed) 3918 if (changed)
3806 { 3919 {
3807#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3921 resize_pixmap ();
3809#endif
3810 scr_touch (true); 3922 scr_touch (true);
3923#endif
3811 } 3924 }
3925 }
3812 break; 3926 break;
3813 3927
3814 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3815 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3816 break; 3930 break;
3817 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3818 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3819 break; 3933 break;
3820 3934
3821 case XTerm_logfile: 3935 case XTerm_logfile:
3822 // TODO, when secure mode? 3936 // TODO, when secure mode?
3823 break; 3937 break;
3824 3938
3939#if 0
3940 case Rxvt_dumpscreen: /* no error notices */
3941 {
3942 int fd;
3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3944 {
3945 scr_dump (fd);
3946 close (fd);
3947 }
3948 }
3949 break;
3950#endif
3825 case XTerm_font: 3951 case XTerm_font:
3826 op = URxvt_font; 3952 op = URxvt_font;
3827 case URxvt_font: 3953 case URxvt_font:
3828#if ENABLE_STYLES 3954#if ENABLE_STYLES
3829 case URxvt_boldFont: 3955 case URxvt_boldFont:
3830 case URxvt_italicFont: 3956 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3957 case URxvt_boldItalicFont:
3832#endif 3958#endif
3833 if (query) 3959 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3960 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3962 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3963 resp);
3838 else 3964 else
3839 { 3965 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3966 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3967
… …
3844 set_fonts (); 3970 set_fonts ();
3845 } 3971 }
3846 break; 3972 break;
3847 3973
3848#if ENABLE_FRILLS 3974#if ENABLE_FRILLS
3849 case XTerm_locale: 3975 case URxvt_locale:
3850 if (query) 3976 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3852 else 3978 else
3853 { 3979 {
3854 set_locale (str); 3980 set_locale (str);
3855# ifdef USE_XIM 3981 pty->set_utf8_mode (enc_utf8);
3856 im_cb (); 3982 init_xlocale ();
3857# endif
3858 } 3983 }
3859 break; 3984 break;
3860#endif
3861 3985
3862#ifdef MENUBAR 3986 case URxvt_view_up:
3863 case XTerm_Menu: 3987 case URxvt_view_down:
3864 if (options & Opt_insecure) 3988 {
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3989 int lines = atoi (str);
3990
3991 if (lines)
3992 scr_page (op == URxvt_view_up ? UP : DN, lines);
3993 else
3994 scr_erase_savelines ();
3995 }
3996
3866 break; 3997 break;
3867#endif 3998#endif
3868#if 0 3999
3869 case XTerm_dumpscreen: /* no error notices */ 4000#if ENABLE_PERL
3870 { 4001 case URxvt_perl:
3871 int fd; 4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4003 ; // no responses yet
3873 {
3874 scr_dump (fd);
3875 close (fd);
3876 }
3877 }
3878 break; 4004 break;
3879#endif 4005#endif
3880 } 4006 }
3881} 4007}
3882/*----------------------------------------------------------------------*/ 4008/*----------------------------------------------------------------------*/
… …
3913 return state; 4039 return state;
3914} 4040}
3915 4041
3916/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
3917void 4043void
3918rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4044rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3919{ 4045{
3920 unsigned int i, j; 4046 unsigned int i, j;
3921 int state; 4047 int state;
3922 4048
3923 static const struct 4049 static const struct
… …
3934 { 5, PrivMode_rVideo }, 4060 { 5, PrivMode_rVideo },
3935 { 6, PrivMode_relOrigin }, 4061 { 6, PrivMode_relOrigin },
3936 { 7, PrivMode_Autowrap }, 4062 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode 4063 // 8, bi-directional support mode
3938 { 9, PrivMode_MouseX10 }, 4064 { 9, PrivMode_MouseX10 },
3939#ifdef menuBar_esc
3940 { menuBar_esc, PrivMode_menuBar },
3941#endif
3942 // 18, 19 printing-related 4065 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor }, 4066 { 25, PrivMode_VisibleCursor },
3944#ifdef scrollBar_esc 4067#ifdef scrollBar_esc
3945 { scrollBar_esc, PrivMode_scrollBar }, 4068 { scrollBar_esc, PrivMode_scrollBar },
3946#endif 4069#endif
… …
3991 } 4114 }
3992 4115
3993 /* extra handling for values with state unkept */ 4116 /* extra handling for values with state unkept */
3994 switch (arg[i]) 4117 switch (arg[i])
3995 { 4118 {
4119#if ENABLE_STYLES
4120 case 1021:
4121 set_option (Opt_intensityStyles, mode);
4122
4123 scr_touch (true);
4124 break;
4125#endif
3996 case 1048: /* alternative cursor save */ 4126 case 1048: /* alternative cursor save */
3997 case 1049: 4127 case 1049:
3998 if (options & Opt_secondaryScreen) 4128 if (OPTION (Opt_secondaryScreen))
3999 if (mode == 0) 4129 if (mode == 0)
4000 scr_cursor (RESTORE); 4130 scr_cursor (RESTORE);
4001 else if (mode == 1) 4131 else if (mode == 1)
4002 scr_cursor (SAVE); 4132 scr_cursor (SAVE);
4003 break; 4133 break;
… …
4015 */ 4145 */
4016 PrivMode (1, PrivMode_vt52); 4146 PrivMode (1, PrivMode_vt52);
4017 break; 4147 break;
4018 case 3: /* 80/132 */ 4148 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 4149 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4150 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 4151 break;
4022 case 4: /* smooth scrolling */ 4152 case 4: /* smooth scrolling */
4023 if (state)
4024 options &= ~Opt_jumpScroll;
4025 else
4026 options |= Opt_jumpScroll; 4153 set_option (Opt_jumpScroll, !state);
4027 break; 4154 break;
4028 case 5: /* reverse video */ 4155 case 5: /* reverse video */
4029 scr_rvideo_mode (state); 4156 scr_rvideo_mode (state);
4030 break; 4157 break;
4031 case 6: /* relative/absolute origins */ 4158 case 6: /* relative/absolute origins */
… …
4037 /* case 8: - auto repeat, can't do on a per window basis */ 4164 /* case 8: - auto repeat, can't do on a per window basis */
4038 case 9: /* X10 mouse reporting */ 4165 case 9: /* X10 mouse reporting */
4039 if (state) /* orthogonal */ 4166 if (state) /* orthogonal */
4040 priv_modes &= ~PrivMode_MouseX11; 4167 priv_modes &= ~PrivMode_MouseX11;
4041 break; 4168 break;
4042#ifdef menuBar_esc
4043 case menuBar_esc:
4044#ifdef MENUBAR
4045 map_menuBar (state);
4046#endif
4047 break;
4048#endif
4049#ifdef scrollBar_esc 4169#ifdef scrollBar_esc
4050 case scrollBar_esc: 4170 case scrollBar_esc:
4051 if (scrollbar_mapping (state)) 4171 if (scrollbar_mapping (state))
4052 { 4172 {
4053 resize_all_windows (0, 0, 0); 4173 resize_all_windows (0, 0, 0);
… …
4072#if 0 4192#if 0
4073 case 1001: 4193 case 1001:
4074 break; /* X11 mouse highlighting */ 4194 break; /* X11 mouse highlighting */
4075#endif 4195#endif
4076 case 1010: /* scroll to bottom on TTY output inhibit */ 4196 case 1010: /* scroll to bottom on TTY output inhibit */
4077 if (state)
4078 options &= ~Opt_scrollTtyOutput;
4079 else
4080 options |= Opt_scrollTtyOutput; 4197 set_option (Opt_scrollTtyOutput, !state);
4081 break; 4198 break;
4082 case 1011: /* scroll to bottom on key press */ 4199 case 1011: /* scroll to bottom on key press */
4083 if (state)
4084 options |= Opt_scrollTtyKeypress; 4200 set_option (Opt_scrollTtyKeypress, state);
4085 else
4086 options &= ~Opt_scrollTtyKeypress;
4087 break; 4201 break;
4088 case 1047: /* secondary screen w/ clearing last */ 4202 case 1047: /* secondary screen w/ clearing last */
4089 if (options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
4090 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4091 scr_erase_screen (2); 4205 scr_erase_screen (2);
4092 scr_change_screen (state); 4206 scr_change_screen (state);
4093 break; 4207 break;
4094 case 1049: /* secondary screen w/ clearing first */ 4208 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state); 4209 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen) 4210 if (OPTION (Opt_secondaryScreen))
4097 if (current_screen != PRIMARY) 4211 if (current_screen != PRIMARY)
4098 scr_erase_screen (2); 4212 scr_erase_screen (2);
4099 break; 4213 break;
4100 default: 4214 default:
4101 break; 4215 break;
… …
4229 scr_color (Color_bg, Color_bg); 4343 scr_color (Color_bg, Color_bg);
4230 break; 4344 break;
4231 4345
4232 //case 50: // not variable spacing 4346 //case 50: // not variable spacing
4233 4347
4234#ifndef NO_BRIGHTCOLOR 4348#if ENABLE_FRILLS
4235 case 90: 4349 case 90:
4236 case 91: /* set bright fg color */ 4350 case 91: /* set bright fg color */
4237 case 92: 4351 case 92:
4238 case 93: 4352 case 93:
4239 case 94: 4353 case 94:
… …
4251 case 106: 4365 case 106:
4252 case 107: 4366 case 107:
4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4367 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254 break; 4368 break;
4255#endif 4369#endif
4256
4257 } 4370 }
4258 } 4371 }
4259} 4372}
4260/*}}} */ 4373/*}}} */
4261 4374
… …
4285 */ 4398 */
4286void 4399void
4287rxvt_term::tt_printf (const char *fmt,...) 4400rxvt_term::tt_printf (const char *fmt,...)
4288{ 4401{
4289 va_list arg_ptr; 4402 va_list arg_ptr;
4290 unsigned char buf[256]; 4403 char buf[256];
4291 4404
4292 va_start (arg_ptr, fmt); 4405 va_start (arg_ptr, fmt);
4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4294 va_end (arg_ptr); 4407 va_end (arg_ptr);
4295 tt_write (buf, strlen (buf)); 4408 tt_write (buf, strlen (buf));
… …
4300 * or generated by us in response to a query ESC sequence. 4413 * or generated by us in response to a query ESC sequence.
4301 */ 4414 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303 4416
4304void 4417void
4305rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
4306{ 4419{
4420 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4421 return;
4422
4423 if (pty->pty < 0)
4424 return;
4425
4307 if (v_buflen == 0) 4426 if (v_buflen == 0)
4308 { 4427 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4428 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4310 4429
4311 if ((unsigned int)written == len) 4430 if ((unsigned int)written == len)
4312 return; 4431 return;
4313 4432
4314 data += written; 4433 data += written;
4315 len -= written; 4434 len -= written;
4316 } 4435 }
4317 4436
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4437 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4319 4438
4320 memcpy (v_buffer + v_buflen, data, len); 4439 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len; 4440 v_buflen += len;
4322 4441
4323 pty_ev.set (EVENT_READ | EVENT_WRITE); 4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324} 4443}
4325 4444
4326void rxvt_term::pty_write () 4445void rxvt_term::pty_write ()
4327{ 4446{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329 4448
4330 if (written > 0) 4449 if (written > 0)
4331 { 4450 {
4332 v_buflen -= written; 4451 v_buflen -= written;
4333 4452
… …
4342 } 4461 }
4343 4462
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4463 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4464 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4465 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4466 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4467}
4350 4468
4351/*----------------------- end-of-file (C source) -----------------------*/ 4469/*----------------------- end-of-file (C source) -----------------------*/
4352 4470

Diff Legend

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