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.311 by root, Sat Mar 4 20:14:35 2006 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 focus_in ();
1464 break;
1465
1466 case FocusOut:
1467 focus_out ();
1468 break;
1469
1470 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0])
1395 { 1472 {
1396 TermWin.focus = 1; 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 { 1474 ;
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 1475
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) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1477 {
1466 seen_resize = 1; 1478 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1480 }
1469 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471 if (options & Opt_transparent) 1485 if (OPTION (Opt_transparent))
1472 check_our_parents (); 1486 check_our_parents ();
1473#endif 1487#endif
1474 } 1488 }
1475 break; 1489 break;
1476 1490
1477 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481 1496
1482 break; 1497 break;
1483 1498
1484 case SelectionClear: 1499 case SelectionClear:
1485 selection_clear (); 1500 selection_clear ();
… …
1492 1507
1493 case SelectionRequest: 1508 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1495 break; 1510 break;
1496 1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break;
1519
1497 case UnmapNotify: 1520 case UnmapNotify:
1498 TermWin.mapped = 0; 1521 mapped = 0;
1499#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1501#endif 1524#endif
1502 break; 1525 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; 1526 break;
1510 1527
1511#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1512 case ReparentNotify: 1529 case ReparentNotify:
1513 rootwin_cb (ev); 1530 rootwin_cb (ev);
1514 break; 1531 break;
1515#endif /* TRANSPARENT */ 1532#endif /* TRANSPARENT */
1516 1533
1517 case GraphicsExpose: 1534 case GraphicsExpose:
1518 case Expose: 1535 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1536 if (ev.xany.window == vt)
1520 { 1537 {
1521 do 1538 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1542
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1544
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1531 1548
1532 scr_refresh (refresh_type); 1549 want_refresh = 1;
1533 } 1550 }
1534 else 1551 else
1535 { 1552 {
1536 XEvent unused_event; 1553 XEvent unused_event;
1537 1554
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1539 ; 1556 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1558 ;
1542 1559
1543 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1544 { 1561 {
1545 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1546 scrollbar_show (0); 1563 scrollbar_show (0);
1547 } 1564 }
1548#ifdef MENUBAR
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose ();
1551#endif
1552 1565
1553#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1556#endif 1569#endif
1557 } 1570 }
1558 break; 1571 break;
1559 1572
1560 case MotionNotify: 1573 case MotionNotify:
1561#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1562 if (hidden_pointer) 1575 if (hidden_pointer)
1563 pointer_unblank (); 1576 pointer_unblank ();
1564#endif 1577#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) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1579 break;
1574 1580
1575 if (ev.xany.window == TermWin.vt) 1581 if (ev.xany.window == vt)
1576 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1587 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1580 ; 1589 ;
1581 1590
1582 XQueryPointer (display->display, TermWin.vt, 1591 XQueryPointer (dpy, vt,
1583 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1595 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1599#endif 1608#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1609 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1610 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1611
1603#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1613 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1614 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1615 {
1607 int dist; 1616 int dist;
1608 1617
1609 /* don't clobber the current delay if we are 1618 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1619 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1627 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1628 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1629 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1630
1622 /* calc number of lines to scroll */ 1631 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1632 if (ev.xbutton.y < int_bwidth)
1624 { 1633 {
1625 scroll_selection_dir = UP; 1634 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1635 dist = int_bwidth - ev.xbutton.y;
1627 } 1636 }
1628 else 1637 else
1629 { 1638 {
1630 scroll_selection_dir = DN; 1639 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1640 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1641 }
1633 1642
1634 scroll_selection_lines = Pixel2Height (dist) 1643 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1645 + 1;
1637 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1639 } 1648 }
1640 else 1649 else
1641 { 1650 {
1642 /* we are within the text window, so we 1651 /* we are within the text window, so we
… …
1651#endif 1660#endif
1652 } 1661 }
1653 } 1662 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1664 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1657 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1658 ; 1667 ;
1659 1668
1660 XQueryPointer (display->display, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1661 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1673 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1666 scrollbar_size ()); 1675 scrollbar_size ());
1667 scr_refresh (refresh_type); 1676 want_refresh = 1;
1668 refresh_limit = 0; 1677 refresh_limit = 0;
1669 scrollbar_show (1); 1678 scrollbar_show (1);
1670 } 1679 }
1671 break; 1680 break;
1672 } 1681 }
1682
1683#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1685 {
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif
1695
1696#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 {
1699 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease)
1702 if (hidden_pointer)
1703 pointer_unblank ();
1704
1705 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank ();
1707 }
1708#endif
1709}
1710
1711void
1712rxvt_term::focus_in ()
1713{
1714 if (!focus)
1715 {
1716 focus = 1;
1717 want_refresh = 1;
1718
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM
1722 if (Input_Context != NULL)
1723 {
1724 IMSetPosition ();
1725 XSetICFocus (Input_Context);
1726 }
1727#endif
1728#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif
1732#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade])
1734 {
1735 pix_colors = pix_colors_focused;
1736 scr_recolour ();
1737 }
1738#endif
1739 }
1740}
1741
1742void
1743rxvt_term::focus_out ()
1744{
1745 if (focus)
1746 {
1747 focus = 0;
1748 want_refresh = 1;
1749
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1751
1752#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf)
1754 {
1755 iso14755buf = 0;
1756# if ENABLE_OVERLAY
1757 scr_overlay_off ();
1758# endif
1759 }
1760#endif
1761#if USE_XIM
1762 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context);
1764#endif
1765#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink))
1767 cursor_blink_ev.stop ();
1768 hidden_cursor = 0;
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_unfocused;
1774 scr_recolour ();
1775 }
1776#endif
1777 }
1673} 1778}
1674 1779
1675#if TRANSPARENT 1780#if TRANSPARENT
1676void 1781void
1677rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1783{
1679 SET_R (this); 1784 make_current ();
1680 SET_LOCALE (locale);
1681 1785
1682 switch (ev.type) 1786 switch (ev.type)
1683 { 1787 {
1684 case PropertyNotify: 1788 case PropertyNotify:
1685 /* 1789 /*
… …
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691 return; 1795 return;
1692 1796
1693 /* FALLTHROUGH */ 1797 /* FALLTHROUGH */
1694 case ReparentNotify: 1798 case ReparentNotify:
1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696 want_refresh = want_full_refresh = 1; 1800 want_refresh = want_full_refresh = 1;
1697 break; 1801 break;
1698 } 1802 }
1699} 1803}
1700#endif 1804#endif
… …
1703rxvt_term::button_press (XButtonEvent &ev) 1807rxvt_term::button_press (XButtonEvent &ev)
1704{ 1808{
1705 int reportmode = 0, clickintime; 1809 int reportmode = 0, clickintime;
1706 1810
1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1811 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1812
1708 if (!bypass_keystate) 1813 if (!bypass_keystate)
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1814 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1815
1711 /* 1816 /*
1712 * VT window processing of button press 1817 * VT window processing of button press
1713 */ 1818 */
1714 if (ev.window == TermWin.vt) 1819 if (ev.window == vt)
1715 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1716#if ISO_14755 1824#if ISO_14755
1717 // 5.4 1825 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1827 {
1720 iso14755_54 (ev.x, ev.y); 1828 iso14755_54 (ev.x, ev.y);
… …
1732#ifdef MOUSE_REPORT_DOUBLECLICK 1840#ifdef MOUSE_REPORT_DOUBLECLICK
1733 if (ev.button == MEvent.button && clickintime) 1841 if (ev.button == MEvent.button && clickintime)
1734 { 1842 {
1735 /* same button, within alloted time */ 1843 /* same button, within alloted time */
1736 MEvent.clicks++; 1844 MEvent.clicks++;
1845
1737 if (MEvent.clicks > 1) 1846 if (MEvent.clicks > 1)
1738 { 1847 {
1739 /* only report double clicks */ 1848 /* only report double clicks */
1740 MEvent.clicks = 2; 1849 MEvent.clicks = 2;
1741 mouse_report (ev); 1850 mouse_report (ev);
… …
1767 { 1876 {
1768 case Button1: 1877 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1878 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1879 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1880#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1881 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1882#else
1774 selection.rect = false; 1883 selection.rect = false;
1775#endif 1884#endif
1776 1885
1777 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1779 { 1888 {
1780 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1781 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1782 else 1891 else
1783 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
1924 case Button3: 2033 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1926 { 2035 {
1927 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1930# else 2039# else
1931 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1932# endif 2041# endif
1933 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1936# else 2045# else
1937 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1938# endif 2047# endif
1939 else 2048 else
1940 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1941 } 2050 }
1942 else 2051 else
1943 { 2052 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 2054 (nrow
1946 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 2056 / scrollbar_size ()));
1948 } 2057 }
1949 2058
1950 break; 2059 break;
1951 } 2060 }
1952 } 2061 }
2062
1953 return; 2063 return;
1954 } 2064 }
1955#if MENUBAR
1956 /*
1957 * Menubar window processing of button press
1958 */
1959 if (isMenuBarWindow (ev.window))
1960 menubar_control (ev);
1961#endif
1962} 2065}
1963 2066
1964void 2067void
1965rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1966{ 2069{
… …
1972 2075
1973 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
1974 { 2077 {
1975 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
1976 scrollbar_show (0); 2079 scrollbar_show (0);
1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1978 refresh_type &= ~SMOOTH_REFRESH;
1979#endif
1980 } 2080 }
1981 2081
1982#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
1985#endif 2085#endif
1986 2086
1987 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
1988 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
1989#if ISO_14755 2092#if ISO_14755
1990 // 5.4 2093 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2095 return;
1993#endif 2096#endif
2097
1994 if (reportmode) 2098 if (reportmode)
1995 { 2099 {
1996 /* mouse report from vt window */ 2100 /* mouse report from vt window */
1997 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
1998 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2028 { 2132 {
2029 case Button1: 2133 case Button1:
2030 case Button3: 2134 case Button3:
2031 selection_make (ev.time); 2135 selection_make (ev.time);
2032 break; 2136 break;
2137
2033 case Button2: 2138 case Button2:
2034 selection_request (ev.time, ev.x, ev.y); 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2035 break; 2141 break;
2142
2036#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2037 case Button4: 2144 case Button4:
2038 case Button5: 2145 case Button5:
2039 { 2146 {
2040 int i; 2147 int i;
… …
2042 2149
2043 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2044 2151
2045 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
2046 i = 1; 2153 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2154 else if (OPTION (Opt_mouseWheelScrollPage))
2048 i = TermWin.nrow - 1; 2155 i = nrow - 1;
2049 else 2156 else
2050 i = 5; 2157 i = 5;
2051 2158
2052# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2160 if (ev.state & ControlMask)
2054 { 2161 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2162 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2163 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; 2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058 2165
2059 if (slip_wheel_ev.at < NOW) 2166 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2168
2062 slip_wheel_ev.start (); 2169 slip_wheel_ev.start ();
2063 } 2170 }
2064 else 2171 else
2065 { 2172 {
2066# endif 2173# endif
2067# ifdef JUMP_MOUSE_WHEEL
2068 scr_page (v, i); 2174 scr_page (v, i);
2069 scr_refresh (SMOOTH_REFRESH);
2070 scrollbar_show (1); 2175 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 2176# ifdef MOUSE_SLIP_WHEELING
2080 } 2177 }
2081#endif 2178# endif
2082 } 2179 }
2083 break; 2180 break;
2084#endif 2181#endif
2085 } 2182 }
2086 } 2183 }
2087#ifdef MENUBAR
2088 else if (isMenuBarWindow (ev.window))
2089 menubar_control (ev);
2090#endif
2091} 2184}
2092 2185
2093#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
2094#if TINTING 2187#if TINTING
2095/* taken from aterm-0.4.2 */ 2188/* taken from aterm-0.4.2 */
2096 2189
2097typedef uint32_t RUINT32T; 2190typedef uint32_t RUINT32T;
2098 2191
2099void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2100{ 2193{
2101 int sh_r, sh_g, sh_b; 2194 int sh_r, sh_g, sh_b;
2102 RUINT32T mask_r, mask_g, mask_b; 2195 RUINT32T mask_r, mask_g, mask_b;
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2199 int i;
2107 2200
2108 Visual* visual = display->visual; 2201 Visual *visual = term->visual;
2109 2202
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2204
2112 /* for convenience */ 2205 /* for convenience */
2113 mask_r = visual->red_mask; 2206 mask_r = visual->red_mask;
… …
2337 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
2339 2432
2340 pchanged = 0; 2433 pchanged = 0;
2341 2434
2342 if (!(options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2344 2437
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2347 2440
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2349 2442
2350 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2351 { 2444 {
2352 if (am_transparent) 2445 if (am_transparent)
2353 { 2446 {
2354 pchanged = 1; 2447 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2357 } 2450 }
2358 2451
2359 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2360 } 2453 }
2361 2454
2362 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False); 2456 XSync (dpy, False);
2364 2457
2365 /* 2458 /*
2366 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2369 */ 2462 */
2370 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2374 2467
2375 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2380 2473
2381 if (!i || prop == NULL 2474 if (!i || prop == NULL
2382#if TINTING 2475#if TINTING
2383 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2384#endif 2477#endif
2385 ) 2478 )
2386 have_pixmap = 0; 2479 have_pixmap = 0;
2387 else 2480 else
2388 { 2481 {
… …
2401 Window cr; 2494 Window cr;
2402 XImage *image; 2495 XImage *image;
2403 GC gc; 2496 GC gc;
2404 XGCValues gcvalue; 2497 XGCValues gcvalue;
2405 2498
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2503 nx = ny = 0;
2411 2504
… …
2421 nh += sy; 2514 nh += sy;
2422 ny = -sy; 2515 ny = -sy;
2423 sy = 0; 2516 sy = 0;
2424 } 2517 }
2425 2518
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2428 2521
2429 XSync (display->display, False); 2522 XSync (dpy, False);
2430 allowedxerror = -1; 2523 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2525
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2528 allowedxerror = 0;
2436 2529
2437 if (image == NULL) 2530 if (image == NULL)
2438 { 2531 {
2439 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2440 { 2533 {
2441 pchanged = 1; 2534 pchanged = 1;
2442 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2443 { 2536 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (dpy, pixmap);
2445 TermWin.pixmap = None; 2538 pixmap = None;
2446 } 2539 }
2447 } 2540 }
2448 2541
2449 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2450 } 2543 }
2451 else 2544 else
2452 { 2545 {
2453 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (dpy, pixmap);
2455 2548
2456#if TINTING 2549#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2551 {
2459 unsigned short rm, gm, bm;
2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2461 2553
2554 rgba c;
2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2463 2556
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2465 } 2558 }
2466#endif 2559#endif
2467 2560
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2561 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); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2565 XFreeGC (dpy, gc);
2474 XDestroyImage (image); 2566 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2568 XClearWindow (dpy, parent[0]);
2477 2569
2478 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2571 pchanged = 1;
2480 2572
2481 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2482 } 2574 }
2483 } 2575 }
2484 2576
2485 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2487 else 2579 else
2488 { 2580 {
2489 unsigned int n; 2581 unsigned int n;
2490 /* 2582 /*
2491 * InheritPixmap transparency 2583 * InheritPixmap transparency
2492 */ 2584 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494 { 2586 {
2495 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2497 &TermWin.parent[i], &list, &n);
2498 XFree (list); 2589 XFree (list);
2499 2590
2500 if (TermWin.parent[i] == display->root) 2591 if (parent[i] == display->root)
2501 { 2592 {
2502 if (oldp != None) 2593 if (oldp != None)
2503 pchanged = 1; 2594 pchanged = 1;
2504 2595
2505 break; 2596 break;
2506 } 2597 }
2507 2598
2508 if (oldp != TermWin.parent[i]) 2599 if (oldp != parent[i])
2509 pchanged = 1; 2600 pchanged = 1;
2510 } 2601 }
2511 2602
2512 n = 0; 2603 n = 0;
2513 2604
2514 if (pchanged) 2605 if (pchanged)
2515 {
2516 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2517 { 2607 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2611 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522 break; 2613 break;
2523 } 2614 }
2524 } 2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2525 } 2618 {
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]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2621 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2533 } 2623 }
2534 else 2624 else
2535 { 2625 {
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++) 2626 for (n = 0; n < (unsigned int)i; n++)
2542 { 2627 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2629 XClearWindow (dpy, parent[n]);
2545 } 2630 }
2546 2631
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2548 am_transparent = 1; 2633 am_transparent = 1;
2549 } 2634 }
2550 2635
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2637 parent[i] = None;
2553 } 2638 }
2554 2639
2555 if (scrollBar.win) 2640 if (scrollBar.win)
2556 { 2641 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2559 scrollbar_show (0); 2644 scrollbar_show (0);
2560 } 2645 }
2561 2646
2562 if (am_transparent) 2647 if (am_transparent)
… …
2574 2659
2575bool 2660bool
2576rxvt_term::cmd_parse () 2661rxvt_term::cmd_parse ()
2577{ 2662{
2578 bool flag = false; 2663 bool flag = false;
2579 unicode_t ch = NOCHAR; 2664 wchar_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here 2665 char *seq_begin; // remember start of esc-sequence here
2581 2666
2582 for (;;) 2667 for (;;)
2583 { 2668 {
2584 if (ch == NOCHAR) 2669 if (ch == NOCHAR)
2585 { 2670 {
2586 seq_begin = cmdbuf_ptr; 2671 seq_begin = cmdbuf_ptr;
2587 ch = next_char (); 2672 ch = next_char ();
2588 }
2589 2673
2590 if (ch == NOCHAR) // TODO: improve 2674 if (ch == NOCHAR)
2591 break; 2675 break;
2676 }
2592 2677
2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 { 2679 {
2595 if (!seen_input) 2680 if (!seen_input)
2596 { 2681 {
… …
2600 // some window managers resize the window early, and these programs 2685 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2686 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2687 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2688 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2689 // resized.
2605 if (seen_resize) 2690 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2691 kill (-cmd_pid, SIGWINCH);
2607 } 2692 }
2608 2693
2609 /* Read a text string from the input buffer */ 2694 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2695 wchar_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2696 bool refreshnow = false;
2612 int nlines = 0; 2697 int nlines = 0;
2613 unicode_t *str = buf; 2698 wchar_t *str = buf;
2699 wchar_t *eol = str + min (ncol, UBUFSIZ);
2614 2700
2615 for (;;) 2701 for (;;)
2616 { 2702 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2704 break;
2619 2705
2620 *str++ = ch; 2706 *str++ = ch;
2621 2707
2622 if (ch == C0_LF) 2708 if (ch == C0_LF || str >= eol)
2623 { 2709 {
2710 if (ch == C0_LF)
2624 nlines++; 2711 nlines++;
2712
2625 refresh_count++; 2713 refresh_count++;
2626 2714
2627 if (!(options & Opt_jumpScroll) 2715 if (!OPTION (Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2629 { 2717 {
2630 refreshnow = true; 2718 refreshnow = true;
2719 refresh_count = 0;
2631 ch = NOCHAR; 2720 ch = NOCHAR;
2632 break; 2721 break;
2633 } 2722 }
2634 2723
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2724 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2725 if (nlines >= nrow - 1)
2637 { 2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2729 scr_add_lines (buf, str - buf, nlines);
2730
2639 nlines = 0; 2731 nlines = 0;
2640 str = buf; 2732 str = buf;
2733 eol = str + min (ncol, UBUFSIZ);
2641 } 2734 }
2642 }
2643 2735
2644 if (str >= buf + UBUFSIZ) 2736 if (str >= eol)
2645 { 2737 {
2738 if (eol >= buf + UBUFSIZ)
2739 {
2646 ch = NOCHAR; 2740 ch = NOCHAR;
2647 break; 2741 break;
2742 }
2743 else
2744 eol = min (eol + ncol, buf + UBUFSIZ);
2745 }
2746
2648 } 2747 }
2649 2748
2650 seq_begin = cmdbuf_ptr; 2749 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2750 ch = next_char ();
2652 } 2751 }
2653 2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2654 scr_add_lines (buf, nlines, str - buf); 2755 scr_add_lines (buf, str - buf, nlines);
2655 2756
2656 /* 2757 /*
2657 * If there have been a lot of new lines, then update the screen 2758 * 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. 2759 * 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 2760 * the number of pages between refreshes is refresh_limit, which
2660 * is incremented here because we must be doing flat-out scrolling. 2761 * is incremented here because we must be doing flat-out scrolling.
2661 */ 2762 */
2662 if (refreshnow) 2763 if (refreshnow)
2663 { 2764 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++; 2766 refresh_limit++;
2666 else 2767 else
2667 { 2768 {
2668 flag = true; 2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2669 scr_refresh (refresh_type); 2771 scr_refresh ();
2772 want_refresh = 1;
2670 } 2773 }
2671 } 2774 }
2672 2775
2673 } 2776 }
2674 else 2777 else
… …
2689 } 2792 }
2690 2793
2691 return flag; 2794 return flag;
2692} 2795}
2693 2796
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 2797// read the next character
2704unicode_t 2798wchar_t
2705rxvt_term::next_char () 2799rxvt_term::next_char () NOTHROW
2706{ 2800{
2707 while (cmdbuf_ptr < cmdbuf_endp) 2801 while (cmdbuf_ptr < cmdbuf_endp)
2708 { 2802 {
2709 // assume 7-bit to be ascii ALWAYS 2803 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++; 2805 return *cmdbuf_ptr++;
2712 2806
2713 wchar_t wc; 2807 wchar_t wc;
2714 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2808 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2715 2809
2716 if (len == (size_t)-2) 2810 if (len == (size_t)-2)
2717 { 2811 {
2718 // the mbstate stores incomplete sequences. didn't know this :/ 2812 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp; 2813 cmdbuf_ptr = cmdbuf_endp;
2720 break; 2814 break;
2721 } 2815 }
2722 2816
2723 if (len == (size_t)-1) 2817 if (len == (size_t)-1)
2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2818 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2725 2819
2726 // assume wchar == unicode 2820 // assume wchar == unicode
2727 cmdbuf_ptr += len; 2821 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK; 2822 return wc & UNICODE_MASK;
2729 } 2823 }
2730 2824
2731 return NOCHAR; 2825 return NOCHAR;
2732} 2826}
2827
2828// read the next octet
2829uint32_t
2830rxvt_term::next_octet () NOTHROW
2831{
2832 return cmdbuf_ptr < cmdbuf_endp
2833 ? (unsigned char)*cmdbuf_ptr++
2834 : NOCHAR;
2835}
2836
2837static class out_of_input out_of_input;
2733 2838
2734/* rxvt_cmd_getc () - Return next input character */ 2839/* rxvt_cmd_getc () - Return next input character */
2735/* 2840/*
2736 * Return the next input character after first passing any keyboard input 2841 * Return the next input character after first passing any keyboard input
2737 * to the command. 2842 * to the command.
2738 */ 2843 */
2739unicode_t 2844wchar_t
2740rxvt_term::cmd_getc () 2845rxvt_term::cmd_getc () THROW ((class out_of_input))
2741{ 2846{
2742 unicode_t c = next_char (); 2847 wchar_t c = next_char ();
2743 2848
2744 if (c == NOCHAR) 2849 if (c == NOCHAR)
2745 throw out_of_input; 2850 throw out_of_input;
2746 2851
2747 return c; 2852 return c;
2748} 2853}
2749 2854
2750unicode_t 2855uint32_t
2751rxvt_term::cmd_get8 () 2856rxvt_term::cmd_get8 () THROW ((class out_of_input))
2752{ 2857{
2753 unicode_t c = next_octet (); 2858 uint32_t c = next_octet ();
2754 2859
2755 if (c == NOCHAR) 2860 if (c == NOCHAR)
2756 throw out_of_input; 2861 throw out_of_input;
2757 2862
2758 return c; 2863 return c;
… …
2858 case C0_ESC: 2963 case C0_ESC:
2859 process_escape_seq (); 2964 process_escape_seq ();
2860 break; 2965 break;
2861 case C0_ENQ: /* terminal Status */ 2966 case C0_ENQ: /* terminal Status */
2862 if (rs[Rs_answerbackstring]) 2967 if (rs[Rs_answerbackstring])
2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2968 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2865 else 2969 else
2866 tt_write ((unsigned char *)VT100_ANS, 2970 tt_write (VT100_ANS, strlen (VT100_ANS));
2867 (unsigned int)strlen (VT100_ANS));
2868 break; 2971 break;
2869 case C0_BEL: /* bell */ 2972 case C0_BEL: /* bell */
2870 scr_bell (); 2973 scr_bell ();
2871 break; 2974 break;
2872 case C0_BS: /* backspace */ 2975 case C0_BS: /* backspace */
… …
2996 scr_charset_set (2, (unsigned int)cmd_getc ()); 3099 scr_charset_set (2, (unsigned int)cmd_getc ());
2997 break; 3100 break;
2998 case '+': 3101 case '+':
2999 scr_charset_set (3, (unsigned int)cmd_getc ()); 3102 scr_charset_set (3, (unsigned int)cmd_getc ());
3000 break; 3103 break;
3001#if ENABLE_FRILLS 3104#if !ENABLE_MINIMAL
3002 case '6': 3105 case '6':
3003 scr_backindex (); 3106 scr_backindex ();
3004 break; 3107 break;
3005#endif 3108#endif
3006 case '7': 3109 case '7':
3007 scr_cursor (SAVE); 3110 scr_cursor (SAVE);
3008 break; 3111 break;
3009 case '8': 3112 case '8':
3010 scr_cursor (RESTORE); 3113 scr_cursor (RESTORE);
3011 break; 3114 break;
3012#if ENABLE_FRILLS 3115#if !ENABLE_MINIMAL
3013 case '9': 3116 case '9':
3014 scr_forwardindex (); 3117 scr_forwardindex ();
3015 break; 3118 break;
3016#endif 3119#endif
3017 case '=': 3120 case '=':
… …
3027 break; 3130 break;
3028 3131
3029 /* 8.3.87: NEXT LINE */ 3132 /* 8.3.87: NEXT LINE */
3030 case C1_NEL: /* ESC E */ 3133 case C1_NEL: /* ESC E */
3031 { 3134 {
3032 unicode_t nlcr[] = { C0_LF, C0_CR }; 3135 wchar_t nlcr[] = { C0_LF, C0_CR };
3033 scr_add_lines (nlcr, 1, 2); 3136 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3034 } 3137 }
3035 break; 3138 break;
3036 3139
3037 /* kidnapped escape sequence: Should be 8.3.48 */ 3140 /* kidnapped escape sequence: Should be 8.3.48 */
3038 case C1_ESA: /* ESC G */ 3141 case C1_ESA: /* ESC G */
… …
3060 process_dcs_seq (); 3163 process_dcs_seq ();
3061 break; 3164 break;
3062 3165
3063 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3166 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3064 case C1_SCI: /* ESC Z */ 3167 case C1_SCI: /* ESC Z */
3065 tt_write ((const unsigned char *)ESCZ_ANSWER, 3168 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3066 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3067 break; /* steal obsolete ESC [ c */ 3169 break; /* steal obsolete ESC [ c */
3068 3170
3069 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3171 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3070 case C1_CSI: /* ESC [ */ 3172 case C1_CSI: /* ESC [ */
3071 process_csi_seq (); 3173 process_csi_seq ();
… …
3180 ndef = get_byte_array_bit (csi_defaults, i); 3282 ndef = get_byte_array_bit (csi_defaults, i);
3181 for (p = 0; p < nargs; p++) 3283 for (p = 0; p < nargs; p++)
3182 if (arg[p] == -1) 3284 if (arg[p] == -1)
3183 arg[p] = ndef; 3285 arg[p] = ndef;
3184 3286
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 /* 3287 /*
3193 * private mode handling 3288 * private mode handling
3194 */ 3289 */
3195 if (priv) 3290 if (priv)
3196 { 3291 {
3197 switch (priv) 3292 switch (priv)
3198 { 3293 {
3199 case '>': 3294 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 3295 if (ch == CSI_DA) /* secondary device attributes */
3296 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3302 // that we do not support xterm mouse reporting (should be 95 when we do).
3303 //
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3304 tt_printf ("\033[>%d;94;0c", 'U');
3305 }
3202 break; 3306 break;
3203 case '?': 3307 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3309 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3310 break;
… …
3311 3415
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 3421 break;
3318 3422
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3322 break; 3425 break;
3323 3426
3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3427 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3325 process_sgr_mode (nargs, arg); 3428 process_sgr_mode (nargs, arg);
3326 break; 3429 break;
… …
3333 break; 3436 break;
3334 case 6: /* CPR requested */ 3437 case 6: /* CPR requested */
3335 scr_report_position (); 3438 scr_report_position ();
3336 break; 3439 break;
3337 case 7: /* unofficial extension */ 3440 case 7: /* unofficial extension */
3338 if (options & Opt_insecure) 3441 if (OPTION (Opt_insecure))
3339 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3442 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340 break; 3443 break;
3341 case 8: /* unofficial extension */ 3444 case 8: /* unofficial extension */
3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343 break; 3446 break;
… …
3410 break; 3513 break;
3411 case CSI_75: 3514 case CSI_75:
3412 scr_cursor (RESTORE); 3515 scr_cursor (RESTORE);
3413 break; 3516 break;
3414 3517
3415#if ENABLE_FRILLS 3518#if !ENABLE_MINIMAL
3416 case CSI_74: 3519 case CSI_74:
3417 process_window_ops (arg, nargs); 3520 process_window_ops (arg, nargs);
3418 break; 3521 break;
3419#endif 3522#endif
3420 3523
… …
3427 break; 3530 break;
3428 } 3531 }
3429} 3532}
3430/*}}} */ 3533/*}}} */
3431 3534
3432#if ENABLE_FRILLS 3535#if !ENABLE_MINIMAL
3433/* ARGSUSED */ 3536/* ARGSUSED */
3434void 3537void
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3538rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3539{
3437 int x, y; 3540 int x, y;
3438 XWindowAttributes wattr; 3541 XWindowAttributes wattr;
3439 Window wdummy; 3542 Window wdummy;
3543
3544 dLocal (Display *, dpy);
3440 3545
3441 if (nargs == 0) 3546 if (nargs == 0)
3442 return; 3547 return;
3443 3548
3444 switch (args[0]) 3549 switch (args[0])
3445 { 3550 {
3446 /* 3551 /*
3447 * commands 3552 * commands
3448 */ 3553 */
3449 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3555 XMapWindow (dpy, parent[0]);
3451 break; 3556 break;
3452 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3558 XIconifyWindow (dpy, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3559 break;
3456 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (dpy, parent[0], args[1], args[2]);
3458 break; 3562 break;
3459 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3565 break;
3462 case 5: /* raise window */ 3566 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3567 XRaiseWindow (dpy, parent[0]);
3464 break; 3568 break;
3465 case 6: /* lower window */ 3569 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3570 XLowerWindow (dpy, parent[0]);
3467 break; 3571 break;
3468 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3469 scr_touch (true); 3573 scr_touch (true);
3470 break; 3574 break;
3471 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3474 break; 3578 break;
3475 3579
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3581 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3481 break; 3585 break;
3482
3483 3586
3484 /* 3587 /*
3485 * reports - some output format copied from XTerm 3588 * reports - some output format copied from XTerm
3486 */ 3589 */
3487 case 11: /* report window state */ 3590 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3592 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3593 break;
3491 case 13: /* report window position */ 3594 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (dpy, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3596 XTranslateCoordinates (dpy, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3597 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3598 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3599 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3600 break;
3498 case 14: /* report window size (pixels) */ 3601 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3602 XGetWindowAttributes (dpy, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3603 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3604 break;
3502 case 18: /* report text area size (chars) */ 3605 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3606 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3607 break;
3505 case 19: /* report window size (chars) */ 3608 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3609 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3610 break;
3508 case 20: /* report icon label */ 3611 case 20: /* report icon label */
3509 { 3612 {
3510 char *s; 3613 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3614 XGetIconName (dpy, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3616 XFree (s);
3514 } 3617 }
3515 break; 3618 break;
3516 case 21: /* report window title */ 3619 case 21: /* report window title */
3517 { 3620 {
3518 char *s; 3621 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3622 XFetchName (dpy, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3624 XFree (s);
3522 } 3625 }
3523 break; 3626 break;
3524 } 3627 }
3525} 3628}
… …
3528/*----------------------------------------------------------------------*/ 3631/*----------------------------------------------------------------------*/
3529/* 3632/*
3530 * get input up until STRING TERMINATOR (or BEL) 3633 * get input up until STRING TERMINATOR (or BEL)
3531 * ends_how is terminator used. returned input must be free()'d 3634 * ends_how is terminator used. returned input must be free()'d
3532 */ 3635 */
3533unsigned char * 3636char *
3534rxvt_term::get_to_st (unicode_t &ends_how) 3637rxvt_term::get_to_st (unicode_t &ends_how)
3535{ 3638{
3536 unicode_t ch; 3639 unicode_t ch;
3537 bool seen_esc = false; 3640 bool seen_esc = false;
3538 unsigned int n = 0; 3641 unsigned int n = 0;
… …
3557 else if (ch < 0x20) 3660 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3661 return NULL; /* other control character - exit */
3559 3662
3560 seen_esc = false; 3663 seen_esc = false;
3561 3664
3562 if (n >= sizeof (string) - 1) 3665 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3666 // stop at some sane length
3564 return NULL; 3667 return NULL;
3565 3668
3566 if (ch == C0_SYN) 3669 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 (); 3670 string[n++] = cmd_get8 ();
… …
3571 3674
3572 string[n++] = '\0'; 3675 string[n++] = '\0';
3573 3676
3574 ends_how = (ch == 0x5c ? C0_ESC : ch); 3677 ends_how = (ch == 0x5c ? C0_ESC : ch);
3575 3678
3576 return (unsigned char *)rxvt_wcstombs (string); 3679 return rxvt_wcstombs (string);
3577} 3680}
3578 3681
3579/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3580/* 3683/*
3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3684 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3582 */ 3685 */
3583void 3686void
3584rxvt_term::process_dcs_seq () 3687rxvt_term::process_dcs_seq ()
3585{ 3688{
3586 unsigned char *s; 3689 char *s;
3587 unicode_t eh; 3690 unicode_t eh;
3588 3691
3589 /* 3692 /*
3590 * Not handled yet 3693 * Not handled yet
3591 */ 3694 */
… …
3610 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3713 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3611 arg = arg * 10 + (ch - '0'); 3714 arg = arg * 10 + (ch - '0');
3612 3715
3613 if (ch == ';') 3716 if (ch == ';')
3614 { 3717 {
3615 unsigned char *s = get_to_st (eh); 3718 char *s = get_to_st (eh);
3616 3719
3617 if (s) 3720 if (s)
3618 { 3721 {
3619 process_xterm_seq (arg, (char *)s, eh); 3722 process_xterm_seq (arg, s, eh);
3620 free (s); 3723 free (s);
3621 } 3724 }
3622 } 3725 }
3623} 3726}
3624 3727
3625void 3728void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3729rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3627{ 3730{
3628 if (str[0] == '?' && !str[1]) 3731 if (str[0] == '?' && !str[1])
3629 { 3732 {
3630 unsigned short r, g, b; 3733 rgba c;
3631 pix_colors_focused[color].get (display, r, g, b); 3734 pix_colors_focused[color].get (c);
3735
3736#if XFT
3737 if (c.a != rgba::MAX_CC)
3738 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3739 else
3740#endif
3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3741 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3633 } 3742 }
3634 else 3743 else
3635 set_window_color (color, str); 3744 set_window_color (color, str);
3636} 3745}
3637 3746
3638/* 3747/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3748 * 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 */ 3749 */
3663void 3750void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3751rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3665{ 3752{
3666 int changed = 0;
3667 int color; 3753 int color;
3668 char *buf, *name; 3754 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3755 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3756 int saveop = op;
3671 3757
3758 dLocal (Display *, dpy);
3759
3672 assert (str != NULL); 3760 assert (str != NULL);
3761
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 ; // no responses yet
3764
3673 switch (op) 3765 switch (op)
3674 { 3766 {
3675 case XTerm_name: 3767 case XTerm_name:
3676 set_title (str); 3768 set_title (str);
3677 /* FALLTHROUGH */ 3769 /* FALLTHROUGH */
… …
3691 unsigned long bytes_after; 3783 unsigned long bytes_after;
3692 unsigned char *value = 0; 3784 unsigned char *value = 0;
3693 const char *str = ""; 3785 const char *str = "";
3694 3786
3695 if (prop 3787 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3788 && XGetWindowProperty (dpy, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3789 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3790 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3791 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3792 && actual_type != None
3701 && actual_format == 8) 3793 && actual_format == 8)
3702 str = (const char *)(value); 3794 str = (const char *)(value);
3703 3795
3704 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3796 tt_printf ("\033]%d;%s%c", op, str, resp);
3705 3797
3706 XFree (value); 3798 XFree (value);
3707 } 3799 }
3708 else 3800 else
3709 { 3801 {
… …
3713 { 3805 {
3714 *eq = 0; 3806 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3807 set_utf8_property (display->atom (str), eq + 1);
3716 } 3808 }
3717 else 3809 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3810 XDeleteProperty (dpy, parent[0],
3719 display->atom (str)); 3811 display->atom (str));
3720 } 3812 }
3721 break; 3813 break;
3722 3814
3723 case XTerm_Color: 3815 case XTerm_Color:
… …
3725 { 3817 {
3726 if ((name = strchr (buf, ';')) == NULL) 3818 if ((name = strchr (buf, ';')) == NULL)
3727 break; 3819 break;
3728 3820
3729 *name++ = '\0'; 3821 *name++ = '\0';
3730 color = atoi (buf); 3822 color = atoi (buf) + minCOLOR;
3731 3823
3732 if (color < 0 || color >= TOTAL_COLORS) 3824 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3733 break; 3825 break;
3734 3826
3735 if ((buf = strchr (name, ';')) != NULL) 3827 if ((buf = strchr (name, ';')) != NULL)
3736 *buf++ = '\0'; 3828 *buf++ = '\0';
3737 3829
3738 if (name[0] == '?' && !name[1]) 3830 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 } 3831 }
3747 break; 3832 break;
3748 case XTerm_Color00: 3833 case XTerm_Color00:
3749 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3834 process_color_seq (op, Color_fg, str, resp);
3750 break; 3835 break;
3751 case XTerm_Color01: 3836 case XTerm_Color01:
3752 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3837 process_color_seq (op, Color_bg, str, resp);
3753 break; 3838 break;
3754#ifndef NO_CURSORCOLOR 3839#ifndef NO_CURSORCOLOR
3755 case XTerm_Color_cursor: 3840 case XTerm_Color_cursor:
3756 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3841 process_color_seq (op, Color_cursor, str, resp);
3757 break; 3842 break;
3758#endif 3843#endif
3759 case XTerm_Color_pointer_fg: 3844 case XTerm_Color_pointer_fg:
3760 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3845 process_color_seq (op, Color_pointer_fg, str, resp);
3761 break; 3846 break;
3762 case XTerm_Color_pointer_bg: 3847 case XTerm_Color_pointer_bg:
3763 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3848 process_color_seq (op, Color_pointer_bg, str, resp);
3764 break; 3849 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3850#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: 3851 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3852 process_color_seq (op, Color_RV, str, resp);
3853 break;
3854 case Rxvt_Color_BD:
3855 case URxvt_Color_BD:
3856 process_color_seq (op, Color_BD, str, resp);
3857 break;
3858 case Rxvt_Color_UL:
3859 case URxvt_Color_UL:
3860 process_color_seq (op, Color_UL, str, resp);
3861 break;
3862 case URxvt_Color_IT:
3863 process_color_seq (op, Color_IT, str, resp);
3777 break; 3864 break;
3778#endif 3865#endif
3779#if TRANSPARENT && TINTING 3866#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint: 3867 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3868 process_color_seq (op, Color_tint, str, resp);
3869
3782 check_our_parents (); 3870 check_our_parents ();
3871
3783 if (am_transparent) 3872 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3873 want_full_refresh = want_refresh = 1;
3785 break;
3786#endif
3787 3874
3875 break;
3876#endif
3877
3788 case XTerm_Pixmap: 3878 case Rxvt_Pixmap:
3879 {
3789 if (*str != ';') 3880 if (*str != ';')
3790 { 3881 {
3791#if XPM_BACKGROUND 3882#if XPM_BACKGROUND
3792 scale_pixmap (""); /* reset to default scaling */ 3883 scale_pixmap (""); /* reset to default scaling */
3793 set_bgPixmap (str); /* change pixmap */ 3884 set_bgPixmap (str); /* change pixmap */
3794#endif
3795 scr_touch (true); 3885 scr_touch (true);
3886#endif
3796 } 3887 }
3888
3889 int changed = 0;
3890
3797 while ((str = strchr (str, ';')) != NULL) 3891 while ((str = strchr (str, ';')) != NULL)
3798 { 3892 {
3799 str++; 3893 str++;
3800#if XPM_BACKGROUND 3894#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3895 changed += scale_pixmap (str);
3802#endif 3896#endif
3803
3804 } 3897 }
3898
3805 if (changed) 3899 if (changed)
3806 { 3900 {
3807#ifdef XPM_BACKGROUND 3901#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3902 resize_pixmap ();
3809#endif
3810 scr_touch (true); 3903 scr_touch (true);
3904#endif
3811 } 3905 }
3906 }
3812 break; 3907 break;
3813 3908
3814 case XTerm_restoreFG: 3909 case Rxvt_restoreFG:
3815 set_window_color (Color_fg, str); 3910 set_window_color (Color_fg, str);
3816 break; 3911 break;
3817 case XTerm_restoreBG: 3912 case Rxvt_restoreBG:
3818 set_window_color (Color_bg, str); 3913 set_window_color (Color_bg, str);
3819 break; 3914 break;
3820 3915
3821 case XTerm_logfile: 3916 case XTerm_logfile:
3822 // TODO, when secure mode? 3917 // TODO, when secure mode?
3823 break; 3918 break;
3824 3919
3920#if 0
3921 case Rxvt_dumpscreen: /* no error notices */
3922 {
3923 int fd;
3924 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3925 {
3926 scr_dump (fd);
3927 close (fd);
3928 }
3929 }
3930 break;
3931#endif
3825 case XTerm_font: 3932 case XTerm_font:
3826 op = URxvt_font; 3933 op = URxvt_font;
3827 case URxvt_font: 3934 case URxvt_font:
3828#if ENABLE_STYLES 3935#if ENABLE_STYLES
3829 case URxvt_boldFont: 3936 case URxvt_boldFont:
3830 case URxvt_italicFont: 3937 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3938 case URxvt_boldItalicFont:
3832#endif 3939#endif
3833 if (query) 3940 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3941 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3943 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3944 resp);
3838 else 3945 else
3839 { 3946 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3947 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3948
… …
3843 allocated.push_back ((void *)res); 3950 allocated.push_back ((void *)res);
3844 set_fonts (); 3951 set_fonts ();
3845 } 3952 }
3846 break; 3953 break;
3847 3954
3848#if ENABLE_FRILLS 3955 case URxvt_version:
3849 case XTerm_locale:
3850 if (query) 3956 if (query)
3957 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3958 op,
3959 rs[Rs_name], VERSION[0], VERSION[2],
3960 resp);
3961 break;
3962
3963#if !ENABLE_MINIMAL
3964 case URxvt_locale:
3965 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3852 else 3967 else
3853 { 3968 {
3854 set_locale (str); 3969 set_locale (str);
3855# ifdef USE_XIM 3970 pty->set_utf8_mode (enc_utf8);
3856 im_cb (); 3971 init_xlocale ();
3857# endif
3858 } 3972 }
3859 break; 3973 break;
3860#endif
3861 3974
3862#ifdef MENUBAR 3975 case URxvt_view_up:
3863 case XTerm_Menu: 3976 case URxvt_view_down:
3864 if (options & Opt_insecure) 3977 {
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3978 int lines = atoi (str);
3979
3980 if (lines)
3981 scr_page (op == URxvt_view_up ? UP : DN, lines);
3982 else
3983 scr_erase_savelines ();
3984 }
3985
3866 break; 3986 break;
3867#endif 3987#endif
3868#if 0 3988
3869 case XTerm_dumpscreen: /* no error notices */ 3989#if ENABLE_PERL
3870 { 3990 case URxvt_perl:
3871 int fd; 3991 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) 3992 ; // no responses yet
3873 {
3874 scr_dump (fd);
3875 close (fd);
3876 }
3877 }
3878 break; 3993 break;
3879#endif 3994#endif
3880 } 3995 }
3881} 3996}
3882/*----------------------------------------------------------------------*/ 3997/*----------------------------------------------------------------------*/
… …
3913 return state; 4028 return state;
3914} 4029}
3915 4030
3916/* we're not using priv _yet_ */ 4031/* we're not using priv _yet_ */
3917void 4032void
3918rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4033rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3919{ 4034{
3920 unsigned int i, j; 4035 unsigned int i, j;
3921 int state; 4036 int state;
3922 4037
3923 static const struct 4038 static const struct
… …
3934 { 5, PrivMode_rVideo }, 4049 { 5, PrivMode_rVideo },
3935 { 6, PrivMode_relOrigin }, 4050 { 6, PrivMode_relOrigin },
3936 { 7, PrivMode_Autowrap }, 4051 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode 4052 // 8, bi-directional support mode
3938 { 9, PrivMode_MouseX10 }, 4053 { 9, PrivMode_MouseX10 },
3939#ifdef menuBar_esc
3940 { menuBar_esc, PrivMode_menuBar },
3941#endif
3942 // 18, 19 printing-related 4054 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor }, 4055 { 25, PrivMode_VisibleCursor },
3944#ifdef scrollBar_esc 4056#ifdef scrollBar_esc
3945 { scrollBar_esc, PrivMode_scrollBar }, 4057 { scrollBar_esc, PrivMode_scrollBar },
3946#endif 4058#endif
… …
3991 } 4103 }
3992 4104
3993 /* extra handling for values with state unkept */ 4105 /* extra handling for values with state unkept */
3994 switch (arg[i]) 4106 switch (arg[i])
3995 { 4107 {
4108#if ENABLE_STYLES
4109 case 1021:
4110 set_option (Opt_intensityStyles, mode);
4111
4112 scr_touch (true);
4113 break;
4114#endif
3996 case 1048: /* alternative cursor save */ 4115 case 1048: /* alternative cursor save */
3997 case 1049: 4116 case 1049:
3998 if (options & Opt_secondaryScreen) 4117 if (OPTION (Opt_secondaryScreen))
3999 if (mode == 0) 4118 if (mode == 0)
4000 scr_cursor (RESTORE); 4119 scr_cursor (RESTORE);
4001 else if (mode == 1) 4120 else if (mode == 1)
4002 scr_cursor (SAVE); 4121 scr_cursor (SAVE);
4003 break; 4122 break;
… …
4015 */ 4134 */
4016 PrivMode (1, PrivMode_vt52); 4135 PrivMode (1, PrivMode_vt52);
4017 break; 4136 break;
4018 case 3: /* 80/132 */ 4137 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 4138 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4139 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 4140 break;
4022 case 4: /* smooth scrolling */ 4141 case 4: /* smooth scrolling */
4023 if (state)
4024 options &= ~Opt_jumpScroll;
4025 else
4026 options |= Opt_jumpScroll; 4142 set_option (Opt_jumpScroll, !state);
4027 break; 4143 break;
4028 case 5: /* reverse video */ 4144 case 5: /* reverse video */
4029 scr_rvideo_mode (state); 4145 scr_rvideo_mode (state);
4030 break; 4146 break;
4031 case 6: /* relative/absolute origins */ 4147 case 6: /* relative/absolute origins */
… …
4037 /* case 8: - auto repeat, can't do on a per window basis */ 4153 /* case 8: - auto repeat, can't do on a per window basis */
4038 case 9: /* X10 mouse reporting */ 4154 case 9: /* X10 mouse reporting */
4039 if (state) /* orthogonal */ 4155 if (state) /* orthogonal */
4040 priv_modes &= ~PrivMode_MouseX11; 4156 priv_modes &= ~PrivMode_MouseX11;
4041 break; 4157 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 4158#ifdef scrollBar_esc
4050 case scrollBar_esc: 4159 case scrollBar_esc:
4051 if (scrollbar_mapping (state)) 4160 if (scrollbar_mapping (state))
4052 { 4161 {
4053 resize_all_windows (0, 0, 0); 4162 resize_all_windows (0, 0, 0);
… …
4072#if 0 4181#if 0
4073 case 1001: 4182 case 1001:
4074 break; /* X11 mouse highlighting */ 4183 break; /* X11 mouse highlighting */
4075#endif 4184#endif
4076 case 1010: /* scroll to bottom on TTY output inhibit */ 4185 case 1010: /* scroll to bottom on TTY output inhibit */
4077 if (state)
4078 options &= ~Opt_scrollTtyOutput;
4079 else
4080 options |= Opt_scrollTtyOutput; 4186 set_option (Opt_scrollTtyOutput, !state);
4081 break; 4187 break;
4082 case 1011: /* scroll to bottom on key press */ 4188 case 1011: /* scroll to bottom on key press */
4083 if (state)
4084 options |= Opt_scrollTtyKeypress; 4189 set_option (Opt_scrollTtyKeypress, state);
4085 else
4086 options &= ~Opt_scrollTtyKeypress;
4087 break; 4190 break;
4088 case 1047: /* secondary screen w/ clearing last */ 4191 case 1047: /* secondary screen w/ clearing last */
4089 if (options & Opt_secondaryScreen) 4192 if (OPTION (Opt_secondaryScreen))
4090 if (current_screen != PRIMARY) 4193 if (current_screen != PRIMARY)
4091 scr_erase_screen (2); 4194 scr_erase_screen (2);
4092 scr_change_screen (state); 4195 scr_change_screen (state);
4093 break; 4196 break;
4094 case 1049: /* secondary screen w/ clearing first */ 4197 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state); 4198 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen) 4199 if (OPTION (Opt_secondaryScreen))
4097 if (current_screen != PRIMARY) 4200 if (current_screen != PRIMARY)
4098 scr_erase_screen (2); 4201 scr_erase_screen (2);
4099 break; 4202 break;
4100 default: 4203 default:
4101 break; 4204 break;
… …
4229 scr_color (Color_bg, Color_bg); 4332 scr_color (Color_bg, Color_bg);
4230 break; 4333 break;
4231 4334
4232 //case 50: // not variable spacing 4335 //case 50: // not variable spacing
4233 4336
4234#ifndef NO_BRIGHTCOLOR 4337#if !ENABLE_MINIMAL
4235 case 90: 4338 case 90:
4236 case 91: /* set bright fg color */ 4339 case 91: /* set bright fg color */
4237 case 92: 4340 case 92:
4238 case 93: 4341 case 93:
4239 case 94: 4342 case 94:
… …
4251 case 106: 4354 case 106:
4252 case 107: 4355 case 107:
4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4356 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254 break; 4357 break;
4255#endif 4358#endif
4256
4257 } 4359 }
4258 } 4360 }
4259} 4361}
4260/*}}} */ 4362/*}}} */
4261 4363
… …
4285 */ 4387 */
4286void 4388void
4287rxvt_term::tt_printf (const char *fmt,...) 4389rxvt_term::tt_printf (const char *fmt,...)
4288{ 4390{
4289 va_list arg_ptr; 4391 va_list arg_ptr;
4290 unsigned char buf[256]; 4392 char buf[256];
4291 4393
4292 va_start (arg_ptr, fmt); 4394 va_start (arg_ptr, fmt);
4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4395 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4294 va_end (arg_ptr); 4396 va_end (arg_ptr);
4295 tt_write (buf, strlen (buf)); 4397 tt_write (buf, strlen (buf));
… …
4300 * or generated by us in response to a query ESC sequence. 4402 * or generated by us in response to a query ESC sequence.
4301 */ 4403 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4404const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303 4405
4304void 4406void
4305rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4407rxvt_term::tt_write (const char *data, unsigned int len)
4306{ 4408{
4409 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4410 return;
4411
4412 if (pty->pty < 0)
4413 return;
4414
4307 if (v_buflen == 0) 4415 if (v_buflen == 0)
4308 { 4416 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4417 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4310 4418
4311 if ((unsigned int)written == len) 4419 if ((unsigned int)written == len)
4312 return; 4420 return;
4313 4421
4314 data += written; 4422 data += written;
4315 len -= written; 4423 len -= written;
4316 } 4424 }
4317 4425
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4426 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4319 4427
4320 memcpy (v_buffer + v_buflen, data, len); 4428 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len; 4429 v_buflen += len;
4322 4430
4323 pty_ev.set (EVENT_READ | EVENT_WRITE); 4431 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324} 4432}
4325 4433
4326void rxvt_term::pty_write () 4434void rxvt_term::pty_write ()
4327{ 4435{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4436 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329 4437
4330 if (written > 0) 4438 if (written > 0)
4331 { 4439 {
4332 v_buflen -= written; 4440 v_buflen -= written;
4333 4441
… …
4342 } 4450 }
4343 4451
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4452 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4453 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4454 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4455 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4456}
4350 4457
4351/*----------------------- end-of-file (C source) -----------------------*/ 4458/*----------------------- end-of-file (C source) -----------------------*/
4352 4459

Diff Legend

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