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.317 by root, Sat Jan 13 15:06:54 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
54#include <csignal> 58#include <csignal>
55 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
56/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
57 65
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#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 67
63#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
64 69
65#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
114 XK_Escape, 0x238b, 119 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 120 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 121 XK_Print, 0x2399,
117 122
118 XK_space, 0x2423, 123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif
120 0, 133 0,
121}; 134};
122 135
123void 136void
124rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
125{ 138{
126 x = Pixel2Col (x); 139 x = Pixel2Col (x);
127 y = Pixel2Row (y); 140 y = Pixel2Row (y);
128 141
129 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 144 return;
132 145
133 for (;;) 146 for (;;)
134 { 147 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
136 151
137 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
138 { 153 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 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; 155 iso14755buf = ISO_14755_54;
142 break; 156 break;
143 } 157 }
144 158
145 x--; 159 x--;
146 } 160 }
147
148} 161}
149#endif
150 162
151#if ENABLE_OVERLAY
152void 163void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 165{
155 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 169 int len;
159 170
171 fname = rxvt_utf8towcs (f->name);
172
160#if ENABLE_COMBINING 173# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
162 { 175 {
163 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
166 } 179 }
167 else 180 else
168#endif 181# endif
169 { 182 {
170 ch2 = ch; 183 ch2 = ch;
171 184
172 alloc = 0; 185 alloc = 0;
173 chr = &ch2; 186 chr = &ch2;
174 len = 1; 187 len = 1;
175 } 188 }
176 189
177 int width = strlen (f->name); 190 char attr[80]; // plenty
178 191
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
180 214
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 216
183 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
184 { 218 {
… …
187 ch = *chr++; 221 ch = *chr++;
188 222
189 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
192#if !UNICODE3 226# if !UNICODE3
193 if (ch >= 0x10000) 227 if (ch >= 0x10000)
194 ch = 0xfffd; 228 ch = 0xfffd;
195#endif 229# endif
196 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
197 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
198 } 234 }
199 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 242 scr_overlay_set (0, len + 1, fname);
201 243
244 free (fname);
245
202#if ENABLE_COMBINING 246# if ENABLE_COMBINING
203 if (alloc) 247 if (alloc)
204 delete [] alloc; 248 delete [] alloc;
205#endif 249# endif
206} 250}
207#endif 251#endif
208 252
209void 253void
210rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 271 mb[0] = ch[0];
228 len = 1; 272 len = 1;
229 } 273 }
230 274
231 if (len > 0) 275 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
233 else 277 else
234 scr_bell (); 278 scr_bell ();
235 } 279 }
236 280
237 iso14755buf = 0; 281 iso14755buf = 0;
… …
254 298
255 return -1; 299 return -1;
256} 300}
257#endif 301#endif
258 302
259/*{{{ Convert the keypress event into a string */
260void 303void
261rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
262{ 305{
263 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
264 unsigned int newlen; 307 unsigned int newlen;
265 KeySym keysym; 308 KeySym keysym;
266#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */
268#endif
269 int valid_keysym; 309 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
271 316
272 /* 317 /*
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
275 * 320 *
276 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
277 */ 322 */
278 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
281 326
282 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
283 { 328 {
284 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 338 Status status_return;
294 339
295#if 0 340#if 0
296#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
300 else 345 else
301#endif 346#endif
302#endif 347#endif
303 { 348 {
… …
305 350
306 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
310 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
313 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 361 SET_LOCALE (locale);
315 362
316 if (status_return == XLookupChars 363 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
339 } 386 }
340 else 387 else
341#endif 388#endif
342 { 389 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
345 } 392 }
346 393
347 if (valid_keysym) 394 if (valid_keysym)
348 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
349 if (TermWin.saveLines) 401 if (saveLines)
350 { 402 {
351#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 404 if (!ctrl && !meta)
353#else 405#else
354 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
355#endif 407#endif
356 { 408 {
357 int lnsppg; 409 int lnsppg;
358 410
359#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 413#else
362 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
363#endif 415#endif
364 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
365 { 417 {
366 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
367 return; 419 return;
… …
395 scr_move_to (0, 1); 447 scr_move_to (0, 1);
396 return; 448 return;
397 } 449 }
398 else if (keysym == XK_End) 450 else if (keysym == XK_End)
399 { 451 {
400 scr_move_to (1, 0); 452 scr_move_to (1, 1);
401 return; 453 return;
402 } 454 }
403 } 455 }
404#endif 456#endif
405 } 457 }
… …
416 { 468 {
417 switch (keysym) 469 switch (keysym)
418 { 470 {
419 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
420 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
421 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
422 return; 474 return;
423#if TODO 475#if TODO
424 /* rxvt extras */ 476 /* rxvt extras */
425 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
426 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
487 } 539 }
488#endif 540#endif
489 541
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 542 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 543 {
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 { 544 {
518 newlen = 1; 545 newlen = 1;
519 switch (keysym) 546 switch (keysym)
520 { 547 {
521#ifndef NO_BACKSPACE_KEY 548#ifndef NO_BACKSPACE_KEY
… …
529 else 556 else
530 strcpy (kbuf, key_backspace); 557 strcpy (kbuf, key_backspace);
531 break; 558 break;
532#endif 559#endif
533#ifndef NO_DELETE_KEY 560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
534 case XK_Delete: 571 case XK_Delete:
535 strcpy (kbuf, key_delete); 572 strcpy (kbuf, key_delete);
536 break; 573 break;
537#endif 574#endif
538 case XK_Tab: 575 case XK_Tab:
… …
641#ifdef XK_KP_Begin 678#ifdef XK_KP_Begin
642 case XK_KP_Begin: 679 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 680 strcpy (kbuf, "\033Ou");
644 break; 681 break;
645 682
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 683#endif
654 case XK_KP_F1: /* "\033OP" */ 684 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 685 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 686 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 687 case XK_KP_F4: /* "\033OS" */
… …
689 break; 719 break;
690 720
691 case XK_Find: 721 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 722 strcpy (kbuf, "\033[1~");
693 break; 723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
694 case XK_Insert: 735 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 736 strcpy (kbuf, "\033[2~");
696 break; 737 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 738#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 739 case DXK_Remove:
… …
785 case XK_F35: /* "\033[49~" */ 826 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 827 FKEY (31, XK_F17);
787 break; 828 break;
788#undef FKEY 829#undef FKEY
789 default: 830 default:
790 if (len == 0 831 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 832 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 } 833 }
796 834
797 if (newlen) 835 if (newlen)
798 len = strlen (kbuf); 836 len = strlen (kbuf);
799 } 837 }
… …
815 else if (keysym == XK_ISO_Left_Tab) 853 else if (keysym == XK_ISO_Left_Tab)
816 { 854 {
817 strcpy (kbuf, "\033[Z"); 855 strcpy (kbuf, "\033[Z");
818 len = 3; 856 len = 3;
819 } 857 }
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 858 else
828 { 859 {
829#ifdef META8_OPTION 860#ifdef META8_OPTION
830 /* set 8-bit on */ 861 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 862 if (meta && (meta_char == 0x80))
832 { 863 {
833 unsigned char *ch; 864 char *ch;
834 865
835 for (ch = kbuf; ch < kbuf + len; ch++) 866 for (ch = kbuf; ch < kbuf + len; ch++)
836 *ch |= 0x80; 867 *ch |= 0x80;
837 868
838 meta = 0; 869 meta = 0;
… …
840#endif 871#endif
841 /* nil */ ; 872 /* nil */ ;
842 } 873 }
843 } 874 }
844 875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878
845 if (len <= 0) 879 if (len <= 0)
846 return; /* not mapped */ 880 return; /* not mapped */
847 881
848 if (options & Opt_scrollTtyKeypress) 882 if (OPTION (Opt_scrollTtyKeypress))
849 if (TermWin.view_start) 883 if (view_start)
850 { 884 {
851 TermWin.view_start = 0; 885 view_start = 0;
852 want_refresh = 1; 886 want_refresh = 1;
853 } 887 }
854 888
855 /* 889 /*
856 * these modifications only affect the static keybuffer 890 * these modifications only affect the static keybuffer
… …
871#ifdef META8_OPTION 905#ifdef META8_OPTION
872 && meta_char == C0_ESC 906 && meta_char == C0_ESC
873#endif 907#endif
874 ) 908 )
875 { 909 {
876 const unsigned char ch = C0_ESC; 910 const char ch = C0_ESC;
877 tt_write (&ch, 1); 911 tt_write (&ch, 1);
878 } 912 }
879 913
880#if defined(DEBUG_CMD)
881 /* Display keyboard buffer contents */
882 unsigned char *p;
883 int i;
884
885 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
886 for (i = 0, p = kbuf; i < len; i++, p++)
887 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
888 fprintf (stderr, "'\n");
889#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
891} 915}
892/*}}} */
893 916
894#if (MENUBAR_MAX) 917void
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 918rxvt_term::key_release (XKeyEvent &ev)
896/* attempt to `write' count to the input buffer */ 919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
994#if defined (KEYSYM_RESOURCE)
897unsigned int 995unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
899{ 997{
900 unsigned int n, s; 998 unsigned int n, s;
901 999
902 n = cmdbuf_ptr - cmdbuf_base; 1000 n = cmdbuf_ptr - cmdbuf_base;
903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
922 1020
923 cmd_parse (); 1021 cmd_parse ();
924 1022
925 return 0; 1023 return 0;
926} 1024}
927#endif /* MENUBAR_MAX */ 1025#endif
928 1026
929void 1027void
930rxvt_term::flush () 1028rxvt_term::flush ()
931{ 1029{
932 flush_ev.stop (); 1030 flush_ev.stop ();
… …
940 } 1038 }
941#endif 1039#endif
942 1040
943 if (want_refresh) 1041 if (want_refresh)
944 { 1042 {
1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1044 {
1045 int row = view_start;
1046 int end_row = row + nrow;
1047
1048 while (row > top_row && ROW (row - 1).is_longer ())
1049 --row;
1050
1051 do
1052 {
1053 int start_row = row;
1054 line_t *l;
1055
1056 do
1057 {
1058 l = &ROW (row++);
1059
1060 if (!(l->f & LINE_FILTERED))
1061 {
1062 // line not filtered, mark it as filtered
1063 l->f |= LINE_FILTERED;
1064 while (l->is_longer ())
1065 {
1066 l = &ROW (row++);
1067 l->f |= LINE_FILTERED;
1068 }
1069
1070 // and filter it
1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1072
1073 break;
1074 }
1075 }
1076 while (l->is_longer () && row < end_row);
1077 }
1078 while (row < end_row);
1079 }
1080
945 scr_refresh (refresh_type); 1081 scr_refresh ();
946 scrollbar_show (1); 1082 scrollbar_show (1);
947#ifdef USE_XIM 1083#ifdef USE_XIM
948 IMSendSpot (); 1084 IMSendSpot ();
949#endif 1085#endif
950 } 1086 }
… …
953} 1089}
954 1090
955void 1091void
956rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
957{ 1093{
958 SET_R (this); 1094 make_current ();
959 SET_LOCALE (locale);
960 1095
961 display->flush (); 1096 display->flush ();
962 1097
963 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01); 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965} 1100}
966 1101
967void 1102void
968rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
969{ 1104{
970 SET_R (this); 1105 make_current ();
971 SET_LOCALE (locale);
972 1106
973 refresh_limit = 1; 1107 refresh_limit = 1;
974 refresh_count = 0; 1108 refresh_count = 0;
975 flush (); 1109 flush ();
976} 1110}
… …
980rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
981{ 1115{
982 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
983 want_refresh = 1; 1117 want_refresh = 1;
984 1118
985 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
986} 1120}
987#endif 1121#endif
988 1122
989#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
990void 1124void
… …
1004rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1005{ 1139{
1006 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1007 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1008 { 1142 {
1009 refresh_type |= SMOOTH_REFRESH;
1010 want_refresh = 1; 1143 want_refresh = 1;
1011 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1012 } 1145 }
1013} 1146}
1014#endif 1147#endif
… …
1018rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1019{ 1152{
1020 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1021 { 1154 {
1022 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1023 refresh_type |= SMOOTH_REFRESH;
1024 want_refresh = 1; 1156 want_refresh = 1;
1025 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1026 } 1158 }
1027} 1159}
1028#endif 1160#endif
… …
1033{ 1165{
1034 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1169 {
1038 refresh_type |= SMOOTH_REFRESH; 1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1039 want_refresh = 1; 1173 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1175 }
1042} 1176}
1043#endif 1177#endif
1044 1178
1179#if LINUX_YIELD_HACK
1180static struct event_handler
1181{
1182 check_watcher yield_ev;
1183
1184 void yield_cb (check_watcher &w)
1185 {
1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1194 w.stop ();
1195 }
1196
1197 event_handler ()
1198 : yield_ev (this, &event_handler::yield_cb)
1199 {
1200 }
1201} event_handler;
1202#endif
1203
1045bool 1204bool
1046rxvt_term::pty_fill () 1205rxvt_term::pty_fill ()
1047{ 1206{
1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049 1208
1050 if (CBUFSIZ == n) 1209 if (CBUFSIZ == n)
1051 { 1210 {
1052 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1053 n = 0; 1212 n = 0;
1054 } 1213 }
1055 1214
1056 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1057 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1058 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1059 1218
1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1061 1220
1062 if (n > 0) 1221 if (r > 0)
1063 { 1222 {
1064 cmdbuf_endp += n; 1223 cmdbuf_endp += r;
1065 return true; 1224 return true;
1066 } 1225 }
1067 else if (n < 0 && errno != EAGAIN) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1227 {
1228#if LINUX_YIELD_HACK
1229 if (display->is_local)
1230 event_handler.yield_ev.start ();
1231#endif
1232 }
1233 else
1234 {
1235 pty_ev.stop ();
1236
1237 if (!OPTION (Opt_hold))
1068 destroy (); 1238 destroy ();
1239 }
1069 1240
1070 return false; 1241 return false;
1071} 1242}
1072 1243
1073void 1244void
1074rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1075{ 1246{
1076 SET_R (this); 1247 make_current ();
1077 SET_LOCALE (locale);
1078 1248
1079 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1080 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1081 while (pty_fill ()) 1251 while (pty_fill ())
1082 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1087} 1257}
1088 1258
1089void 1259void
1090rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1091{ 1261{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1093 recolour_cursor (); 1263 recolour_cursor ();
1094 1264
1095#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1266 hidden_pointer = 0;
1097 1267
1098 if (options & Opt_pointerBlank) 1268 if (OPTION (Opt_pointerBlank))
1099 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1100#endif 1270#endif
1101} 1271}
1102 1272
1103#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1104void 1274void
1105rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1106{ 1276{
1107 if (! (options & Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1108 return; 1278 return;
1109 1279
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1111 XFlush (display->display); 1281 XFlush (dpy);
1112 1282
1113 hidden_pointer = 1; 1283 hidden_pointer = 1;
1114} 1284}
1115 1285
1116void 1286void
1117rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1118{ 1288{
1119 SET_R (this); 1289 make_current ();
1120 SET_LOCALE (locale);
1121 1290
1122 pointer_blank (); 1291 pointer_blank ();
1123} 1292}
1124#endif 1293#endif
1125 1294
… …
1190 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1191 (32 + x + 1), 1360 (32 + x + 1),
1192 (32 + y + 1)); 1361 (32 + y + 1));
1193} 1362}
1194 1363
1195#ifdef USING_W11LIB
1196void
1197rxvt_W11_process_x_event (XEvent *ev)
1198{
1199 rxvt_t *r = rxvt_get_r ();
1200
1201 x_cb (*ev);
1202}
1203#endif
1204
1205/*{{{ process an X event */ 1364/*{{{ process an X event */
1206void 1365void
1207rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1208{ 1367{
1209 SET_R (this); 1368 make_current ();
1210 SET_LOCALE (locale);
1211 1369
1212#if defined(CURSOR_BLINK) 1370 dLocal (Display *, dpy);
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1214 {
1215 if (hidden_cursor)
1216 {
1217 hidden_cursor = 0;
1218 want_refresh = 1;
1219 }
1220 1371
1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1372 if (ev.xany.window == vt
1222 } 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1223#endif 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1375 return;
1224 1376
1225#if defined(POINTER_BLANK) 1377 // 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; 1378 Window unused_root, unused_child;
1240 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1241 unsigned int unused_mask; 1380 unsigned int unused_mask;
1242 1381
1243 switch (ev.type) 1382 switch (ev.type)
1244 { 1383 {
1245 case KeyPress: 1384 case KeyPress:
1246#if ISO_14755 1385 key_press (ev.xkey);
1247 if (!(iso14755buf & ISO_14755_52))
1248#endif
1249 lookup_key (ev.xkey);
1250
1251 break; 1386 break;
1252 1387
1253 case KeyRelease: 1388 case KeyRelease:
1254 { 1389 key_release (ev.xkey);
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1256 KeySym ks;
1257
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif
1260
1261#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support
1263 if (iso14755buf)
1264 if (iso14755buf & ISO_14755_52)
1265 {
1266# if ENABLE_OVERLAY
1267 scr_overlay_off ();
1268# endif
1269# if ISO_14755
1270 // iso14755 part 5.2 handling: release time
1271 // first: controls
1272 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f)))
1275 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1277 commit_iso14755 ();
1278 return; // case-break;
1279 }
1280
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks)
1283 {
1284 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 scr_bell ();
1290# endif
1291 iso14755buf = 0;
1292 break;
1293 }
1294 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299 if (iso14755buf & ISO_14755_51)
1300 commit_iso14755 ();
1301#if ISO_14755
1302 else if (iso14755buf & ISO_14755_STARTED)
1303 {
1304 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1305
1306 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1307 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1308 }
1309# endif
1310 else
1311 iso14755buf = 0;
1312 }
1313#endif
1314
1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1316 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R)
1319 mouse_slip_wheel_speed = 0;
1320#endif
1321 break; 1390 break;
1322 }
1323 1391
1324 case ButtonPress: 1392 case ButtonPress:
1325 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1326 break; 1394 break;
1327 1395
… …
1329 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1330 break; 1398 break;
1331 1399
1332 case ClientMessage: 1400 case ClientMessage:
1333 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1335 destroy ();
1336#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink))
1342 { 1403 {
1343 /* Get Dnd data */ 1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1344 Atom ActualType; 1405 {
1345 int ActualFormat; 1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1346 unsigned char *data; 1407 {
1347 unsigned long Size, RemainingBytes; 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1348 1409 {
1349 XGetWindowProperty (display->display, display->root, 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1350 xa[XA_DNDSELECTION], 1411 destroy ();
1351 0L, 1000000L, 1412 }
1352 False, AnyPropertyType, 1413#if ENABLE_EWMH
1353 &ActualType, &ActualFormat, 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1354 &Size, &RemainingBytes, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1355 &data); 1417 &ev);
1356 set_string_property (XA_CUT_BUFFER0, data); 1418#endif
1357 XFree (data); 1419 }
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1420 }
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1360 } 1430 }
1361#endif /* OFFIX_DND */
1362 break; 1431 break;
1363 1432
1364 case MappingNotify: 1433 case MappingNotify:
1365 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1366 break; 1435 break;
… …
1389 break; 1458 break;
1390 } 1459 }
1391 break; 1460 break;
1392 1461
1393 case FocusIn: 1462 case FocusIn:
1394 if (!TermWin.focus) 1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1464 focus_in ();
1465 break;
1466
1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1469 focus_out ();
1470 break;
1471
1472 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0])
1395 { 1474 {
1396 TermWin.focus = 1; 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 { 1476 ;
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 1477
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));
1463
1464 if (szHint.width != width || szHint.height != height) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1479 {
1466 seen_resize = 1; 1480 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1482 }
1469 1483
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487#if 0
1471 if (options & Opt_transparent) 1488 if (OPTION (Opt_transparent))
1472 check_our_parents (); 1489 check_our_parents ();
1473#endif 1490#endif
1491#endif
1474 } 1492 }
1475 break; 1493 break;
1476 1494
1477 case PropertyNotify: 1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue) 1498 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom); 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481 1500
1482 break; 1501 break;
1483 1502
1484 case SelectionClear: 1503 case SelectionClear:
1485 selection_clear (); 1504 selection_clear ();
… …
1492 1511
1493 case SelectionRequest: 1512 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1495 break; 1514 break;
1496 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1497 case UnmapNotify: 1524 case UnmapNotify:
1498 TermWin.mapped = 0; 1525 mapped = 0;
1499#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1501#endif 1528#endif
1502 break; 1529 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; 1530 break;
1510 1531
1511#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1512 case ReparentNotify: 1533 case ReparentNotify:
1513 rootwin_cb (ev); 1534 rootwin_cb (ev);
1514 break; 1535 break;
1515#endif /* TRANSPARENT */ 1536#endif /* TRANSPARENT */
1516 1537
1517 case GraphicsExpose: 1538 case GraphicsExpose:
1518 case Expose: 1539 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1540 if (ev.xany.window == vt)
1520 { 1541 {
1521 do 1542 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1546
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1548
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1531 1552
1532 scr_refresh (refresh_type); 1553 want_refresh = 1;
1533 } 1554 }
1534 else 1555 else
1535 { 1556 {
1536 XEvent unused_event; 1557 XEvent unused_event;
1537 1558
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1539 ; 1560 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1562 ;
1542 1563
1543 if (isScrollbarWindow (ev.xany.window)) 1564 if (isScrollbarWindow (ev.xany.window))
1544 { 1565 {
1545 scrollBar.setIdle (); 1566 scrollBar.setIdle ();
1546 scrollbar_show (0); 1567 scrollbar_show (0);
1547 } 1568 }
1548#ifdef MENUBAR
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose ();
1551#endif
1552 1569
1553#ifdef TRANSPARENT 1570#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1571 if (am_transparent && ev.xany.window == parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1572 XClearWindow (dpy, ev.xany.window);
1556#endif 1573#endif
1557 } 1574 }
1558 break; 1575 break;
1559 1576
1560 case MotionNotify: 1577 case MotionNotify:
1561#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1562 if (hidden_pointer) 1579 if (hidden_pointer)
1563 pointer_unblank (); 1580 pointer_unblank ();
1564#endif 1581#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) 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1583 break;
1574 1584
1575 if (ev.xany.window == TermWin.vt) 1585 if (ev.xany.window == vt)
1576 { 1586 {
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589 ; // nop
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1591 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1580 ; 1593 ;
1581 1594
1582 XQueryPointer (display->display, TermWin.vt, 1595 XQueryPointer (dpy, vt,
1583 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1598 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1599 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
… …
1599#endif 1612#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1613 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1614 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1615
1603#ifdef SELECTION_SCROLLING 1616#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1617 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1618 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1619 {
1607 int dist; 1620 int dist;
1608 1621
1609 /* don't clobber the current delay if we are 1622 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1623 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1631 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1632 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1633 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1634
1622 /* calc number of lines to scroll */ 1635 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1636 if (ev.xbutton.y < int_bwidth)
1624 { 1637 {
1625 scroll_selection_dir = UP; 1638 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1639 dist = int_bwidth - ev.xbutton.y;
1627 } 1640 }
1628 else 1641 else
1629 { 1642 {
1630 scroll_selection_dir = DN; 1643 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1644 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1645 }
1633 1646
1634 scroll_selection_lines = Pixel2Height (dist) 1647 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1648 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1649 + 1;
1637 MIN_IT (scroll_selection_lines, 1650 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1651 SELECTION_SCROLL_MAX_LINES);
1639 } 1652 }
1640 else 1653 else
1641 { 1654 {
1642 /* we are within the text window, so we 1655 /* we are within the text window, so we
… …
1651#endif 1664#endif
1652 } 1665 }
1653 } 1666 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1668 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1657 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1658 ; 1671 ;
1659 1672
1660 XQueryPointer (display->display, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1661 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1677 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1666 scrollbar_size ()); 1679 scrollbar_size ());
1667 scr_refresh (refresh_type); 1680 want_refresh = 1;
1668 refresh_limit = 0; 1681 refresh_limit = 0;
1669 scrollbar_show (1); 1682 scrollbar_show (1);
1670 } 1683 }
1671 break; 1684 break;
1672 } 1685 }
1673}
1674 1686
1675#if TRANSPARENT 1687#if defined(CURSOR_BLINK)
1688 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1697 }
1698#endif
1699
1700#if defined(POINTER_BLANK)
1701 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 {
1703 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease)
1706 if (hidden_pointer)
1707 pointer_unblank ();
1708
1709 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank ();
1711 }
1712#endif
1713}
1714
1715void
1716rxvt_term::focus_in ()
1717{
1718 if (!focus)
1719 {
1720 focus = 1;
1721 want_refresh = 1;
1722
1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1724
1725#if USE_XIM
1726 if (Input_Context != NULL)
1727 {
1728 IMSetPosition ();
1729 XSetICFocus (Input_Context);
1730 }
1731#endif
1732#if CURSOR_BLINK
1733 if (OPTION (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1735#endif
1736#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade])
1738 {
1739 pix_colors = pix_colors_focused;
1740 scr_recolour ();
1741 }
1742#endif
1743 }
1744}
1745
1746void
1747rxvt_term::focus_out ()
1748{
1749 if (focus)
1750 {
1751 focus = 0;
1752 want_refresh = 1;
1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755
1756#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf)
1758 {
1759 iso14755buf = 0;
1760# if ENABLE_OVERLAY
1761 scr_overlay_off ();
1762# endif
1763 }
1764#endif
1765#if USE_XIM
1766 if (Input_Context != NULL)
1767 XUnsetICFocus (Input_Context);
1768#endif
1769#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink))
1771 cursor_blink_ev.stop ();
1772 hidden_cursor = 0;
1773#endif
1774#if OFF_FOCUS_FADING
1775 if (rs[Rs_fade])
1776 {
1777 pix_colors = pix_colors_unfocused;
1778 scr_recolour ();
1779 }
1780#endif
1781 }
1782}
1783
1784void
1785rxvt_term::update_fade_color (unsigned int idx)
1786{
1787#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade])
1789 {
1790 rgba c;
1791 pix_colors [Color_fade].get (c);
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 }
1794#endif
1795}
1796
1797#if TRANSPARENT || ENABLE_PERL
1676void 1798void
1677rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1800{
1679 SET_R (this); 1801 make_current ();
1680 SET_LOCALE (locale);
1681 1802
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return;
1806
1807# if TRANSPARENT
1682 switch (ev.type) 1808 switch (ev.type)
1683 { 1809 {
1684 case PropertyNotify: 1810 case PropertyNotify:
1685 /* 1811 /*
1686 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
… …
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691 return; 1817 return;
1692 1818
1693 /* FALLTHROUGH */ 1819 /* FALLTHROUGH */
1694 case ReparentNotify: 1820 case ReparentNotify:
1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1821 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696 want_refresh = want_full_refresh = 1; 1822 want_refresh = want_full_refresh = 1;
1697 break; 1823 break;
1698 } 1824 }
1825# endif
1699} 1826}
1700#endif 1827#endif
1701 1828
1702void 1829void
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 {
1844 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1845 return;
1846
1716#if ISO_14755 1847#if ISO_14755
1717 // 5.4 1848 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1850 {
1720 iso14755_54 (ev.x, ev.y); 1851 iso14755_54 (ev.x, ev.y);
… …
1732#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1733 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1734 { 1865 {
1735 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1736 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1737 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1738 { 1870 {
1739 /* only report double clicks */ 1871 /* only report double clicks */
1740 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1741 mouse_report (ev); 1873 mouse_report (ev);
… …
1767 { 1899 {
1768 case Button1: 1900 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1901 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1902 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1903#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1904 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1905#else
1774 selection.rect = false; 1906 selection.rect = false;
1775#endif 1907#endif
1776 1908
1777 /* allow shift+left click to extend selection */ 1909 /* allow shift+left click to extend selection */
1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1910 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1779 { 1911 {
1780 if (MEvent.button == Button1 && clickintime) 1912 if (MEvent.button == Button1 && clickintime)
1781 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1782 else 1914 else
1783 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
… …
1924 case Button3: 2056 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 2057 if (scrollBar.style != R_SB_XTERM)
1926 { 2058 {
1927 if (scrollbar_above_slider (ev.y)) 2059 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 2060# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 2061 scr_page (UP, nrow - 1);
1930# else 2062# else
1931 scr_page (UP, TermWin.nrow / 4); 2063 scr_page (UP, nrow / 4);
1932# endif 2064# endif
1933 else if (scrollbar_below_slider (ev.y)) 2065 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 2067 scr_page (DN, nrow - 1);
1936# else 2068# else
1937 scr_page (DN, TermWin.nrow / 4); 2069 scr_page (DN, nrow / 4);
1938# endif 2070# endif
1939 else 2071 else
1940 scrollBar.setMotion (); 2072 scrollBar.setMotion ();
1941 } 2073 }
1942 else 2074 else
1943 { 2075 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 2076 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 2077 (nrow
1946 * scrollbar_position (ev.y) 2078 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 2079 / scrollbar_size ()));
1948 } 2080 }
1949 2081
1950 break; 2082 break;
1951 } 2083 }
1952 } 2084 }
2085
1953 return; 2086 return;
1954 } 2087 }
1955#if MENUBAR
1956 /*
1957 * Menubar window processing of button press
1958 */
1959 if (isMenuBarWindow (ev.window))
1960 menubar_control (ev);
1961#endif
1962} 2088}
1963 2089
1964void 2090void
1965rxvt_term::button_release (XButtonEvent &ev) 2091rxvt_term::button_release (XButtonEvent &ev)
1966{ 2092{
… …
1972 2098
1973 if (scrollbar_isUpDn ()) 2099 if (scrollbar_isUpDn ())
1974 { 2100 {
1975 scrollBar.setIdle (); 2101 scrollBar.setIdle ();
1976 scrollbar_show (0); 2102 scrollbar_show (0);
1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1978 refresh_type &= ~SMOOTH_REFRESH;
1979#endif
1980 } 2103 }
1981 2104
1982#ifdef SELECTION_SCROLLING 2105#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2106 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2107 sel_scroll_ev.stop();
1985#endif 2108#endif
1986 2109
1987 if (ev.window == TermWin.vt) 2110 if (ev.window == vt)
1988 { 2111 {
2112 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2113 return;
2114
1989#if ISO_14755 2115#if ISO_14755
1990 // 5.4 2116 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2117 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2118 return;
1993#endif 2119#endif
2120
1994 if (reportmode) 2121 if (reportmode)
1995 { 2122 {
1996 /* mouse report from vt window */ 2123 /* mouse report from vt window */
1997 /* don't report release of wheel "buttons" */ 2124 /* don't report release of wheel "buttons" */
1998 if (ev.button >= 4) 2125 if (ev.button >= 4)
… …
2028 { 2155 {
2029 case Button1: 2156 case Button1:
2030 case Button3: 2157 case Button3:
2031 selection_make (ev.time); 2158 selection_make (ev.time);
2032 break; 2159 break;
2160
2033 case Button2: 2161 case Button2:
2034 selection_request (ev.time, ev.x, ev.y); 2162 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2035 break; 2164 break;
2165
2036#ifdef MOUSE_WHEEL 2166#ifdef MOUSE_WHEEL
2037 case Button4: 2167 case Button4:
2038 case Button5: 2168 case Button5:
2039 { 2169 {
2040 int i; 2170 int i;
… …
2042 2172
2043 v = ev.button == Button4 ? UP : DN; 2173 v = ev.button == Button4 ? UP : DN;
2044 2174
2045 if (ev.state & ShiftMask) 2175 if (ev.state & ShiftMask)
2046 i = 1; 2176 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2177 else if (OPTION (Opt_mouseWheelScrollPage))
2048 i = TermWin.nrow - 1; 2178 i = nrow - 1;
2049 else 2179 else
2050 i = 5; 2180 i = 5;
2051 2181
2052# ifdef MOUSE_SLIP_WHEELING 2182# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2183 if (ev.state & ControlMask)
2054 { 2184 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2185 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2186 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; 2187 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058 2188
2059 if (slip_wheel_ev.at < NOW) 2189 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2190 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2191
2062 slip_wheel_ev.start (); 2192 slip_wheel_ev.start ();
2063 } 2193 }
2064 else 2194 else
2065 { 2195 {
2066# endif 2196# endif
2067# ifdef JUMP_MOUSE_WHEEL
2068 scr_page (v, i); 2197 scr_page (v, i);
2069 scr_refresh (SMOOTH_REFRESH);
2070 scrollbar_show (1); 2198 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 2199# ifdef MOUSE_SLIP_WHEELING
2080 } 2200 }
2081#endif 2201# endif
2082 } 2202 }
2083 break; 2203 break;
2084#endif 2204#endif
2085 } 2205 }
2086 } 2206 }
2087#ifdef MENUBAR
2088 else if (isMenuBarWindow (ev.window))
2089 menubar_control (ev);
2090#endif
2091} 2207}
2092 2208
2093#ifdef TRANSPARENT 2209#ifdef TRANSPARENT
2094#if TINTING 2210#if TINTING
2095/* taken from aterm-0.4.2 */ 2211/* taken from aterm-0.4.2 */
2096 2212
2097typedef uint32_t RUINT32T; 2213typedef uint32_t RUINT32T;
2098 2214
2099void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2215void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2100{ 2216{
2101 int sh_r, sh_g, sh_b; 2217 int sh_r, sh_g, sh_b;
2102 RUINT32T mask_r, mask_g, mask_b; 2218 RUINT32T mask_r, mask_g, mask_b;
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2219 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2220 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2221 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2222 int i;
2107 2223
2108 Visual* visual = display->visual; 2224 Visual *visual = term->visual;
2109 2225
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2226 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2227
2112 /* for convenience */ 2228 /* for convenience */
2113 mask_r = visual->red_mask; 2229 mask_r = visual->red_mask;
… …
2337 Pixmap rootpixmap = None; 2453 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2454 XWindowAttributes wattr, wrootattr;
2339 2455
2340 pchanged = 0; 2456 pchanged = 0;
2341 2457
2342 if (!(options & Opt_transparent)) 2458 if (!OPTION (Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2459 return pchanged; /* Don't try any more */
2344 2460
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2461 XGetWindowAttributes (dpy, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2462 rootdepth = wrootattr.depth;
2347 2463
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2464 XGetWindowAttributes (dpy, parent[0], &wattr);
2349 2465
2350 if (rootdepth != wattr.depth) 2466 if (rootdepth != wattr.depth)
2351 { 2467 {
2352 if (am_transparent) 2468 if (am_transparent)
2353 { 2469 {
2354 pchanged = 1; 2470 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2471 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2472 am_transparent = am_pixmap_trans = 0;
2357 } 2473 }
2358 2474
2359 return pchanged; /* Don't try any more */ 2475 return pchanged; /* Don't try any more */
2360 } 2476 }
2361 2477
2362 /* Get all X ops out of the queue so that our information is up-to-date. */ 2478 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False); 2479 XSync (dpy, False);
2364 2480
2365 /* 2481 /*
2366 * Make the frame window set by the window manager have 2482 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2483 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that. 2484 * windows for each client, so we have to take care about that.
2369 */ 2485 */
2370 i = (xa[XA_XROOTPMAP_ID] 2486 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2487 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2488 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2489 &nitems, &bytes_after, &prop) == Success);
2374 2490
2375 if (!i || prop == NULL) 2491 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2492 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2493 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2494 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2495 &nitems, &bytes_after, &prop) == Success);
2380 2496
2381 if (!i || prop == NULL 2497 if (!i || prop == NULL
2382#if TINTING 2498#if TINTING
2383 || !rs[Rs_color + Color_tint] 2499 || !ISSET_PIXCOLOR (Color_tint)
2384#endif 2500#endif
2385 ) 2501 )
2386 have_pixmap = 0; 2502 have_pixmap = 0;
2387 else 2503 else
2388 { 2504 {
… …
2401 Window cr; 2517 Window cr;
2402 XImage *image; 2518 XImage *image;
2403 GC gc; 2519 GC gc;
2404 XGCValues gcvalue; 2520 XGCValues gcvalue;
2405 2521
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2522 XTranslateCoordinates (dpy, parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2523 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2524 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2525 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2526 nx = ny = 0;
2411 2527
… …
2421 nh += sy; 2537 nh += sy;
2422 ny = -sy; 2538 ny = -sy;
2423 sy = 0; 2539 sy = 0;
2424 } 2540 }
2425 2541
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2542 min_it (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2543 min_it (nh, (unsigned int) (wrootattr.height - sy));
2428 2544
2429 XSync (display->display, False); 2545 XSync (dpy, False);
2430 allowedxerror = -1; 2546 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2547 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2548
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2549 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2550 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2551 allowedxerror = 0;
2436 2552
2437 if (image == NULL) 2553 if (image == NULL)
2438 { 2554 {
2439 if (am_transparent && am_pixmap_trans) 2555 if (am_transparent && am_pixmap_trans)
2440 { 2556 {
2441 pchanged = 1; 2557 pchanged = 1;
2442 if (TermWin.pixmap != None) 2558 if (pixmap != None)
2443 { 2559 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2560 XFreePixmap (dpy, pixmap);
2445 TermWin.pixmap = None; 2561 pixmap = None;
2446 } 2562 }
2447 } 2563 }
2448 2564
2449 am_pixmap_trans = 0; 2565 am_pixmap_trans = 0;
2450 } 2566 }
2451 else 2567 else
2452 { 2568 {
2453 if (TermWin.pixmap != None) 2569 if (pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2570 XFreePixmap (dpy, pixmap);
2455 2571
2456#if TINTING 2572#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2573 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2574 {
2459 unsigned short rm, gm, bm;
2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2575 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2461 2576
2577 rgba c;
2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2578 pix_colors_focused [Color_tint].get (c);
2463 2579
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2580 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2465 } 2581 }
2466#endif 2582#endif
2467 2583
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2584 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2469 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2585 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2586 XPutImage (dpy, pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2587 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2588 XFreeGC (dpy, gc);
2474 XDestroyImage (image); 2589 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2590 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2591 XClearWindow (dpy, parent[0]);
2477 2592
2478 if (!am_transparent || !am_pixmap_trans) 2593 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2594 pchanged = 1;
2480 2595
2481 am_transparent = am_pixmap_trans = 1; 2596 am_transparent = am_pixmap_trans = 1;
2482 } 2597 }
2483 } 2598 }
2484 2599
2485 if (am_pixmap_trans) 2600 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2601 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2487 else 2602 else
2488 { 2603 {
2489 unsigned int n; 2604 unsigned int n;
2490 /* 2605 /*
2491 * InheritPixmap transparency 2606 * InheritPixmap transparency
2492 */ 2607 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2608 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494 { 2609 {
2495 oldp = TermWin.parent[i]; 2610 oldp = parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2611 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2497 &TermWin.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 {
2516 for (; n < (unsigned int)i; n++) 2629 for (; n < (unsigned int)i; n++)
2517 { 2630 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2631 XGetWindowAttributes (dpy, parent[n], &wattr);
2632
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 }
2639
2640 if (n > (sizeof (parent) / sizeof (parent[0])))
2525 } 2641 {
2526
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2528 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2642 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2643 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2644 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2645 /* XXX: also turn off Opt_transparent? */
2533 } 2646 }
2534 else 2647 else
2535 { 2648 {
2536#if WAIT_FOR_WM
2537 /* wait (an arbitrary period) for the WM to do its thing
2538 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1);
2540#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2649 for (n = 0; n < (unsigned int)i; n++)
2542 { 2650 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2652 XClearWindow (dpy, parent[n]);
2545 } 2653 }
2546 2654
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2655 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2548 am_transparent = 1; 2656 am_transparent = 1;
2549 } 2657 }
2550 2658
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2659 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2660 parent[i] = None;
2553 } 2661 }
2554 2662
2555 if (scrollBar.win) 2663 if (scrollBar.win)
2556 { 2664 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2665 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2666 scrollBar.setIdle ();
2559 scrollbar_show (0); 2667 scrollbar_show (0);
2560 } 2668 }
2561 2669
2562 if (am_transparent) 2670 if (am_transparent)
… …
2574 2682
2575bool 2683bool
2576rxvt_term::cmd_parse () 2684rxvt_term::cmd_parse ()
2577{ 2685{
2578 bool flag = false; 2686 bool flag = false;
2579 unicode_t ch = NOCHAR; 2687 wchar_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here 2688 char *seq_begin; // remember start of esc-sequence here
2581 2689
2582 for (;;) 2690 for (;;)
2583 { 2691 {
2584 if (ch == NOCHAR) 2692 if (ch == NOCHAR)
2585 { 2693 {
2586 seq_begin = cmdbuf_ptr; 2694 seq_begin = cmdbuf_ptr;
2587 ch = next_char (); 2695 ch = next_char ();
2588 }
2589 2696
2590 if (ch == NOCHAR) // TODO: improve 2697 if (ch == NOCHAR)
2591 break; 2698 break;
2699 }
2592 2700
2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2701 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 { 2702 {
2595 if (!seen_input) 2703 if (!seen_input)
2596 { 2704 {
… …
2600 // some window managers resize the window early, and these programs 2708 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2709 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2710 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2711 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2712 // resized.
2605 if (seen_resize) 2713 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2714 kill (-cmd_pid, SIGWINCH);
2607 } 2715 }
2608 2716
2609 /* Read a text string from the input buffer */ 2717 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2718 wchar_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2719 bool refreshnow = false;
2612 int nlines = 0; 2720 int nlines = 0;
2613 unicode_t *str = buf; 2721 wchar_t *str = buf;
2722 wchar_t *eol = str + min (ncol, UBUFSIZ);
2614 2723
2615 for (;;) 2724 for (;;)
2616 { 2725 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2726 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2727 break;
2619 2728
2620 *str++ = ch; 2729 *str++ = ch;
2621 2730
2622 if (ch == C0_LF) 2731 if (ch == C0_LF || str >= eol)
2623 { 2732 {
2733 if (ch == C0_LF)
2624 nlines++; 2734 nlines++;
2735
2625 refresh_count++; 2736 refresh_count++;
2626 2737
2627 if (!(options & Opt_jumpScroll) 2738 if (!OPTION (Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2739 || (refresh_count >= refresh_limit * (nrow - 1)))
2629 { 2740 {
2630 refreshnow = true; 2741 refreshnow = true;
2742 refresh_count = 0;
2631 ch = NOCHAR; 2743 ch = NOCHAR;
2632 break; 2744 break;
2633 } 2745 }
2634 2746
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2747 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2748 if (nlines >= nrow - 1)
2637 { 2749 {
2750 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2752 scr_add_lines (buf, str - buf, nlines);
2753
2639 nlines = 0; 2754 nlines = 0;
2640 str = buf; 2755 str = buf;
2756 eol = str + min (ncol, UBUFSIZ);
2641 } 2757 }
2642 }
2643 2758
2644 if (str >= buf + UBUFSIZ) 2759 if (str >= eol)
2645 { 2760 {
2761 if (eol >= buf + UBUFSIZ)
2762 {
2646 ch = NOCHAR; 2763 ch = NOCHAR;
2647 break; 2764 break;
2765 }
2766 else
2767 eol = min (eol + ncol, buf + UBUFSIZ);
2768 }
2769
2648 } 2770 }
2649 2771
2650 seq_begin = cmdbuf_ptr; 2772 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2773 ch = next_char ();
2652 } 2774 }
2653 2775
2776 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2654 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, str - buf, nlines);
2655 2779
2656 /* 2780 /*
2657 * If there have been a lot of new lines, then update the screen 2781 * 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. 2782 * 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 2783 * the number of pages between refreshes is refresh_limit, which
2660 * is incremented here because we must be doing flat-out scrolling. 2784 * is incremented here because we must be doing flat-out scrolling.
2661 */ 2785 */
2662 if (refreshnow) 2786 if (refreshnow)
2663 { 2787 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2788 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++; 2789 refresh_limit++;
2666 else 2790 else
2667 { 2791 {
2668 flag = true; 2792 flag = true;
2793 //TODO: due to popular request, implement "skipscroll" option here
2669 scr_refresh (refresh_type); 2794 scr_refresh ();
2795 want_refresh = 1;
2670 } 2796 }
2671 } 2797 }
2672 2798
2673 } 2799 }
2674 else 2800 else
… …
2689 } 2815 }
2690 2816
2691 return flag; 2817 return flag;
2692} 2818}
2693 2819
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 2820// read the next character
2704unicode_t 2821wchar_t
2705rxvt_term::next_char () 2822rxvt_term::next_char () NOTHROW
2706{ 2823{
2707 while (cmdbuf_ptr < cmdbuf_endp) 2824 while (cmdbuf_ptr < cmdbuf_endp)
2708 { 2825 {
2709 // assume 7-bit to be ascii ALWAYS 2826 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2827 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++; 2828 return *cmdbuf_ptr++;
2712 2829
2713 wchar_t wc; 2830 wchar_t wc;
2714 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2831 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2715 2832
2716 if (len == (size_t)-2) 2833 if (len == (size_t)-2)
2717 { 2834 {
2718 // the mbstate stores incomplete sequences. didn't know this :/ 2835 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp; 2836 cmdbuf_ptr = cmdbuf_endp;
2720 break; 2837 break;
2721 } 2838 }
2722 2839
2723 if (len == (size_t)-1) 2840 if (len == (size_t)-1)
2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2841 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2725 2842
2726 // assume wchar == unicode 2843 // assume wchar == unicode
2727 cmdbuf_ptr += len; 2844 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK; 2845 return wc & UNICODE_MASK;
2729 } 2846 }
2730 2847
2731 return NOCHAR; 2848 return NOCHAR;
2732} 2849}
2850
2851// read the next octet
2852uint32_t
2853rxvt_term::next_octet () NOTHROW
2854{
2855 return cmdbuf_ptr < cmdbuf_endp
2856 ? (unsigned char)*cmdbuf_ptr++
2857 : NOCHAR;
2858}
2859
2860static class out_of_input out_of_input;
2733 2861
2734/* rxvt_cmd_getc () - Return next input character */ 2862/* rxvt_cmd_getc () - Return next input character */
2735/* 2863/*
2736 * Return the next input character after first passing any keyboard input 2864 * Return the next input character after first passing any keyboard input
2737 * to the command. 2865 * to the command.
2738 */ 2866 */
2739unicode_t 2867wchar_t
2740rxvt_term::cmd_getc () 2868rxvt_term::cmd_getc () THROW ((class out_of_input))
2741{ 2869{
2742 unicode_t c = next_char (); 2870 wchar_t c = next_char ();
2743 2871
2744 if (c == NOCHAR) 2872 if (c == NOCHAR)
2745 throw out_of_input; 2873 throw out_of_input;
2746 2874
2747 return c; 2875 return c;
2748} 2876}
2749 2877
2750unicode_t 2878uint32_t
2751rxvt_term::cmd_get8 () 2879rxvt_term::cmd_get8 () THROW ((class out_of_input))
2752{ 2880{
2753 unicode_t c = next_octet (); 2881 uint32_t c = next_octet ();
2754 2882
2755 if (c == NOCHAR) 2883 if (c == NOCHAR)
2756 throw out_of_input; 2884 throw out_of_input;
2757 2885
2758 return c; 2886 return c;
… …
2858 case C0_ESC: 2986 case C0_ESC:
2859 process_escape_seq (); 2987 process_escape_seq ();
2860 break; 2988 break;
2861 case C0_ENQ: /* terminal Status */ 2989 case C0_ENQ: /* terminal Status */
2862 if (rs[Rs_answerbackstring]) 2990 if (rs[Rs_answerbackstring])
2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2991 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2865 else 2992 else
2866 tt_write ((unsigned char *)VT100_ANS, 2993 tt_write (VT100_ANS, strlen (VT100_ANS));
2867 (unsigned int)strlen (VT100_ANS));
2868 break; 2994 break;
2869 case C0_BEL: /* bell */ 2995 case C0_BEL: /* bell */
2870 scr_bell (); 2996 scr_bell ();
2871 break; 2997 break;
2872 case C0_BS: /* backspace */ 2998 case C0_BS: /* backspace */
… …
2996 scr_charset_set (2, (unsigned int)cmd_getc ()); 3122 scr_charset_set (2, (unsigned int)cmd_getc ());
2997 break; 3123 break;
2998 case '+': 3124 case '+':
2999 scr_charset_set (3, (unsigned int)cmd_getc ()); 3125 scr_charset_set (3, (unsigned int)cmd_getc ());
3000 break; 3126 break;
3001#if ENABLE_FRILLS 3127#if !ENABLE_MINIMAL
3002 case '6': 3128 case '6':
3003 scr_backindex (); 3129 scr_backindex ();
3004 break; 3130 break;
3005#endif 3131#endif
3006 case '7': 3132 case '7':
3007 scr_cursor (SAVE); 3133 scr_cursor (SAVE);
3008 break; 3134 break;
3009 case '8': 3135 case '8':
3010 scr_cursor (RESTORE); 3136 scr_cursor (RESTORE);
3011 break; 3137 break;
3012#if ENABLE_FRILLS 3138#if !ENABLE_MINIMAL
3013 case '9': 3139 case '9':
3014 scr_forwardindex (); 3140 scr_forwardindex ();
3015 break; 3141 break;
3016#endif 3142#endif
3017 case '=': 3143 case '=':
… …
3027 break; 3153 break;
3028 3154
3029 /* 8.3.87: NEXT LINE */ 3155 /* 8.3.87: NEXT LINE */
3030 case C1_NEL: /* ESC E */ 3156 case C1_NEL: /* ESC E */
3031 { 3157 {
3032 unicode_t nlcr[] = { C0_LF, C0_CR }; 3158 wchar_t nlcr[] = { C0_LF, C0_CR };
3033 scr_add_lines (nlcr, 1, 2); 3159 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3034 } 3160 }
3035 break; 3161 break;
3036 3162
3037 /* kidnapped escape sequence: Should be 8.3.48 */ 3163 /* kidnapped escape sequence: Should be 8.3.48 */
3038 case C1_ESA: /* ESC G */ 3164 case C1_ESA: /* ESC G */
… …
3060 process_dcs_seq (); 3186 process_dcs_seq ();
3061 break; 3187 break;
3062 3188
3063 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3189 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3064 case C1_SCI: /* ESC Z */ 3190 case C1_SCI: /* ESC Z */
3065 tt_write ((const unsigned char *)ESCZ_ANSWER, 3191 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3066 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3067 break; /* steal obsolete ESC [ c */ 3192 break; /* steal obsolete ESC [ c */
3068 3193
3069 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3194 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3070 case C1_CSI: /* ESC [ */ 3195 case C1_CSI: /* ESC [ */
3071 process_csi_seq (); 3196 process_csi_seq ();
… …
3180 ndef = get_byte_array_bit (csi_defaults, i); 3305 ndef = get_byte_array_bit (csi_defaults, i);
3181 for (p = 0; p < nargs; p++) 3306 for (p = 0; p < nargs; p++)
3182 if (arg[p] == -1) 3307 if (arg[p] == -1)
3183 arg[p] = ndef; 3308 arg[p] = ndef;
3184 3309
3185#ifdef DEBUG_CMD
3186 fprintf (stderr, "CSI ");
3187 for (p = 0; p < nargs; p++)
3188 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3189 fprintf (stderr, "%c\n", ch);
3190#endif
3191
3192 /* 3310 /*
3193 * private mode handling 3311 * private mode handling
3194 */ 3312 */
3195 if (priv) 3313 if (priv)
3196 { 3314 {
3197 switch (priv) 3315 switch (priv)
3198 { 3316 {
3199 case '>': 3317 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 3318 if (ch == CSI_DA) /* secondary device attributes */
3319 {
3320 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3321 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3322 //
3323 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3324 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3325 // that we do not support xterm mouse reporting (should be 95 when we do).
3326 //
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3327 tt_printf ("\033[>%d;94;0c", 'U');
3328 }
3202 break; 3329 break;
3203 case '?': 3330 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3331 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3332 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3333 break;
… …
3311 3438
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3439 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 3440 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 3441 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3442 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3443 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 3444 break;
3318 3445
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3446 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 3447 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3322 break; 3448 break;
3323 3449
3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3450 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3325 process_sgr_mode (nargs, arg); 3451 process_sgr_mode (nargs, arg);
3326 break; 3452 break;
… …
3333 break; 3459 break;
3334 case 6: /* CPR requested */ 3460 case 6: /* CPR requested */
3335 scr_report_position (); 3461 scr_report_position ();
3336 break; 3462 break;
3337 case 7: /* unofficial extension */ 3463 case 7: /* unofficial extension */
3338 if (options & Opt_insecure) 3464 if (OPTION (Opt_insecure))
3339 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3465 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340 break; 3466 break;
3341 case 8: /* unofficial extension */ 3467 case 8: /* unofficial extension */
3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3468 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343 break; 3469 break;
… …
3410 break; 3536 break;
3411 case CSI_75: 3537 case CSI_75:
3412 scr_cursor (RESTORE); 3538 scr_cursor (RESTORE);
3413 break; 3539 break;
3414 3540
3415#if ENABLE_FRILLS 3541#if !ENABLE_MINIMAL
3416 case CSI_74: 3542 case CSI_74:
3417 process_window_ops (arg, nargs); 3543 process_window_ops (arg, nargs);
3418 break; 3544 break;
3419#endif 3545#endif
3420 3546
… …
3427 break; 3553 break;
3428 } 3554 }
3429} 3555}
3430/*}}} */ 3556/*}}} */
3431 3557
3432#if ENABLE_FRILLS 3558#if !ENABLE_MINIMAL
3433/* ARGSUSED */ 3559/* ARGSUSED */
3434void 3560void
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3561rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3562{
3437 int x, y; 3563 int x, y;
3438 XWindowAttributes wattr; 3564 XWindowAttributes wattr;
3439 Window wdummy; 3565 Window wdummy;
3566
3567 dLocal (Display *, dpy);
3440 3568
3441 if (nargs == 0) 3569 if (nargs == 0)
3442 return; 3570 return;
3443 3571
3444 switch (args[0]) 3572 switch (args[0])
3445 { 3573 {
3446 /* 3574 /*
3447 * commands 3575 * commands
3448 */ 3576 */
3449 case 1: /* deiconify window */ 3577 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3578 XMapWindow (dpy, parent[0]);
3451 break; 3579 break;
3452 case 2: /* iconify window */ 3580 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3581 XIconifyWindow (dpy, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3582 break;
3456 case 3: /* set position (pixels) */ 3583 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3584 XMoveWindow (dpy, parent[0], args[1], args[2]);
3458 break; 3585 break;
3459 case 4: /* set size (pixels) */ 3586 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3588 break;
3462 case 5: /* raise window */ 3589 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3590 XRaiseWindow (dpy, parent[0]);
3464 break; 3591 break;
3465 case 6: /* lower window */ 3592 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3593 XLowerWindow (dpy, parent[0]);
3467 break; 3594 break;
3468 case 7: /* refresh window */ 3595 case 7: /* refresh window */
3469 scr_touch (true); 3596 scr_touch (true);
3470 break; 3597 break;
3471 case 8: /* set size (chars) */ 3598 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3599 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3600 (unsigned int) (args[1] * fheight));
3474 break; 3601 break;
3475 3602
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3603 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3604 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3605 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3606 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3607 (unsigned int) (args[1] * fheight));
3481 break; 3608 break;
3482
3483 3609
3484 /* 3610 /*
3485 * reports - some output format copied from XTerm 3611 * reports - some output format copied from XTerm
3486 */ 3612 */
3487 case 11: /* report window state */ 3613 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3615 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3616 break;
3491 case 13: /* report window position */ 3617 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3618 XGetWindowAttributes (dpy, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3619 XTranslateCoordinates (dpy, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3620 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3621 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3622 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3623 break;
3498 case 14: /* report window size (pixels) */ 3624 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3625 XGetWindowAttributes (dpy, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3626 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3627 break;
3502 case 18: /* report text area size (chars) */ 3628 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3629 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3630 break;
3505 case 19: /* report window size (chars) */ 3631 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3632 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3633 break;
3508 case 20: /* report icon label */ 3634 case 20: /* report icon label */
3509 { 3635 {
3510 char *s; 3636 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3637 XGetIconName (dpy, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3638 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3639 XFree (s);
3514 } 3640 }
3515 break; 3641 break;
3516 case 21: /* report window title */ 3642 case 21: /* report window title */
3517 { 3643 {
3518 char *s; 3644 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3645 XFetchName (dpy, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3646 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3647 XFree (s);
3522 } 3648 }
3523 break; 3649 break;
3524 } 3650 }
3525} 3651}
… …
3528/*----------------------------------------------------------------------*/ 3654/*----------------------------------------------------------------------*/
3529/* 3655/*
3530 * get input up until STRING TERMINATOR (or BEL) 3656 * get input up until STRING TERMINATOR (or BEL)
3531 * ends_how is terminator used. returned input must be free()'d 3657 * ends_how is terminator used. returned input must be free()'d
3532 */ 3658 */
3533unsigned char * 3659char *
3534rxvt_term::get_to_st (unicode_t &ends_how) 3660rxvt_term::get_to_st (unicode_t &ends_how)
3535{ 3661{
3536 unicode_t ch; 3662 unicode_t ch;
3537 bool seen_esc = false; 3663 bool seen_esc = false;
3538 unsigned int n = 0; 3664 unsigned int n = 0;
… …
3552 seen_esc = true; 3678 seen_esc = true;
3553 continue; 3679 continue;
3554 } 3680 }
3555 else if (ch == C0_BEL || ch == CHAR_ST) 3681 else if (ch == C0_BEL || ch == CHAR_ST)
3556 break; 3682 break;
3683 else if (ch == C0_SYN)
3684 ch = cmd_get8 ();
3557 else if (ch < 0x20) 3685 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3686 return NULL; /* other control character - exit */
3559 3687
3560 seen_esc = false; 3688 seen_esc = false;
3561 3689
3562 if (n >= sizeof (string) - 1) 3690 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3691 // stop at some sane length
3564 return NULL; 3692 return NULL;
3565 3693
3566 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 ();
3568 else
3569 string[n++] = ch; 3694 string[n++] = ch;
3570 } 3695 }
3571 3696
3572 string[n++] = '\0'; 3697 string[n++] = '\0';
3573 3698
3574 ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
3575 3700
3576 return (unsigned char *)rxvt_wcstombs (string); 3701 return rxvt_wcstombs (string);
3577} 3702}
3578 3703
3579/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
3580/* 3705/*
3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3582 */ 3707 */
3583void 3708void
3584rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
3585{ 3710{
3586 unsigned char *s; 3711 char *s;
3587 unicode_t eh; 3712 unicode_t eh;
3588 3713
3589 /* 3714 /*
3590 * Not handled yet 3715 * Not handled yet
3591 */ 3716 */
… …
3610 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3611 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
3612 3737
3613 if (ch == ';') 3738 if (ch == ';')
3614 { 3739 {
3615 unsigned char *s = get_to_st (eh); 3740 char *s = get_to_st (eh);
3616 3741
3617 if (s) 3742 if (s)
3618 { 3743 {
3619 process_xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
3620 free (s); 3745 free (s);
3621 } 3746 }
3622 } 3747 }
3623} 3748}
3624 3749
3625void 3750void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3627{ 3752{
3628 if (str[0] == '?' && !str[1]) 3753 if (str[0] == '?' && !str[1])
3629 { 3754 {
3630 unsigned short r, g, b; 3755 rgba c;
3631 pix_colors_focused[color].get (display, r, g, b); 3756 pix_colors_focused[color].get (c);
3757
3758#if XFT
3759 if (c.a != rgba::MAX_CC)
3760 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3761 else
3762#endif
3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3763 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3633 } 3764 }
3634 else 3765 else
3635 set_window_color (color, str); 3766 set_window_color (color, str);
3636} 3767}
3637 3768
3638/* 3769/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3770 * 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 */ 3771 */
3663void 3772void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3773rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3665{ 3774{
3666 int changed = 0;
3667 int color; 3775 int color;
3668 char *buf, *name; 3776 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3777 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3778 int saveop = op;
3671 3779
3780 dLocal (Display *, dpy);
3781
3672 assert (str != NULL); 3782 assert (str != NULL);
3783
3784 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3785 return;
3786
3673 switch (op) 3787 switch (op)
3674 { 3788 {
3675 case XTerm_name: 3789 case XTerm_name:
3676 set_title (str); 3790 set_title (str);
3677 /* FALLTHROUGH */ 3791 /* FALLTHROUGH */
… …
3691 unsigned long bytes_after; 3805 unsigned long bytes_after;
3692 unsigned char *value = 0; 3806 unsigned char *value = 0;
3693 const char *str = ""; 3807 const char *str = "";
3694 3808
3695 if (prop 3809 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3810 && XGetWindowProperty (dpy, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3811 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3812 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3813 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3814 && actual_type != None
3701 && actual_format == 8) 3815 && actual_format == 8)
3702 str = (const char *)(value); 3816 str = (const char *)(value);
3703 3817
3704 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3818 tt_printf ("\033]%d;%s%c", op, str, resp);
3705 3819
3706 XFree (value); 3820 XFree (value);
3707 } 3821 }
3708 else 3822 else
3709 { 3823 {
… …
3713 { 3827 {
3714 *eq = 0; 3828 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3829 set_utf8_property (display->atom (str), eq + 1);
3716 } 3830 }
3717 else 3831 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3832 XDeleteProperty (dpy, parent[0],
3719 display->atom (str)); 3833 display->atom (str));
3720 } 3834 }
3721 break; 3835 break;
3722 3836
3723 case XTerm_Color: 3837 case XTerm_Color:
… …
3725 { 3839 {
3726 if ((name = strchr (buf, ';')) == NULL) 3840 if ((name = strchr (buf, ';')) == NULL)
3727 break; 3841 break;
3728 3842
3729 *name++ = '\0'; 3843 *name++ = '\0';
3730 color = atoi (buf); 3844 color = atoi (buf) + minCOLOR;
3731 3845
3732 if (color < 0 || color >= TOTAL_COLORS) 3846 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3733 break; 3847 break;
3734 3848
3735 if ((buf = strchr (name, ';')) != NULL) 3849 if ((buf = strchr (name, ';')) != NULL)
3736 *buf++ = '\0'; 3850 *buf++ = '\0';
3737 3851
3738 if (name[0] == '?' && !name[1]) 3852 process_color_seq (op, color, name, resp);
3739 {
3740 unsigned short r, g, b;
3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3743 }
3744 else
3745 set_window_color (color + minCOLOR, 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 (op, 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 (op, 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 (op, Color_cursor, str, resp);
3757 break; 3864 break;
3758#endif 3865#endif
3759 case XTerm_Color_pointer_fg: 3866 case XTerm_Color_pointer_fg:
3760 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3867 process_color_seq (op, Color_pointer_fg, str, resp);
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 (op, 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 (op, Color_RV, str, resp);
3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3883 break;
3884 case URxvt_Color_IT:
3885 process_color_seq (op, Color_IT, str, resp);
3777 break; 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 (op, Color_tint, str, resp);
3891
3782 check_our_parents (); 3892 check_our_parents ();
3893
3783 if (am_transparent) 3894 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3895 want_full_refresh = want_refresh = 1;
3785 break;
3786#endif
3787 3896
3897 break;
3898#endif
3899
3788 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3901 {
3789 if (*str != ';') 3902 if (*str != ';')
3790 { 3903 {
3791#if XPM_BACKGROUND 3904#if XPM_BACKGROUND
3792 scale_pixmap (""); /* reset to default scaling */ 3905 scale_pixmap (""); /* reset to default scaling */
3793 set_bgPixmap (str); /* change pixmap */ 3906 set_bgPixmap (str); /* change pixmap */
3794#endif
3795 scr_touch (true); 3907 scr_touch (true);
3908#endif
3796 } 3909 }
3910
3911 int changed = 0;
3912
3797 while ((str = strchr (str, ';')) != NULL) 3913 while ((str = strchr (str, ';')) != NULL)
3798 { 3914 {
3799 str++; 3915 str++;
3800#if XPM_BACKGROUND 3916#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3917 changed += scale_pixmap (str);
3802#endif 3918#endif
3803
3804 } 3919 }
3920
3805 if (changed) 3921 if (changed)
3806 { 3922 {
3807#ifdef XPM_BACKGROUND 3923#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3924 resize_pixmap ();
3809#endif
3810 scr_touch (true); 3925 scr_touch (true);
3926#endif
3811 } 3927 }
3928 }
3812 break; 3929 break;
3813 3930
3814 case XTerm_restoreFG: 3931 case Rxvt_restoreFG:
3815 set_window_color (Color_fg, str); 3932 set_window_color (Color_fg, str);
3816 break; 3933 break;
3817 case XTerm_restoreBG: 3934 case Rxvt_restoreBG:
3818 set_window_color (Color_bg, str); 3935 set_window_color (Color_bg, str);
3819 break; 3936 break;
3820 3937
3821 case XTerm_logfile: 3938 case XTerm_logfile:
3822 // TODO, when secure mode? 3939 // TODO, when secure mode?
3823 break; 3940 break;
3824 3941
3942#if 0
3943 case Rxvt_dumpscreen: /* no error notices */
3944 {
3945 int fd;
3946 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3947 {
3948 scr_dump (fd);
3949 close (fd);
3950 }
3951 }
3952 break;
3953#endif
3825 case XTerm_font: 3954 case XTerm_font:
3826 op = URxvt_font; 3955 op = URxvt_font;
3827 case URxvt_font: 3956 case URxvt_font:
3828#if ENABLE_STYLES 3957#if ENABLE_STYLES
3829 case URxvt_boldFont: 3958 case URxvt_boldFont:
3830 case URxvt_italicFont: 3959 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3960 case URxvt_boldItalicFont:
3832#endif 3961#endif
3833 if (query) 3962 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3963 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3965 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3966 resp);
3838 else 3967 else
3839 { 3968 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3969 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3970
… …
3843 allocated.push_back ((void *)res); 3972 allocated.push_back ((void *)res);
3844 set_fonts (); 3973 set_fonts ();
3845 } 3974 }
3846 break; 3975 break;
3847 3976
3848#if ENABLE_FRILLS 3977 case URxvt_version:
3849 case XTerm_locale:
3850 if (query) 3978 if (query)
3979 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3980 op,
3981 rs[Rs_name], VERSION[0], VERSION[2],
3982 resp);
3983 break;
3984
3985#if !ENABLE_MINIMAL
3986 case URxvt_locale:
3987 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3988 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3852 else 3989 else
3853 { 3990 {
3854 set_locale (str); 3991 set_locale (str);
3855# ifdef USE_XIM 3992 pty->set_utf8_mode (enc_utf8);
3856 im_cb (); 3993 init_xlocale ();
3857# endif
3858 } 3994 }
3859 break; 3995 break;
3860#endif
3861 3996
3862#ifdef MENUBAR 3997 case URxvt_view_up:
3863 case XTerm_Menu: 3998 case URxvt_view_down:
3864 if (options & Opt_insecure) 3999 {
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4000 int lines = atoi (str);
4001
4002 if (lines)
4003 scr_page (op == URxvt_view_up ? UP : DN, lines);
4004 else
4005 scr_erase_savelines ();
4006 }
4007
3866 break; 4008 break;
3867#endif 4009#endif
3868#if 0 4010
3869 case XTerm_dumpscreen: /* no error notices */ 4011#if ENABLE_PERL
3870 { 4012 case URxvt_perl:
3871 int fd; 4013 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4014 ; // no responses yet
3873 {
3874 scr_dump (fd);
3875 close (fd);
3876 }
3877 }
3878 break; 4015 break;
3879#endif 4016#endif
3880 } 4017 }
3881} 4018}
3882/*----------------------------------------------------------------------*/ 4019/*----------------------------------------------------------------------*/
… …
3913 return state; 4050 return state;
3914} 4051}
3915 4052
3916/* we're not using priv _yet_ */ 4053/* we're not using priv _yet_ */
3917void 4054void
3918rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4055rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3919{ 4056{
3920 unsigned int i, j; 4057 unsigned int i, j;
3921 int state; 4058 int state;
3922 4059
3923 static const struct 4060 static const struct
… …
3934 { 5, PrivMode_rVideo }, 4071 { 5, PrivMode_rVideo },
3935 { 6, PrivMode_relOrigin }, 4072 { 6, PrivMode_relOrigin },
3936 { 7, PrivMode_Autowrap }, 4073 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode 4074 // 8, bi-directional support mode
3938 { 9, PrivMode_MouseX10 }, 4075 { 9, PrivMode_MouseX10 },
3939#ifdef menuBar_esc
3940 { menuBar_esc, PrivMode_menuBar },
3941#endif
3942 // 18, 19 printing-related 4076 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor }, 4077 { 25, PrivMode_VisibleCursor },
3944#ifdef scrollBar_esc 4078#ifdef scrollBar_esc
3945 { scrollBar_esc, PrivMode_scrollBar }, 4079 { scrollBar_esc, PrivMode_scrollBar },
3946#endif 4080#endif
… …
3991 } 4125 }
3992 4126
3993 /* extra handling for values with state unkept */ 4127 /* extra handling for values with state unkept */
3994 switch (arg[i]) 4128 switch (arg[i])
3995 { 4129 {
4130#if ENABLE_STYLES
4131 case 1021:
4132 set_option (Opt_intensityStyles, mode);
4133
4134 scr_touch (true);
4135 break;
4136#endif
3996 case 1048: /* alternative cursor save */ 4137 case 1048: /* alternative cursor save */
3997 case 1049: 4138 case 1049:
3998 if (options & Opt_secondaryScreen) 4139 if (OPTION (Opt_secondaryScreen))
3999 if (mode == 0) 4140 if (mode == 0)
4000 scr_cursor (RESTORE); 4141 scr_cursor (RESTORE);
4001 else if (mode == 1) 4142 else if (mode == 1)
4002 scr_cursor (SAVE); 4143 scr_cursor (SAVE);
4003 break; 4144 break;
… …
4015 */ 4156 */
4016 PrivMode (1, PrivMode_vt52); 4157 PrivMode (1, PrivMode_vt52);
4017 break; 4158 break;
4018 case 3: /* 80/132 */ 4159 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 4160 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4161 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 4162 break;
4022 case 4: /* smooth scrolling */ 4163 case 4: /* smooth scrolling */
4023 if (state)
4024 options &= ~Opt_jumpScroll;
4025 else
4026 options |= Opt_jumpScroll; 4164 set_option (Opt_jumpScroll, !state);
4027 break; 4165 break;
4028 case 5: /* reverse video */ 4166 case 5: /* reverse video */
4029 scr_rvideo_mode (state); 4167 scr_rvideo_mode (state);
4030 break; 4168 break;
4031 case 6: /* relative/absolute origins */ 4169 case 6: /* relative/absolute origins */
… …
4037 /* case 8: - auto repeat, can't do on a per window basis */ 4175 /* case 8: - auto repeat, can't do on a per window basis */
4038 case 9: /* X10 mouse reporting */ 4176 case 9: /* X10 mouse reporting */
4039 if (state) /* orthogonal */ 4177 if (state) /* orthogonal */
4040 priv_modes &= ~PrivMode_MouseX11; 4178 priv_modes &= ~PrivMode_MouseX11;
4041 break; 4179 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 4180#ifdef scrollBar_esc
4050 case scrollBar_esc: 4181 case scrollBar_esc:
4051 if (scrollbar_mapping (state)) 4182 if (scrollbar_mapping (state))
4052 { 4183 {
4053 resize_all_windows (0, 0, 0); 4184 resize_all_windows (0, 0, 0);
… …
4072#if 0 4203#if 0
4073 case 1001: 4204 case 1001:
4074 break; /* X11 mouse highlighting */ 4205 break; /* X11 mouse highlighting */
4075#endif 4206#endif
4076 case 1010: /* scroll to bottom on TTY output inhibit */ 4207 case 1010: /* scroll to bottom on TTY output inhibit */
4077 if (state)
4078 options &= ~Opt_scrollTtyOutput;
4079 else
4080 options |= Opt_scrollTtyOutput; 4208 set_option (Opt_scrollTtyOutput, !state);
4081 break; 4209 break;
4082 case 1011: /* scroll to bottom on key press */ 4210 case 1011: /* scroll to bottom on key press */
4083 if (state)
4084 options |= Opt_scrollTtyKeypress; 4211 set_option (Opt_scrollTtyKeypress, state);
4085 else
4086 options &= ~Opt_scrollTtyKeypress;
4087 break; 4212 break;
4088 case 1047: /* secondary screen w/ clearing last */ 4213 case 1047: /* secondary screen w/ clearing last */
4089 if (options & Opt_secondaryScreen) 4214 if (OPTION (Opt_secondaryScreen))
4090 if (current_screen != PRIMARY) 4215 if (current_screen != PRIMARY)
4091 scr_erase_screen (2); 4216 scr_erase_screen (2);
4092 scr_change_screen (state); 4217 scr_change_screen (state);
4093 break; 4218 break;
4094 case 1049: /* secondary screen w/ clearing first */ 4219 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state); 4220 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen) 4221 if (OPTION (Opt_secondaryScreen))
4097 if (current_screen != PRIMARY) 4222 if (current_screen != PRIMARY)
4098 scr_erase_screen (2); 4223 scr_erase_screen (2);
4099 break; 4224 break;
4100 default: 4225 default:
4101 break; 4226 break;
… …
4229 scr_color (Color_bg, Color_bg); 4354 scr_color (Color_bg, Color_bg);
4230 break; 4355 break;
4231 4356
4232 //case 50: // not variable spacing 4357 //case 50: // not variable spacing
4233 4358
4234#ifndef NO_BRIGHTCOLOR 4359#if !ENABLE_MINIMAL
4235 case 90: 4360 case 90:
4236 case 91: /* set bright fg color */ 4361 case 91: /* set bright fg color */
4237 case 92: 4362 case 92:
4238 case 93: 4363 case 93:
4239 case 94: 4364 case 94:
… …
4251 case 106: 4376 case 106:
4252 case 107: 4377 case 107:
4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4378 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254 break; 4379 break;
4255#endif 4380#endif
4256
4257 } 4381 }
4258 } 4382 }
4259} 4383}
4260/*}}} */ 4384/*}}} */
4261 4385
… …
4285 */ 4409 */
4286void 4410void
4287rxvt_term::tt_printf (const char *fmt,...) 4411rxvt_term::tt_printf (const char *fmt,...)
4288{ 4412{
4289 va_list arg_ptr; 4413 va_list arg_ptr;
4290 unsigned char buf[256]; 4414 char buf[256];
4291 4415
4292 va_start (arg_ptr, fmt); 4416 va_start (arg_ptr, fmt);
4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4417 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4294 va_end (arg_ptr); 4418 va_end (arg_ptr);
4295 tt_write (buf, strlen (buf)); 4419 tt_write (buf, strlen (buf));
… …
4300 * or generated by us in response to a query ESC sequence. 4424 * or generated by us in response to a query ESC sequence.
4301 */ 4425 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4426const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303 4427
4304void 4428void
4305rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4429rxvt_term::tt_write (const char *data, unsigned int len)
4306{ 4430{
4431 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4432 return;
4433
4434 if (pty->pty < 0)
4435 return;
4436
4307 if (v_buflen == 0) 4437 if (v_buflen == 0)
4308 { 4438 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4439 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4310 4440
4311 if ((unsigned int)written == len) 4441 if ((unsigned int)written == len)
4312 return; 4442 return;
4313 4443
4314 data += written; 4444 data += written;
4315 len -= written; 4445 len -= written;
4316 } 4446 }
4317 4447
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4448 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4319 4449
4320 memcpy (v_buffer + v_buflen, data, len); 4450 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len; 4451 v_buflen += len;
4322 4452
4323 pty_ev.set (EVENT_READ | EVENT_WRITE); 4453 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324} 4454}
4325 4455
4326void rxvt_term::pty_write () 4456void rxvt_term::pty_write ()
4327{ 4457{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4458 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329 4459
4330 if (written > 0) 4460 if (written > 0)
4331 { 4461 {
4332 v_buflen -= written; 4462 v_buflen -= written;
4333 4463
… …
4342 } 4472 }
4343 4473
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4474 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4475 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4476 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4477 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4478}
4350 4479
4351/*----------------------- end-of-file (C source) -----------------------*/ 4480/*----------------------- end-of-file (C source) -----------------------*/
4352 4481

Diff Legend

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