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.190 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.329 by ayin, Mon Jun 11 19:57:28 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <cwchar>
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63
64// exception thrown when the command parser runs out of input data
65class out_of_input { } out_of_input;
66 67
67#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
68 69
69#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
70#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
118 XK_Escape, 0x238b, 119 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 120 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 121 XK_Print, 0x2399,
121 122
122 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,
123 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif
124 0, 133 0,
125}; 134};
126 135
127void 136void
128rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
129{ 138{
130 x = Pixel2Col (x); 139 x = Pixel2Col (x);
131 y = Pixel2Row (y); 140 y = Pixel2Row (y);
132 141
133 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 144 return;
136 145
137 for (;;) 146 for (;;)
138 { 147 {
139 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];
140 151
141 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
142 { 153 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
146 break; 156 break;
147 } 157 }
148 158
149 x--; 159 x--;
150 } 160 }
151
152} 161}
153#endif
154 162
155#if ENABLE_OVERLAY
156void 163void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 165{
159 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 169 int len;
163 170
171 fname = rxvt_utf8towcs (f->name);
172
164#if ENABLE_COMBINING 173# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
166 { 175 {
167 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
170 } 179 }
171 else 180 else
172#endif 181# endif
173 { 182 {
174 ch2 = ch; 183 ch2 = ch;
175 184
176 alloc = 0; 185 alloc = 0;
177 chr = &ch2; 186 chr = &ch2;
178 len = 1; 187 len = 1;
179 } 188 }
180 189
181 int width = strlen (f->name); 190 char attr[80]; // plenty
182 191
183 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);
184 214
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 216
187 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
188 { 218 {
… …
191 ch = *chr++; 221 ch = *chr++;
192 222
193 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
196#if !UNICODE3 226# if !UNICODE3
197 if (ch >= 0x10000) 227 if (ch >= 0x10000)
198 ch = 0xfffd; 228 ch = 0xfffd;
199#endif 229# endif
200 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
201 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
202 } 234 }
203 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);
204 scr_overlay_set (0, len, f->name); 242 scr_overlay_set (0, len + 1, fname);
205 243
244 free (fname);
245
206#if ENABLE_COMBINING 246# if ENABLE_COMBINING
207 if (alloc) 247 if (alloc)
208 delete [] alloc; 248 delete [] alloc;
209#endif 249# endif
210} 250}
211#endif 251#endif
212 252
213void 253void
214rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
231 mb[0] = ch[0]; 271 mb[0] = ch[0];
232 len = 1; 272 len = 1;
233 } 273 }
234 274
235 if (len > 0) 275 if (len > 0)
236 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
237 else 277 else
238 scr_bell (); 278 scr_bell ();
239 } 279 }
240 280
241 iso14755buf = 0; 281 iso14755buf = 0;
… …
258 298
259 return -1; 299 return -1;
260} 300}
261#endif 301#endif
262 302
263/*{{{ Convert the keypress event into a string */
264void 303void
265rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
266{ 305{
267 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
268 unsigned int newlen; 307 unsigned int newlen;
269 KeySym keysym; 308 KeySym keysym;
270#ifdef DEBUG_CMD
271 static int debug_key = 1; /* accessible by a debugger only */
272#endif
273 int valid_keysym; 309 int valid_keysym;
274 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
275 316
276 /* 317 /*
277 * 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
278 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
279 * 320 *
280 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
281 */ 322 */
282 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
285 326
286 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
287 { 328 {
288 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
297 Status status_return; 338 Status status_return;
298 339
299#if 0 340#if 0
300#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
301 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
302 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
303 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
304 else 345 else
305#endif 346#endif
306#endif 347#endif
307 { 348 {
… …
309 350
310 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
314 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
317 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 361 SET_LOCALE (locale);
319 362
320 if (status_return == XLookupChars 363 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
342 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
343 } 386 }
344 else 387 else
345#endif 388#endif
346 { 389 {
347 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
348 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
349 } 392 }
350 393
351 if (valid_keysym) 394 if (valid_keysym)
352 { 395 {
353#ifdef KEYSYM_RESOURCE 396#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 397 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 398 return;
356#endif 399#endif
357 400
358 if (TermWin.saveLines) 401 if (saveLines)
359 { 402 {
360#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 404 if (!ctrl && !meta)
362#else 405#else
363 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
364#endif 407#endif
365 { 408 {
366 int lnsppg; 409 int lnsppg;
367 410
368#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 413#else
371 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
372#endif 415#endif
373 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
374 { 417 {
375 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
376 return; 419 return;
… …
404 scr_move_to (0, 1); 447 scr_move_to (0, 1);
405 return; 448 return;
406 } 449 }
407 else if (keysym == XK_End) 450 else if (keysym == XK_End)
408 { 451 {
409 scr_move_to (1, 0); 452 scr_move_to (1, 1);
410 return; 453 return;
411 } 454 }
412 } 455 }
413#endif 456#endif
414 } 457 }
… …
425 { 468 {
426 switch (keysym) 469 switch (keysym)
427 { 470 {
428 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
429 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
430 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
431 return; 474 return;
432#if TODO 475#if TODO
433 /* rxvt extras */ 476 /* rxvt extras */
434 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
435 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
454 { 497 {
455 commit_iso14755 (); 498 commit_iso14755 ();
456 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
457# if ISO_14755 500# if ISO_14755
458 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif 510# endif
460 return; 511 return;
461 } 512 }
462 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
463 { 514 {
… …
485 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
486 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
487# endif 538# endif
488 } 539 }
489#endif 540#endif
490 541
491#ifdef PRINTPIPE 542#ifdef PRINTPIPE
492 if (keysym == XK_Print) 543 if (keysym == XK_Print)
493 { 544 {
494 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
495 return; 546 return;
… …
513 else 564 else
514 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, key_backspace);
515 break; 566 break;
516#endif 567#endif
517#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
518 case XK_Delete: 579 case XK_Delete:
519 strcpy (kbuf, key_delete); 580 strcpy (kbuf, key_delete);
520 break; 581 break;
521#endif 582#endif
522 case XK_Tab: 583 case XK_Tab:
… …
625#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
626 case XK_KP_Begin: 687 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
628 break; 689 break;
629 690
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 691#endif
638 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
… …
673 break; 727 break;
674 728
675 case XK_Find: 729 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
677 break; 731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
678 case XK_Insert: 743 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
680 break; 745 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 747 case DXK_Remove:
… …
802 { 867 {
803#ifdef META8_OPTION 868#ifdef META8_OPTION
804 /* set 8-bit on */ 869 /* set 8-bit on */
805 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
806 { 871 {
807 unsigned char *ch; 872 char *ch;
808 873
809 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
810 *ch |= 0x80; 875 *ch |= 0x80;
811 876
812 meta = 0; 877 meta = 0;
… …
814#endif 879#endif
815 /* nil */ ; 880 /* nil */ ;
816 } 881 }
817 } 882 }
818 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
819 if (len <= 0) 887 if (len <= 0)
820 return; /* not mapped */ 888 return; /* not mapped */
821 889
822 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 891 if (view_start)
824 { 892 {
825 TermWin.view_start = 0; 893 view_start = 0;
826 want_refresh = 1; 894 want_refresh = 1;
827 } 895 }
828 896
829 /* 897 /*
830 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
845#ifdef META8_OPTION 913#ifdef META8_OPTION
846 && meta_char == C0_ESC 914 && meta_char == C0_ESC
847#endif 915#endif
848 ) 916 )
849 { 917 {
850 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
851 tt_write (&ch, 1); 919 tt_write (&ch, 1);
852 } 920 }
853 921
854#if defined(DEBUG_CMD)
855 /* Display keyboard buffer contents */
856 unsigned char *p;
857 int i;
858
859 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
860 for (i = 0, p = kbuf; i < len; i++, p++)
861 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
862 fprintf (stderr, "'\n");
863#endif /* DEBUG_CMD */
864 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
865} 923}
866/*}}} */
867 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
870/* attempt to `write' count to the input buffer */
871unsigned int 1003unsigned int
872rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
873{ 1005{
874 unsigned int n, s; 1006 unsigned int n, s;
875 1007
876 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
914 } 1046 }
915#endif 1047#endif
916 1048
917 if (want_refresh) 1049 if (want_refresh)
918 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
919 scr_refresh (refresh_type); 1089 scr_refresh ();
920 scrollbar_show (1); 1090 scrollbar_show (1);
921#ifdef USE_XIM 1091#ifdef USE_XIM
922 IMSendSpot (); 1092 IMSendSpot ();
923#endif 1093#endif
924 } 1094 }
… …
927} 1097}
928 1098
929void 1099void
930rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
931{ 1101{
932 SET_R (this); 1102 make_current ();
933 SET_LOCALE (locale);
934 1103
935 display->flush (); 1104 display->flush ();
936 1105
937 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 1108}
940 1109
941void 1110void
942rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
943{ 1112{
944 SET_R (this); 1113 make_current ();
945 SET_LOCALE (locale);
946 1114
947 refresh_limit = 1; 1115 refresh_limit = 1;
948 refresh_count = 0; 1116 refresh_count = 0;
949 flush (); 1117 flush ();
950} 1118}
… …
954rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
955{ 1123{
956 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
957 want_refresh = 1; 1125 want_refresh = 1;
958 1126
959 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
960} 1128}
961#endif 1129#endif
962 1130
963#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
964void 1132void
… …
978rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
979{ 1147{
980 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
981 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
982 { 1150 {
983 refresh_type |= SMOOTH_REFRESH;
984 want_refresh = 1; 1151 want_refresh = 1;
985 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
986 } 1153 }
987} 1154}
988#endif 1155#endif
… …
992rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
993{ 1160{
994 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
995 { 1162 {
996 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
997 refresh_type |= SMOOTH_REFRESH;
998 want_refresh = 1; 1164 want_refresh = 1;
999 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1000 } 1166 }
1001} 1167}
1002#endif 1168#endif
… …
1007{ 1173{
1008 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1177 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1178 if (view_start == top_row || view_start == 0)
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1015 1180
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1181 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1183 }
1020} 1184}
1021#endif 1185#endif
1022 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1023bool 1212bool
1024rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1025{ 1214{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1216
1028 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1029 { 1218 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1220 n = 0;
1032 } 1221 }
1033 1222
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1037 1226
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1039 1228
1040 if (n > 0) 1229 if (r > 0)
1041 { 1230 {
1042 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
1043 return true; 1232 return true;
1044 } 1233 }
1045 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
1046 destroy (); 1246 destroy ();
1047 1247 }
1248
1048 return false; 1249 return false;
1049} 1250}
1050 1251
1051void 1252void
1052rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1053{ 1254{
1054 SET_R (this); 1255 make_current ();
1055 SET_LOCALE (locale);
1056 1256
1057 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1058 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1059 while (pty_fill ()) 1259 while (pty_fill ())
1060 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1065} 1265}
1066 1266
1067void 1267void
1068rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1069{ 1269{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1071 recolour_cursor (); 1271 recolour_cursor ();
1072 1272
1073#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1274 hidden_pointer = 0;
1075 1275
1076 if (options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1278#endif
1079} 1279}
1080 1280
1081#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1082void 1282void
1083rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1084{ 1284{
1085 if (! (options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1086 return; 1286 return;
1087 1287
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1089 XFlush (display->display); 1289 XFlush (dpy);
1090 1290
1091 hidden_pointer = 1; 1291 hidden_pointer = 1;
1092} 1292}
1093 1293
1094void 1294void
1095rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1096{ 1296{
1097 SET_R (this); 1297 make_current ();
1098 SET_LOCALE (locale);
1099 1298
1100 pointer_blank (); 1299 pointer_blank ();
1101} 1300}
1102#endif 1301#endif
1103 1302
… …
1168 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1169 (32 + x + 1), 1368 (32 + x + 1),
1170 (32 + y + 1)); 1369 (32 + y + 1));
1171} 1370}
1172 1371
1173#ifdef USING_W11LIB
1174void
1175rxvt_W11_process_x_event (XEvent *ev)
1176{
1177 rxvt_t *r = rxvt_get_r ();
1178
1179 x_cb (*ev);
1180}
1181#endif
1182
1183/*{{{ process an X event */ 1372/*{{{ process an X event */
1184void 1373void
1185rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1186{ 1375{
1187 SET_R (this); 1376 make_current ();
1188 SET_LOCALE (locale);
1189 1377
1190#if defined(CURSOR_BLINK) 1378 dLocal (Display *, dpy);
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1192 {
1193 if (hidden_cursor)
1194 {
1195 hidden_cursor = 0;
1196 want_refresh = 1;
1197 }
1198 1379
1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
1200 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1201#endif 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1383 return;
1202 1384
1203#if defined(POINTER_BLANK) 1385 // for XQueryPointer
1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1205 {
1206 if (ev.type == MotionNotify
1207 || ev.type == ButtonPress
1208 || ev.type == ButtonRelease)
1209 if (hidden_pointer)
1210 pointer_unblank ();
1211
1212 if (ev.type == KeyPress && hidden_pointer == 0)
1213 pointer_blank ();
1214 }
1215#endif
1216
1217 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1218 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1219 unsigned int unused_mask; 1388 unsigned int unused_mask;
1220 1389
1221 switch (ev.type) 1390 switch (ev.type)
1222 { 1391 {
1223 case KeyPress: 1392 case KeyPress:
1224#if ISO_14755 1393 key_press (ev.xkey);
1225 if (!(iso14755buf & ISO_14755_52))
1226#endif
1227 lookup_key (ev.xkey);
1228
1229 break; 1394 break;
1230 1395
1231 case KeyRelease: 1396 case KeyRelease:
1232 { 1397 key_release (ev.xkey);
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1234 KeySym ks;
1235
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif
1238
1239#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support
1241 if (iso14755buf)
1242 if (iso14755buf & ISO_14755_52)
1243 {
1244# if ENABLE_OVERLAY
1245 scr_overlay_off ();
1246# endif
1247# if ISO_14755
1248 // iso14755 part 5.2 handling: release time
1249 // first: controls
1250 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f)))
1253 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1255 commit_iso14755 ();
1256 return; // case-break;
1257 }
1258
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks)
1261 {
1262 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 ();
1264 return; // case-break;
1265 }
1266
1267 scr_bell ();
1268# endif
1269 iso14755buf = 0;
1270 break;
1271 }
1272 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277 if (iso14755buf & ISO_14755_51)
1278 commit_iso14755 ();
1279#if ISO_14755
1280 else if (iso14755buf & ISO_14755_STARTED)
1281 {
1282 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1283
1284 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1285 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1286 }
1287# endif
1288 else
1289 iso14755buf = 0;
1290 }
1291#endif
1292
1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1294 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R)
1297 mouse_slip_wheel_speed = 0;
1298#endif
1299 break; 1398 break;
1300 }
1301 1399
1302 case ButtonPress: 1400 case ButtonPress:
1303 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1304 break; 1402 break;
1305 1403
… …
1307 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1308 break; 1406 break;
1309 1407
1310 case ClientMessage: 1408 case ClientMessage:
1311 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1313 destroy ();
1314#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink))
1320 { 1411 {
1321 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1322 Atom ActualType; 1413 {
1323 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1324 unsigned char *data; 1415 {
1325 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1326 1417 {
1327 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1328 xa[XA_DNDSELECTION], 1419 destroy ();
1329 0L, 1000000L, 1420 }
1330 False, AnyPropertyType, 1421#if ENABLE_EWMH
1331 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1332 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1333 &data); 1425 &ev);
1334 set_string_property (XA_CUT_BUFFER0, data); 1426#endif
1335 XFree (data); 1427 }
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1428 }
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1437#endif
1338 } 1438 }
1339#endif /* OFFIX_DND */
1340 break; 1439 break;
1341 1440
1342 case MappingNotify: 1441 case MappingNotify:
1343 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1344 break; 1443 break;
… …
1367 break; 1466 break;
1368 } 1467 }
1369 break; 1468 break;
1370 1469
1371 case FocusIn: 1470 case FocusIn:
1372 if (!TermWin.focus) 1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1481 focus_out ();
1482 break;
1483
1484 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0])
1373 { 1486 {
1374 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1375 want_refresh = 1;
1376#ifdef USE_XIM
1377 if (Input_Context != NULL)
1378 { 1488 ;
1379 IMSetStatusPosition ();
1380 XSetICFocus (Input_Context);
1381 }
1382#endif
1383#ifdef CURSOR_BLINK
1384 if (options & Opt_cursorBlink)
1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 {
1390 pix_colors = pix_colors_focused;
1391 scr_recolour ();
1392 }
1393#endif
1394 1489
1395 }
1396 break;
1397
1398 case FocusOut:
1399 if (TermWin.focus)
1400 {
1401 TermWin.focus = 0;
1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1410#ifdef USE_XIM
1411 if (Input_Context != NULL)
1412 XUnsetICFocus (Input_Context);
1413#endif
1414#ifdef CURSOR_BLINK
1415 if (options & Opt_cursorBlink)
1416 cursor_blink_ev.stop ();
1417 hidden_cursor = 0;
1418#endif
1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1491 {
1444 seen_resize = 1; 1492 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1446 } 1501 }
1447 1502
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1449 if (options & Opt_transparent) 1506 if (option (Opt_transparent))
1450 check_our_parents (); 1507 check_our_parents ();
1451#endif 1508#endif
1452 } 1509 }
1453 break; 1510 break;
1454 1511
1455 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1456 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1457 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1458 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1459 1517
1460 break; 1518 break;
1461 1519
1462 case SelectionClear: 1520 case SelectionClear:
1463 selection_clear (); 1521 selection_clear ();
… …
1470 1528
1471 case SelectionRequest: 1529 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1473 break; 1531 break;
1474 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1475 case UnmapNotify: 1541 case UnmapNotify:
1476 TermWin.mapped = 0; 1542 mapped = 0;
1477#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1479#endif 1545#endif
1480 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1481
1482 case MapNotify:
1483 TermWin.mapped = 1;
1484#ifdef TEXT_BLINK
1485 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486#endif
1487 break; 1547 break;
1488 1548
1489#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1490 case ReparentNotify: 1550 case ReparentNotify:
1491 rootwin_cb (ev); 1551 rootwin_cb (ev);
1492 break; 1552 break;
1493#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1494 1554
1495 case GraphicsExpose: 1555 case GraphicsExpose:
1496 case Expose: 1556 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1498 { 1558 {
1499 do 1559 do
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1503 1563
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1565
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1509 1569
1510 scr_refresh (refresh_type); 1570 want_refresh = 1;
1511 } 1571 }
1512 else 1572 else
1513 { 1573 {
1514 XEvent unused_event; 1574 XEvent unused_event;
1515 1575
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1517 ; 1577 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1579 ;
1520 1580
1521 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1522 { 1582 {
1523 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1524 scrollbar_show (0); 1584 scrollbar_show (0);
1525 } 1585 }
1526#ifdef MENUBAR
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose ();
1529#endif
1530 1586
1531#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1533 XClearWindow (display->display, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1534#endif 1590#endif
1535 } 1591 }
1536 break; 1592 break;
1537 1593
1538 case MotionNotify: 1594 case MotionNotify:
1539#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1540 if (hidden_pointer) 1596 if (hidden_pointer)
1541 pointer_unblank (); 1597 pointer_unblank ();
1542#endif 1598#endif
1543#if MENUBAR
1544 if (isMenuBarWindow (ev.xany.window))
1545 {
1546 menubar_control (ev.xbutton);
1547 break;
1548 }
1549#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1600 break;
1552 1601
1553 if (ev.xany.window == TermWin.vt) 1602 if (ev.xany.window == vt)
1554 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1608 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1558 ; 1610 ;
1559 1611
1560 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (dpy, vt,
1561 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1616 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1577#endif 1629#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1632
1581#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1636 {
1585 int dist; 1637 int dist;
1586 1638
1587 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1596 selection_save_x = ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1651
1600 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1602 { 1654 {
1603 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1605 } 1657 }
1606 else 1658 else
1607 { 1659 {
1608 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1661 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1662 }
1611 1663
1612 scroll_selection_lines = Pixel2Height (dist) 1664 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1666 + 1;
1615 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1617 } 1669 }
1618 else 1670 else
1619 { 1671 {
1620 /* we are within the text window, so we 1672 /* we are within the text window, so we
… …
1629#endif 1681#endif
1630 } 1682 }
1631 } 1683 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1685 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1635 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1636 ; 1688 ;
1637 1689
1638 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1639 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1694 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1644 scrollbar_size ()); 1696 scrollbar_size ());
1645 scr_refresh (refresh_type); 1697 want_refresh = 1;
1646 refresh_limit = 0; 1698 refresh_limit = 0;
1647 scrollbar_show (1); 1699 scrollbar_show (1);
1648 } 1700 }
1649 break; 1701 break;
1650 } 1702 }
1651}
1652 1703
1653#if TRANSPARENT 1704#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1706 {
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif
1716
1717#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 {
1720 if (ev.type == MotionNotify
1721 || ev.type == ButtonPress
1722 || ev.type == ButtonRelease)
1723 if (hidden_pointer)
1724 pointer_unblank ();
1725
1726 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank ();
1728 }
1729#endif
1730}
1731
1732void
1733rxvt_term::focus_in ()
1734{
1735 if (!focus)
1736 {
1737 focus = 1;
1738 want_refresh = 1;
1739
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM
1743 if (Input_Context != NULL)
1744 {
1745 IMSetPosition ();
1746 XSetICFocus (Input_Context);
1747 }
1748#endif
1749#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1752#endif
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 pix_colors = pix_colors_focused;
1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif
1773 }
1774}
1775
1776void
1777rxvt_term::focus_out ()
1778{
1779 if (focus)
1780 {
1781 focus = 0;
1782 want_refresh = 1;
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785
1786#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf)
1788 {
1789 iso14755buf = 0;
1790# if ENABLE_OVERLAY
1791 scr_overlay_off ();
1792# endif
1793 }
1794#endif
1795#if USE_XIM
1796 if (Input_Context != NULL)
1797 XUnsetICFocus (Input_Context);
1798#endif
1799#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop ();
1802 hidden_cursor = 0;
1803#endif
1804#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade])
1806 {
1807 pix_colors = pix_colors_unfocused;
1808 scr_recolour ();
1809 }
1810#endif
1811 }
1812}
1813
1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1654void 1828void
1655rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1656{ 1830{
1657 SET_R (this); 1831 make_current ();
1658 SET_LOCALE (locale);
1659 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1660 switch (ev.type) 1838 switch (ev.type)
1661 { 1839 {
1662 case PropertyNotify: 1840 case PropertyNotify:
1663 /* 1841 /*
1664 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
… …
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1669 return; 1847 return;
1670 1848
1671 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1672 case ReparentNotify: 1850 case ReparentNotify:
1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1674 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1675 break; 1853 break;
1676 } 1854 }
1855# endif
1677} 1856}
1678#endif 1857#endif
1679 1858
1680void 1859void
1681rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1682{ 1861{
1683 int reportmode = 0, clickintime; 1862 int reportmode = 0, clickintime;
1684 1863
1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1864 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1865
1686 if (!bypass_keystate) 1866 if (!bypass_keystate)
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1867 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1868
1689 /* 1869 /*
1690 * VT window processing of button press 1870 * VT window processing of button press
1691 */ 1871 */
1692 if (ev.window == TermWin.vt) 1872 if (ev.window == vt)
1693 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1694#if ISO_14755 1877#if ISO_14755
1695 // 5.4 1878 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1880 {
1698 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
… …
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1712 { 1895 {
1713 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1714 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1715 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1716 { 1900 {
1717 /* only report double clicks */ 1901 /* only report double clicks */
1718 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1719 mouse_report (ev); 1903 mouse_report (ev);
… …
1751#else 1935#else
1752 selection.rect = false; 1936 selection.rect = false;
1753#endif 1937#endif
1754 1938
1755 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1757 { 1941 {
1758 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1759 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1760 else 1944 else
1761 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
… …
1902 case Button3: 2086 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != R_SB_XTERM)
1904 { 2088 {
1905 if (scrollbar_above_slider (ev.y)) 2089 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 2091 scr_page (UP, nrow - 1);
1908# else 2092# else
1909 scr_page (UP, TermWin.nrow / 4); 2093 scr_page (UP, nrow / 4);
1910# endif 2094# endif
1911 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 2097 scr_page (DN, nrow - 1);
1914# else 2098# else
1915 scr_page (DN, TermWin.nrow / 4); 2099 scr_page (DN, nrow / 4);
1916# endif 2100# endif
1917 else 2101 else
1918 scrollBar.setMotion (); 2102 scrollBar.setMotion ();
1919 } 2103 }
1920 else 2104 else
1921 { 2105 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 2107 (nrow
1924 * scrollbar_position (ev.y) 2108 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 2109 / scrollbar_size ()));
1926 } 2110 }
1927 2111
1928 break; 2112 break;
1929 } 2113 }
1930 } 2114 }
2115
1931 return; 2116 return;
1932 } 2117 }
1933#if MENUBAR
1934 /*
1935 * Menubar window processing of button press
1936 */
1937 if (isMenuBarWindow (ev.window))
1938 menubar_control (ev);
1939#endif
1940} 2118}
1941 2119
1942void 2120void
1943rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
1944{ 2122{
… …
1950 2128
1951 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
1952 { 2130 {
1953 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
1954 scrollbar_show (0); 2132 scrollbar_show (0);
1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1956 refresh_type &= ~SMOOTH_REFRESH;
1957#endif
1958 } 2133 }
1959 2134
1960#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
1963#endif 2138#endif
1964 2139
1965 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1966 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
1967#if ISO_14755 2145#if ISO_14755
1968 // 5.4 2146 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2148 return;
1971#endif 2149#endif
2150
1972 if (reportmode) 2151 if (reportmode)
1973 { 2152 {
1974 /* mouse report from vt window */ 2153 /* mouse report from vt window */
1975 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
1976 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2006 { 2185 {
2007 case Button1: 2186 case Button1:
2008 case Button3: 2187 case Button3:
2009 selection_make (ev.time); 2188 selection_make (ev.time);
2010 break; 2189 break;
2190
2011 case Button2: 2191 case Button2:
2012 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2013 break; 2194 break;
2195
2014#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2015 case Button4: 2197 case Button4:
2016 case Button5: 2198 case Button5:
2017 { 2199 {
2018 int i; 2200 int i;
… …
2020 2202
2021 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2022 2204
2023 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2024 i = 1; 2206 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2207 else if (option (Opt_mouseWheelScrollPage))
2026 i = TermWin.nrow - 1; 2208 i = nrow - 1;
2027 else 2209 else
2028 i = 5; 2210 i = 5;
2029 2211
2030# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2032 { 2214 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2035 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2218
2037 if (slip_wheel_ev.at < NOW) 2219 if (slip_wheel_ev.at < NOW)
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039 2221
2040 slip_wheel_ev.start (); 2222 slip_wheel_ev.start ();
2041 } 2223 }
2042 else 2224 else
2043 { 2225 {
2044# endif 2226# endif
2045# ifdef JUMP_MOUSE_WHEEL
2046 scr_page (v, i); 2227 scr_page (v, i);
2047 scr_refresh (SMOOTH_REFRESH);
2048 scrollbar_show (1); 2228 scrollbar_show (1);
2049# else
2050 while (i--)
2051 {
2052 scr_page (v, 1);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1);
2055 }
2056# endif
2057# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2058 } 2230 }
2059#endif 2231# endif
2060 } 2232 }
2061 break; 2233 break;
2062#endif 2234#endif
2063 } 2235 }
2064 } 2236 }
2065#ifdef MENUBAR
2066 else if (isMenuBarWindow (ev.window))
2067 menubar_control (ev);
2068#endif
2069} 2237}
2070
2071#ifdef TRANSPARENT
2072#if TINTING
2073/* taken from aterm-0.4.2 */
2074
2075typedef uint32_t RUINT32T;
2076
2077void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2078{
2079 int sh_r, sh_g, sh_b;
2080 RUINT32T mask_r, mask_g, mask_b;
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i;
2085
2086 Visual* visual = display->visual;
2087
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089
2090 /* for convenience */
2091 mask_r = visual->red_mask;
2092 mask_g = visual->green_mask;
2093 mask_b = visual->blue_mask;
2094
2095 /* boring lookup table pre-initialization */
2096 switch (srcImage->bits_per_pixel) {
2097 case 15:
2098 if ((mask_r != 0x7c00) ||
2099 (mask_g != 0x03e0) ||
2100 (mask_b != 0x001f))
2101 return;
2102 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2103 lookup_r = lookup;
2104 lookup_g = lookup+32;
2105 lookup_b = lookup+32+32;
2106 sh_r = 10;
2107 sh_g = 5;
2108 sh_b = 0;
2109 break;
2110 case 16:
2111 if ((mask_r != 0xf800) ||
2112 (mask_g != 0x07e0) ||
2113 (mask_b != 0x001f))
2114 return;
2115 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2116 lookup_r = lookup;
2117 lookup_g = lookup+32;
2118 lookup_b = lookup+32+64;
2119 sh_r = 11;
2120 sh_g = 5;
2121 sh_b = 0;
2122 break;
2123 case 24:
2124 if ((mask_r != 0xff0000) ||
2125 (mask_g != 0x00ff00) ||
2126 (mask_b != 0x0000ff))
2127 return;
2128 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2129 lookup_r = lookup;
2130 lookup_g = lookup+256;
2131 lookup_b = lookup+256+256;
2132 sh_r = 16;
2133 sh_g = 8;
2134 sh_b = 0;
2135 break;
2136 case 32:
2137 if ((mask_r != 0xff0000) ||
2138 (mask_g != 0x00ff00) ||
2139 (mask_b != 0x0000ff))
2140 return;
2141 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2142 lookup_r = lookup;
2143 lookup_g = lookup+256;
2144 lookup_b = lookup+256+256;
2145 sh_r = 16;
2146 sh_g = 8;
2147 sh_b = 0;
2148 break;
2149 default:
2150 return; /* we do not support this color depth */
2151 }
2152
2153 /* prepare limits for color transformation (each channel is handled separately) */
2154 if (shade < 0) {
2155 shade = -shade;
2156 if (shade < 0) shade = 0;
2157 if (shade > 100) shade = 100;
2158
2159 lower_lim_r = 65535-rm;
2160 lower_lim_g = 65535-gm;
2161 lower_lim_b = 65535-bm;
2162
2163 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2164 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2165 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2166
2167 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2168 } else {
2169 if (shade < 0) shade = 0;
2170 if (shade > 100) shade = 100;
2171
2172 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2173
2174 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2175 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2176 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2177 }
2178
2179 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2180 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2181 {
2182 unsigned int tmp;
2183
2184 tmp = lower_lim_r;
2185 lower_lim_r = lower_lim_b;
2186 lower_lim_b = tmp;
2187
2188 tmp = upper_lim_r;
2189 upper_lim_r = upper_lim_b;
2190 upper_lim_b = tmp;
2191 }
2192
2193 /* fill our lookup tables */
2194 for (i = 0; i <= mask_r>>sh_r; i++)
2195 {
2196 RUINT32T tmp;
2197 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2198 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2199 lookup_r[i] = (tmp/65535)<<sh_r;
2200 }
2201 for (i = 0; i <= mask_g>>sh_g; i++)
2202 {
2203 RUINT32T tmp;
2204 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2205 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2206 lookup_g[i] = (tmp/65535)<<sh_g;
2207 }
2208 for (i = 0; i <= mask_b>>sh_b; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2212 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2213 lookup_b[i] = (tmp/65535)<<sh_b;
2214 }
2215
2216 /* apply table to input image (replacing colors by newly calculated ones) */
2217 switch (srcImage->bits_per_pixel)
2218 {
2219 case 15:
2220 {
2221 unsigned short *p1, *pf, *p, *pl;
2222 p1 = (unsigned short *) srcImage->data;
2223 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2224 while (p1 < pf)
2225 {
2226 p = p1;
2227 pl = p1 + srcImage->width;
2228 for (; p < pl; p++)
2229 {
2230 *p = lookup_r[(*p & 0x7c00)>>10] |
2231 lookup_g[(*p & 0x03e0)>> 5] |
2232 lookup_b[(*p & 0x001f)];
2233 }
2234 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2235 }
2236 break;
2237 }
2238 case 16:
2239 {
2240 unsigned short *p1, *pf, *p, *pl;
2241 p1 = (unsigned short *) srcImage->data;
2242 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2243 while (p1 < pf)
2244 {
2245 p = p1;
2246 pl = p1 + srcImage->width;
2247 for (; p < pl; p++)
2248 {
2249 *p = lookup_r[(*p & 0xf800)>>11] |
2250 lookup_g[(*p & 0x07e0)>> 5] |
2251 lookup_b[(*p & 0x001f)];
2252 }
2253 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2254 }
2255 break;
2256 }
2257 case 24:
2258 {
2259 unsigned char *p1, *pf, *p, *pl;
2260 p1 = (unsigned char *) srcImage->data;
2261 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2262 while (p1 < pf)
2263 {
2264 p = p1;
2265 pl = p1 + srcImage->width * 3;
2266 for (; p < pl; p += 3)
2267 {
2268 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2269 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2270 p[2] = lookup_r[(p[2] & 0x0000ff)];
2271 }
2272 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2273 }
2274 break;
2275 }
2276 case 32:
2277 {
2278 RUINT32T *p1, *pf, *p, *pl;
2279 p1 = (RUINT32T *) srcImage->data;
2280 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2281
2282 while (p1 < pf)
2283 {
2284 p = p1;
2285 pl = p1 + srcImage->width;
2286 for (; p < pl; p++)
2287 {
2288 *p = lookup_r[(*p & 0xff0000)>>16] |
2289 lookup_g[(*p & 0x00ff00)>> 8] |
2290 lookup_b[(*p & 0x0000ff)] |
2291 (*p & ~0xffffff);
2292 }
2293 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2294 }
2295 break;
2296 }
2297 }
2298
2299 free (lookup);
2300}
2301#endif
2302
2303/*
2304 * Check our parents are still who we think they are.
2305 * Do transparency updates if required
2306 */
2307int
2308rxvt_term::check_our_parents ()
2309{
2310 int i, pchanged, aformat, have_pixmap, rootdepth;
2311 unsigned long nitems, bytes_after;
2312 Atom atype;
2313 unsigned char *prop = NULL;
2314 Window root, oldp, *list;
2315 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr;
2317
2318 pchanged = 0;
2319
2320 if (!(options & Opt_transparent))
2321 return pchanged; /* Don't try any more */
2322
2323 XGetWindowAttributes (display->display, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth;
2325
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2327
2328 if (rootdepth != wattr.depth)
2329 {
2330 if (am_transparent)
2331 {
2332 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0;
2335 }
2336
2337 return pchanged; /* Don't try any more */
2338 }
2339
2340 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False);
2342
2343 /*
2344 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that.
2347 */
2348 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success);
2352
2353 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success);
2358
2359 if (!i || prop == NULL
2360#if TINTING
2361 || !rs[Rs_color + Color_tint]
2362#endif
2363 )
2364 have_pixmap = 0;
2365 else
2366 {
2367 have_pixmap = 1;
2368 rootpixmap = *(Pixmap *)prop;
2369 XFree (prop);
2370 }
2371
2372 if (have_pixmap)
2373 {
2374 /*
2375 * Copy display->root pixmap transparency
2376 */
2377 int sx, sy, nx, ny;
2378 unsigned int nw, nh;
2379 Window cr;
2380 XImage *image;
2381 GC gc;
2382 XGCValues gcvalue;
2383
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2385 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height;
2388 nx = ny = 0;
2389
2390 if (sx < 0)
2391 {
2392 nw += sx;
2393 nx = -sx;
2394 sx = 0;
2395 }
2396
2397 if (sy < 0)
2398 {
2399 nh += sy;
2400 ny = -sy;
2401 sy = 0;
2402 }
2403
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406
2407 XSync (display->display, False);
2408 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */
2413 allowedxerror = 0;
2414
2415 if (image == NULL)
2416 {
2417 if (am_transparent && am_pixmap_trans)
2418 {
2419 pchanged = 1;
2420 if (TermWin.pixmap != None)
2421 {
2422 XFreePixmap (display->display, TermWin.pixmap);
2423 TermWin.pixmap = None;
2424 }
2425 }
2426
2427 am_pixmap_trans = 0;
2428 }
2429 else
2430 {
2431 if (TermWin.pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap);
2433
2434#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint))
2436 {
2437 unsigned short rm, gm, bm;
2438 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2439
2440 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2441
2442 ShadeXImage (display, image, shade, rm, gm, bm);
2443 }
2444#endif
2445
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2447 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc);
2452 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]);
2455
2456 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1;
2458
2459 am_transparent = am_pixmap_trans = 1;
2460 }
2461 }
2462
2463 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2465 else
2466 {
2467 unsigned int n;
2468 /*
2469 * InheritPixmap transparency
2470 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2472 {
2473 oldp = TermWin.parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n);
2476 XFree (list);
2477
2478 if (TermWin.parent[i] == display->root)
2479 {
2480 if (oldp != None)
2481 pchanged = 1;
2482
2483 break;
2484 }
2485
2486 if (oldp != TermWin.parent[i])
2487 pchanged = 1;
2488 }
2489
2490 n = 0;
2491
2492 if (pchanged)
2493 {
2494 for (; n < (unsigned int)i; n++)
2495 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2500 break;
2501 }
2502 }
2503 }
2504
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2506 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */
2511 }
2512 else
2513 {
2514#if WAIT_FOR_WM
2515 /* wait (an arbitrary period) for the WM to do its thing
2516 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1);
2518#endif
2519 for (n = 0; n < (unsigned int)i; n++)
2520 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]);
2523 }
2524
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2526 am_transparent = 1;
2527 }
2528
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None;
2531 }
2532
2533 if (scrollBar.win)
2534 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle ();
2537 scrollbar_show (0);
2538 }
2539
2540 if (am_transparent)
2541 {
2542 want_refresh = want_full_refresh = 1;
2543 if (am_pixmap_trans)
2544 flush ();
2545 }
2546
2547 return pchanged;
2548}
2549#endif
2550 2238
2551/*}}} */ 2239/*}}} */
2552 2240
2553bool 2241bool
2554rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2555{ 2243{
2556 bool flag = false; 2244 bool flag = false;
2557 unicode_t ch = NOCHAR; 2245 wchar_t ch = NOCHAR;
2558 unsigned char *seq_begin; // remember start of esc-sequence here 2246 char *seq_begin; // remember start of esc-sequence here
2559 2247
2560 for (;;) 2248 for (;;)
2561 { 2249 {
2562 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2563 { 2251 {
2564 seq_begin = cmdbuf_ptr; 2252 seq_begin = cmdbuf_ptr;
2565 ch = next_char (); 2253 ch = next_char ();
2566 }
2567 2254
2568 if (ch == NOCHAR) // TODO: improve 2255 if (ch == NOCHAR)
2569 break; 2256 break;
2257 }
2570 2258
2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2259 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2572 { 2260 {
2573 if (!seen_input) 2261 if (!seen_input)
2574 { 2262 {
… …
2578 // some window managers resize the window early, and these programs 2266 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2267 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2268 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2269 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2270 // resized.
2583 if (seen_resize) 2271 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2272 kill (-cmd_pid, SIGWINCH);
2585 } 2273 }
2586 2274
2587 /* Read a text string from the input buffer */ 2275 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2276 wchar_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2277 bool refreshnow = false;
2590 int nlines = 0; 2278 int nlines = 0;
2591 unicode_t *str = buf; 2279 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ);
2592 2281
2593 for (;;) 2282 for (;;)
2594 { 2283 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2284 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2285 break;
2597 2286
2598 *str++ = ch; 2287 *str++ = ch;
2599 2288
2600 if (ch == C0_LF) 2289 if (ch == C0_LF || str >= eol)
2601 { 2290 {
2291 if (ch == C0_LF)
2602 nlines++; 2292 nlines++;
2293
2603 refresh_count++; 2294 refresh_count++;
2604 2295
2605 if (!(options & Opt_jumpScroll) 2296 if (!option (Opt_jumpScroll)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2607 { 2298 {
2608 refreshnow = true; 2299 refreshnow = true;
2300 refresh_count = 0;
2609 ch = NOCHAR; 2301 ch = NOCHAR;
2610 break; 2302 break;
2611 } 2303 }
2612 2304
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2305 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2306 if (nlines >= nrow - 1)
2615 { 2307 {
2308 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2309 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2616 scr_add_lines (buf, nlines, str - buf); 2310 scr_add_lines (buf, str - buf, nlines);
2311
2617 nlines = 0; 2312 nlines = 0;
2618 str = buf; 2313 str = buf;
2314 eol = str + min (ncol, UBUFSIZ);
2619 } 2315 }
2620 }
2621 2316
2622 if (str >= buf + UBUFSIZ) 2317 if (str >= eol)
2623 { 2318 {
2319 if (eol >= buf + UBUFSIZ)
2320 {
2624 ch = NOCHAR; 2321 ch = NOCHAR;
2625 break; 2322 break;
2323 }
2324 else
2325 eol = min (eol + ncol, buf + UBUFSIZ);
2326 }
2327
2626 } 2328 }
2627 2329
2628 seq_begin = cmdbuf_ptr; 2330 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2331 ch = next_char ();
2630 } 2332 }
2631 2333
2334 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2632 scr_add_lines (buf, nlines, str - buf); 2336 scr_add_lines (buf, str - buf, nlines);
2633 2337
2634 /* 2338 /*
2635 * If there have been a lot of new lines, then update the screen 2339 * If there have been a lot of new lines, then update the screen
2636 * What the heck I'll cheat and only refresh less than every page-full. 2340 * What the heck I'll cheat and only refresh less than every page-full.
2637 * the number of pages between refreshes is refresh_limit, which 2341 * the number of pages between refreshes is refresh_limit, which
2638 * is incremented here because we must be doing flat-out scrolling. 2342 * is incremented here because we must be doing flat-out scrolling.
2639 */ 2343 */
2640 if (refreshnow) 2344 if (refreshnow)
2641 { 2345 {
2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643 refresh_limit++; 2347 refresh_limit++;
2644 else 2348 else
2645 { 2349 {
2646 flag = true; 2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2647 scr_refresh (refresh_type); 2352 scr_refresh ();
2353 want_refresh = 1;
2648 } 2354 }
2649 } 2355 }
2650 2356
2651 } 2357 }
2652 else 2358 else
… …
2667 } 2373 }
2668 2374
2669 return flag; 2375 return flag;
2670} 2376}
2671 2377
2672// read the next octet
2673unicode_t
2674rxvt_term::next_octet ()
2675{
2676 return cmdbuf_ptr < cmdbuf_endp
2677 ? *cmdbuf_ptr++
2678 : NOCHAR;
2679}
2680
2681// read the next character 2378// read the next character
2682unicode_t 2379wchar_t
2683rxvt_term::next_char () 2380rxvt_term::next_char () NOTHROW
2684{ 2381{
2685 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2686 { 2383 {
2687 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2688 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2689 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2690 2387
2691 wchar_t wc; 2388 wchar_t wc;
2692 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2693 2390
2694 if (len == (size_t)-2) 2391 if (len == (size_t)-2)
2695 { 2392 {
2696 // the mbstate stores incomplete sequences. didn't know this :/ 2393 // the mbstate stores incomplete sequences. didn't know this :/
2697 cmdbuf_ptr = cmdbuf_endp; 2394 cmdbuf_ptr = cmdbuf_endp;
2698 break; 2395 break;
2699 } 2396 }
2700 2397
2701 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2399 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2703 2400
2704 // assume wchar == unicode 2401 // assume wchar == unicode
2705 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
2706 return wc & UNICODE_MASK; 2403 return wc & UNICODE_MASK;
2707 } 2404 }
2708 2405
2709 return NOCHAR; 2406 return NOCHAR;
2710} 2407}
2408
2409// read the next octet
2410uint32_t
2411rxvt_term::next_octet () NOTHROW
2412{
2413 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR;
2416}
2417
2418static class out_of_input out_of_input;
2711 2419
2712/* rxvt_cmd_getc () - Return next input character */ 2420/* rxvt_cmd_getc () - Return next input character */
2713/* 2421/*
2714 * Return the next input character after first passing any keyboard input 2422 * Return the next input character after first passing any keyboard input
2715 * to the command. 2423 * to the command.
2716 */ 2424 */
2717unicode_t 2425wchar_t
2718rxvt_term::cmd_getc () 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2719{ 2427{
2720 unicode_t c = next_char (); 2428 wchar_t c = next_char ();
2721 2429
2722 if (c == NOCHAR) 2430 if (c == NOCHAR)
2723 throw out_of_input; 2431 throw out_of_input;
2724 2432
2725 return c; 2433 return c;
2726} 2434}
2727 2435
2728unicode_t 2436uint32_t
2729rxvt_term::cmd_get8 () 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2730{ 2438{
2731 unicode_t c = next_octet (); 2439 uint32_t c = next_octet ();
2732 2440
2733 if (c == NOCHAR) 2441 if (c == NOCHAR)
2734 throw out_of_input; 2442 throw out_of_input;
2735 2443
2736 return c; 2444 return c;
… …
2800 { 2508 {
2801 if ((buf[len++] = cmd_getc ()) == 'i') 2509 if ((buf[len++] = cmd_getc ()) == 'i')
2802 break; /* done = 1 */ 2510 break; /* done = 1 */
2803 } 2511 }
2804 } 2512 }
2805 2513
2806 for (i = 0; i < len; i++) 2514 for (i = 0; i < len; i++)
2807 if (putc (buf[i], fd) == EOF) 2515 if (putc (buf[i], fd) == EOF)
2808 { 2516 {
2809 done = 1; 2517 done = 1;
2810 break; 2518 break;
… …
2836 case C0_ESC: 2544 case C0_ESC:
2837 process_escape_seq (); 2545 process_escape_seq ();
2838 break; 2546 break;
2839 case C0_ENQ: /* terminal Status */ 2547 case C0_ENQ: /* terminal Status */
2840 if (rs[Rs_answerbackstring]) 2548 if (rs[Rs_answerbackstring])
2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2549 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2843 else 2550 else
2844 tt_write ((unsigned char *)VT100_ANS, 2551 tt_write (VT100_ANS, strlen (VT100_ANS));
2845 (unsigned int)strlen (VT100_ANS));
2846 break; 2552 break;
2847 case C0_BEL: /* bell */ 2553 case C0_BEL: /* bell */
2848 scr_bell (); 2554 scr_bell ();
2849 break; 2555 break;
2850 case C0_BS: /* backspace */ 2556 case C0_BS: /* backspace */
… …
2974 scr_charset_set (2, (unsigned int)cmd_getc ()); 2680 scr_charset_set (2, (unsigned int)cmd_getc ());
2975 break; 2681 break;
2976 case '+': 2682 case '+':
2977 scr_charset_set (3, (unsigned int)cmd_getc ()); 2683 scr_charset_set (3, (unsigned int)cmd_getc ());
2978 break; 2684 break;
2979#if ENABLE_FRILLS 2685#if !ENABLE_MINIMAL
2980 case '6': 2686 case '6':
2981 scr_backindex (); 2687 scr_backindex ();
2982 break; 2688 break;
2983#endif 2689#endif
2984 case '7': 2690 case '7':
2985 scr_cursor (SAVE); 2691 scr_cursor (SAVE);
2986 break; 2692 break;
2987 case '8': 2693 case '8':
2988 scr_cursor (RESTORE); 2694 scr_cursor (RESTORE);
2989 break; 2695 break;
2990#if ENABLE_FRILLS 2696#if !ENABLE_MINIMAL
2991 case '9': 2697 case '9':
2992 scr_forwardindex (); 2698 scr_forwardindex ();
2993 break; 2699 break;
2994#endif 2700#endif
2995 case '=': 2701 case '=':
… …
3005 break; 2711 break;
3006 2712
3007 /* 8.3.87: NEXT LINE */ 2713 /* 8.3.87: NEXT LINE */
3008 case C1_NEL: /* ESC E */ 2714 case C1_NEL: /* ESC E */
3009 { 2715 {
3010 unicode_t nlcr[] = { C0_LF, C0_CR }; 2716 wchar_t nlcr[] = { C0_LF, C0_CR };
3011 scr_add_lines (nlcr, 1, 2); 2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3012 } 2718 }
3013 break; 2719 break;
3014 2720
3015 /* kidnapped escape sequence: Should be 8.3.48 */ 2721 /* kidnapped escape sequence: Should be 8.3.48 */
3016 case C1_ESA: /* ESC G */ 2722 case C1_ESA: /* ESC G */
… …
3038 process_dcs_seq (); 2744 process_dcs_seq ();
3039 break; 2745 break;
3040 2746
3041 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3042 case C1_SCI: /* ESC Z */ 2748 case C1_SCI: /* ESC Z */
3043 tt_write ((const unsigned char *)ESCZ_ANSWER, 2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3044 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3045 break; /* steal obsolete ESC [ c */ 2750 break; /* steal obsolete ESC [ c */
3046 2751
3047 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3048 case C1_CSI: /* ESC [ */ 2753 case C1_CSI: /* ESC [ */
3049 process_csi_seq (); 2754 process_csi_seq ();
… …
3158 ndef = get_byte_array_bit (csi_defaults, i); 2863 ndef = get_byte_array_bit (csi_defaults, i);
3159 for (p = 0; p < nargs; p++) 2864 for (p = 0; p < nargs; p++)
3160 if (arg[p] == -1) 2865 if (arg[p] == -1)
3161 arg[p] = ndef; 2866 arg[p] = ndef;
3162 2867
3163#ifdef DEBUG_CMD
3164 fprintf (stderr, "CSI ");
3165 for (p = 0; p < nargs; p++)
3166 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3167 fprintf (stderr, "%c\n", ch);
3168#endif
3169
3170 /* 2868 /*
3171 * private mode handling 2869 * private mode handling
3172 */ 2870 */
3173 if (priv) 2871 if (priv)
3174 { 2872 {
3175 switch (priv) 2873 switch (priv)
3176 { 2874 {
3177 case '>': 2875 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 2876 if (ch == CSI_DA) /* secondary device attributes */
2877 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2883 // that we do not support xterm mouse reporting (should be 95 when we do).
2884 //
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2885 tt_printf ("\033[>%d;94;0c", 'U');
2886 }
3180 break; 2887 break;
3181 case '?': 2888 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 2890 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 2891 break;
… …
3289 2996
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2997 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 2998 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 2999 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3000 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3001 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 3002 break;
3296 3003
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3004 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 3005 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3299 (unsigned int) (sizeof (VT100_ANS) - 1));
3300 break; 3006 break;
3301 3007
3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3008 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3303 process_sgr_mode (nargs, arg); 3009 process_sgr_mode (nargs, arg);
3304 break; 3010 break;
… …
3311 break; 3017 break;
3312 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3313 scr_report_position (); 3019 scr_report_position ();
3314 break; 3020 break;
3315 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3316 if (options & Opt_insecure) 3022 if (option (Opt_insecure))
3317 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318 break; 3024 break;
3319 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321 break; 3027 break;
… …
3388 break; 3094 break;
3389 case CSI_75: 3095 case CSI_75:
3390 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
3391 break; 3097 break;
3392 3098
3393#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3394 case CSI_74: 3100 case CSI_74:
3395 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
3396 break; 3102 break;
3397#endif 3103#endif
3398 3104
… …
3405 break; 3111 break;
3406 } 3112 }
3407} 3113}
3408/*}}} */ 3114/*}}} */
3409 3115
3410#if ENABLE_FRILLS 3116#if !ENABLE_MINIMAL
3411/* ARGSUSED */ 3117/* ARGSUSED */
3412void 3118void
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3120{
3415 int x, y; 3121 int x, y;
3416 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
3417 Window wdummy; 3123 Window wdummy;
3124
3125 dLocal (Display *, dpy);
3418 3126
3419 if (nargs == 0) 3127 if (nargs == 0)
3420 return; 3128 return;
3421 3129
3422 switch (args[0]) 3130 switch (args[0])
3423 { 3131 {
3424 /* 3132 /*
3425 * commands 3133 * commands
3426 */ 3134 */
3427 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3136 XMapWindow (dpy, parent[0]);
3429 break; 3137 break;
3430 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3139 XIconifyWindow (dpy, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3140 break;
3434 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent[0], args[1], args[2]);
3436 break; 3143 break;
3437 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3146 break;
3440 case 5: /* raise window */ 3147 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3148 XRaiseWindow (dpy, parent[0]);
3442 break; 3149 break;
3443 case 6: /* lower window */ 3150 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3151 XLowerWindow (dpy, parent[0]);
3445 break; 3152 break;
3446 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3447 scr_touch (true); 3154 scr_touch (true);
3448 break; 3155 break;
3449 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3157 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3158 (unsigned int) (args[1] * fheight));
3452 break; 3159 break;
3453 3160
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3162 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3164 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3165 (unsigned int) (args[1] * fheight));
3459 break; 3166 break;
3460
3461 3167
3462 /* 3168 /*
3463 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3464 */ 3170 */
3465 case 11: /* report window state */ 3171 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3174 break;
3469 case 13: /* report window position */ 3175 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3181 break;
3476 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3185 break;
3480 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3188 break;
3483 case 19: /* report window size (chars) */ 3189 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3191 break;
3486 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3487 { 3193 {
3488 char *s; 3194 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3195 XGetIconName (dpy, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3197 XFree (s);
3492 } 3198 }
3493 break; 3199 break;
3494 case 21: /* report window title */ 3200 case 21: /* report window title */
3495 { 3201 {
3496 char *s; 3202 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3203 XFetchName (dpy, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3205 XFree (s);
3500 } 3206 }
3501 break; 3207 break;
3502 } 3208 }
3503} 3209}
… …
3506/*----------------------------------------------------------------------*/ 3212/*----------------------------------------------------------------------*/
3507/* 3213/*
3508 * get input up until STRING TERMINATOR (or BEL) 3214 * get input up until STRING TERMINATOR (or BEL)
3509 * ends_how is terminator used. returned input must be free()'d 3215 * ends_how is terminator used. returned input must be free()'d
3510 */ 3216 */
3511unsigned char * 3217char *
3512rxvt_term::get_to_st (unicode_t &ends_how) 3218rxvt_term::get_to_st (unicode_t &ends_how)
3513{ 3219{
3514 unicode_t ch; 3220 unicode_t ch;
3515 bool seen_esc = false; 3221 bool seen_esc = false;
3516 unsigned int n = 0; 3222 unsigned int n = 0;
… …
3530 seen_esc = true; 3236 seen_esc = true;
3531 continue; 3237 continue;
3532 } 3238 }
3533 else if (ch == C0_BEL || ch == CHAR_ST) 3239 else if (ch == C0_BEL || ch == CHAR_ST)
3534 break; 3240 break;
3241 else if (ch == C0_SYN)
3242 ch = cmd_get8 ();
3535 else if (ch < 0x20) 3243 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
3537 3245
3538 seen_esc = false; 3246 seen_esc = false;
3539 3247
3540 if (n >= sizeof (string) - 1) 3248 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3249 // stop at some sane length
3542 return NULL; 3250 return NULL;
3543 3251
3544 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 ();
3546 else
3547 string[n++] = ch; 3252 string[n++] = ch;
3548 } 3253 }
3549 3254
3550 string[n++] = '\0'; 3255 string[n++] = '\0';
3551 3256
3552 ends_how = (ch == 0x5c ? C0_ESC : ch); 3257 ends_how = (ch == 0x5c ? C0_ESC : ch);
3553 3258
3554 return (unsigned char *)rxvt_wcstombs (string); 3259 return rxvt_wcstombs (string);
3555} 3260}
3556 3261
3557/*----------------------------------------------------------------------*/ 3262/*----------------------------------------------------------------------*/
3558/* 3263/*
3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3560 */ 3265 */
3561void 3266void
3562rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
3563{ 3268{
3564 unsigned char *s; 3269 char *s;
3565 unicode_t eh; 3270 unicode_t eh;
3566 3271
3567 /* 3272 /*
3568 * Not handled yet 3273 * Not handled yet
3569 */ 3274 */
… …
3588 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3293 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3589 arg = arg * 10 + (ch - '0'); 3294 arg = arg * 10 + (ch - '0');
3590 3295
3591 if (ch == ';') 3296 if (ch == ';')
3592 { 3297 {
3593 unsigned char *s = get_to_st (eh); 3298 char *s = get_to_st (eh);
3594 3299
3595 if (s) 3300 if (s)
3596 { 3301 {
3597 process_xterm_seq (arg, (char *)s, eh); 3302 process_xterm_seq (arg, s, eh);
3598 free (s); 3303 free (s);
3599 } 3304 }
3600 } 3305 }
3601} 3306}
3602 3307
3603void 3308void
3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3309rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3605{ 3310{
3606 if (str[0] == '?' && !str[1]) 3311 if (str[0] == '?' && !str[1])
3607 { 3312 {
3608 unsigned short r, g, b; 3313 rgba c;
3609 pix_colors_focused[color].get (display, r, g, b); 3314 pix_colors_focused[color].get (c);
3315
3316#if XFT
3317 if (c.a != rgba::MAX_CC)
3318 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3319 else
3320#endif
3610 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3321 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3611 } 3322 }
3612 else 3323 else
3613 set_window_color (color, str); 3324 set_window_color (color, str);
3614} 3325}
3615 3326
3616/* 3327/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3618 * 0 = change iconName/title
3619 * 1 = change iconName
3620 * 2 = change title
3621 * 4 = change color
3622 * 10 = change fg color
3623 * 11 = change bg color
3624 * 12 = change text color
3625 * 13 = change mouse foreground color
3626 * 17 = change highlight character colour
3627 * 18 = change bold character color
3628 * 19 = change underlined character color
3629 * 46 = change logfile (not implemented)
3630 * 50 = change font
3631 *
3632 * rxvt extensions:
3633 * 20 = bg pixmap
3634 * 39 = change default fg color
3635 * 49 = change default bg color
3636 * 55 = dump scrollback buffer and all of screen
3637 * 701 = change locale
3638 * 702 = find font
3639 * 703 = menu
3640 */ 3329 */
3641void 3330void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3331rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3643{ 3332{
3644 int changed = 0;
3645 int color; 3333 int color;
3646 char *buf, *name; 3334 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3335 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3336 int saveop = op;
3649 3337
3338 dLocal (Display *, dpy);
3339
3650 assert (str != NULL); 3340 assert (str != NULL);
3341
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return;
3344
3651 switch (op) 3345 switch (op)
3652 { 3346 {
3653 case XTerm_name: 3347 case XTerm_name:
3654 set_title (str); 3348 set_title (str);
3655 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
… …
3669 unsigned long bytes_after; 3363 unsigned long bytes_after;
3670 unsigned char *value = 0; 3364 unsigned char *value = 0;
3671 const char *str = ""; 3365 const char *str = "";
3672 3366
3673 if (prop 3367 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3368 && XGetWindowProperty (dpy, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3369 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3370 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3371 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3372 && actual_type != None
3679 && actual_format == 8) 3373 && actual_format == 8)
3680 str = (const char *)(value); 3374 str = (const char *)(value);
3681 3375
3682 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3376 tt_printf ("\033]%d;%s%c", op, str, resp);
3683 3377
3684 XFree (value); 3378 XFree (value);
3685 } 3379 }
3686 else 3380 else
3687 { 3381 {
… …
3691 { 3385 {
3692 *eq = 0; 3386 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3387 set_utf8_property (display->atom (str), eq + 1);
3694 } 3388 }
3695 else 3389 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3390 XDeleteProperty (dpy, parent[0],
3697 display->atom (str)); 3391 display->atom (str));
3698 } 3392 }
3699 break; 3393 break;
3700 3394
3701 case XTerm_Color: 3395 case XTerm_Color:
… …
3703 { 3397 {
3704 if ((name = strchr (buf, ';')) == NULL) 3398 if ((name = strchr (buf, ';')) == NULL)
3705 break; 3399 break;
3706 3400
3707 *name++ = '\0'; 3401 *name++ = '\0';
3708 color = atoi (buf); 3402 color = atoi (buf) + minCOLOR;
3709 3403
3710 if (color < 0 || color >= TOTAL_COLORS) 3404 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3711 break; 3405 break;
3712 3406
3713 if ((buf = strchr (name, ';')) != NULL) 3407 if ((buf = strchr (name, ';')) != NULL)
3714 *buf++ = '\0'; 3408 *buf++ = '\0';
3715 3409
3716 if (name[0] == '?' && !name[1]) 3410 process_color_seq (op, color, name, resp);
3717 {
3718 unsigned short r, g, b;
3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3720 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3721 }
3722 else
3723 set_window_color (color + minCOLOR, name);
3724 } 3411 }
3725 break; 3412 break;
3726 case XTerm_Color00: 3413 case XTerm_Color00:
3727 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3414 process_color_seq (op, Color_fg, str, resp);
3728 break; 3415 break;
3729 case XTerm_Color01: 3416 case XTerm_Color01:
3730 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3731 break; 3418 break;
3732#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3733 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3421 process_color_seq (op, Color_cursor, str, resp);
3735 break; 3422 break;
3736#endif 3423#endif
3737 case XTerm_Color_pointer_fg: 3424 case XTerm_Color_pointer_fg:
3738 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3739 break; 3426 break;
3740 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3741 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3742 break; 3429 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3744 case XTerm_Color_BD:
3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3750 case XTerm_Color_UL:
3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752 break;
3753 case XTerm_Color_RV: 3431 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3432 process_color_seq (op, Color_RV, str, resp);
3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp);
3437 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp);
3441 break;
3442 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp);
3755 break; 3444 break;
3756#endif 3445#endif
3757#if TRANSPARENT && TINTING 3446#if TRANSPARENT && TINTING
3758 case XTerm_Color_tint: 3447 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3448 process_color_seq (op, Color_tint, str, resp);
3449
3760 check_our_parents (); 3450 check_our_parents ();
3451
3761 if (am_transparent) 3452 if (am_transparent)
3762 want_full_refresh = want_refresh = 1; 3453 want_full_refresh = want_refresh = 1;
3763 break;
3764#endif
3765 3454
3455 break;
3456#endif
3457
3766 case XTerm_Pixmap: 3458 case Rxvt_Pixmap:
3459 {
3767 if (*str != ';') 3460 if (*str != ';')
3768 { 3461 {
3769#if XPM_BACKGROUND 3462#if XPM_BACKGROUND
3770 scale_pixmap (""); /* reset to default scaling */ 3463 scale_pixmap (""); /* reset to default scaling */
3771 set_bgPixmap (str); /* change pixmap */ 3464 set_bgPixmap (str); /* change pixmap */
3772#endif
3773 scr_touch (true); 3465 scr_touch (true);
3466#endif
3774 } 3467 }
3468
3469 int changed = 0;
3470
3775 while ((str = strchr (str, ';')) != NULL) 3471 while ((str = strchr (str, ';')) != NULL)
3776 { 3472 {
3777 str++; 3473 str++;
3778#if XPM_BACKGROUND 3474#if XPM_BACKGROUND
3779 changed += scale_pixmap (str); 3475 changed += scale_pixmap (str);
3780#endif 3476#endif
3781
3782 } 3477 }
3478
3783 if (changed) 3479 if (changed)
3784 { 3480 {
3785#ifdef XPM_BACKGROUND 3481#ifdef XPM_BACKGROUND
3786 resize_pixmap (); 3482 resize_pixmap ();
3787#endif
3788 scr_touch (true); 3483 scr_touch (true);
3484#endif
3789 } 3485 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 }
3790 break; 3491 break;
3791 3492
3792 case XTerm_restoreFG: 3493 case Rxvt_restoreFG:
3793 set_window_color (Color_fg, str); 3494 set_window_color (Color_fg, str);
3794 break; 3495 break;
3795 case XTerm_restoreBG: 3496 case Rxvt_restoreBG:
3796 set_window_color (Color_bg, str); 3497 set_window_color (Color_bg, str);
3797 break; 3498 break;
3798 3499
3799 case XTerm_logfile: 3500 case XTerm_logfile:
3800 // TODO, when secure mode? 3501 // TODO, when secure mode?
3801 break; 3502 break;
3802 3503
3504#if 0
3505 case Rxvt_dumpscreen: /* no error notices */
3506 {
3507 int fd;
3508 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3509 {
3510 scr_dump (fd);
3511 close (fd);
3512 }
3513 }
3514 break;
3515#endif
3803 case XTerm_font: 3516 case XTerm_font:
3804 op = URxvt_font; 3517 op = URxvt_font;
3805 case URxvt_font: 3518 case URxvt_font:
3806#if ENABLE_STYLES 3519#if ENABLE_STYLES
3807 case URxvt_boldFont: 3520 case URxvt_boldFont:
3808 case URxvt_italicFont: 3521 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3522 case URxvt_boldItalicFont:
3810#endif 3523#endif
3811 if (query) 3524 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3525 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3526 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3527 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3528 resp);
3816 else 3529 else
3817 { 3530 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3531 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3532
… …
3821 allocated.push_back ((void *)res); 3534 allocated.push_back ((void *)res);
3822 set_fonts (); 3535 set_fonts ();
3823 } 3536 }
3824 break; 3537 break;
3825 3538
3826#if ENABLE_FRILLS 3539 case URxvt_version:
3827 case XTerm_locale:
3828 if (query) 3540 if (query)
3541 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3542 op,
3543 rs[Rs_name], VERSION[0], VERSION[2],
3544 resp);
3545 break;
3546
3547#if !ENABLE_MINIMAL
3548 case URxvt_locale:
3549 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3550 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3830 else 3551 else
3831 { 3552 {
3832 set_locale (str); 3553 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 3554 pty->set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 3555 init_xlocale ();
3836# endif
3837 } 3556 }
3838 break; 3557 break;
3839#endif
3840 3558
3841#ifdef MENUBAR 3559 case URxvt_view_up:
3842 case XTerm_Menu: 3560 case URxvt_view_down:
3843 if (options & Opt_insecure) 3561 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3562 int lines = atoi (str);
3563
3564 if (lines)
3565 scr_page (op == URxvt_view_up ? UP : DN, lines);
3566 else
3567 scr_erase_savelines ();
3568 }
3569
3845 break; 3570 break;
3846#endif 3571#endif
3847#if 0 3572
3848 case XTerm_dumpscreen: /* no error notices */ 3573#if ENABLE_PERL
3849 { 3574 case URxvt_perl:
3850 int fd; 3575 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3576 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 3577 break;
3858#endif 3578#endif
3859 } 3579 }
3860} 3580}
3861/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
… …
3892 return state; 3612 return state;
3893} 3613}
3894 3614
3895/* we're not using priv _yet_ */ 3615/* we're not using priv _yet_ */
3896void 3616void
3897rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3617rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3898{ 3618{
3899 unsigned int i, j; 3619 unsigned int i, j;
3900 int state; 3620 int state;
3901 3621
3902 static const struct 3622 static const struct
… …
3913 { 5, PrivMode_rVideo }, 3633 { 5, PrivMode_rVideo },
3914 { 6, PrivMode_relOrigin }, 3634 { 6, PrivMode_relOrigin },
3915 { 7, PrivMode_Autowrap }, 3635 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode 3636 // 8, bi-directional support mode
3917 { 9, PrivMode_MouseX10 }, 3637 { 9, PrivMode_MouseX10 },
3918#ifdef menuBar_esc
3919 { menuBar_esc, PrivMode_menuBar },
3920#endif
3921 // 18, 19 printing-related 3638 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor }, 3639 { 25, PrivMode_VisibleCursor },
3923#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
3924 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
3925#endif 3642#endif
… …
3970 } 3687 }
3971 3688
3972 /* extra handling for values with state unkept */ 3689 /* extra handling for values with state unkept */
3973 switch (arg[i]) 3690 switch (arg[i])
3974 { 3691 {
3692#if ENABLE_STYLES
3693 case 1021:
3694 set_option (Opt_intensityStyles, mode);
3695
3696 scr_touch (true);
3697 break;
3698#endif
3975 case 1048: /* alternative cursor save */ 3699 case 1048: /* alternative cursor save */
3976 case 1049: 3700 case 1049:
3977 if (options & Opt_secondaryScreen) 3701 if (option (Opt_secondaryScreen))
3978 if (mode == 0) 3702 if (mode == 0)
3979 scr_cursor (RESTORE); 3703 scr_cursor (RESTORE);
3980 else if (mode == 1) 3704 else if (mode == 1)
3981 scr_cursor (SAVE); 3705 scr_cursor (SAVE);
3982 break; 3706 break;
… …
3994 */ 3718 */
3995 PrivMode (1, PrivMode_vt52); 3719 PrivMode (1, PrivMode_vt52);
3996 break; 3720 break;
3997 case 3: /* 80/132 */ 3721 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 3722 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3723 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 3724 break;
4001 case 4: /* smooth scrolling */ 3725 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 3726 set_option (Opt_jumpScroll, !state);
4006 break; 3727 break;
4007 case 5: /* reverse video */ 3728 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 3729 scr_rvideo_mode (state);
4009 break; 3730 break;
4010 case 6: /* relative/absolute origins */ 3731 case 6: /* relative/absolute origins */
… …
4016 /* case 8: - auto repeat, can't do on a per window basis */ 3737 /* case 8: - auto repeat, can't do on a per window basis */
4017 case 9: /* X10 mouse reporting */ 3738 case 9: /* X10 mouse reporting */
4018 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
4019 priv_modes &= ~PrivMode_MouseX11; 3740 priv_modes &= ~PrivMode_MouseX11;
4020 break; 3741 break;
4021#ifdef menuBar_esc
4022 case menuBar_esc:
4023#ifdef MENUBAR
4024 map_menuBar (state);
4025#endif
4026 break;
4027#endif
4028#ifdef scrollBar_esc 3742#ifdef scrollBar_esc
4029 case scrollBar_esc: 3743 case scrollBar_esc:
4030 if (scrollbar_mapping (state)) 3744 if (scrollbar_mapping (state))
4031 { 3745 {
4032 resize_all_windows (0, 0, 0); 3746 resize_all_windows (0, 0, 0);
… …
4051#if 0 3765#if 0
4052 case 1001: 3766 case 1001:
4053 break; /* X11 mouse highlighting */ 3767 break; /* X11 mouse highlighting */
4054#endif 3768#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 3769 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 3770 set_option (Opt_scrollTtyOutput, !state);
4060 break; 3771 break;
4061 case 1011: /* scroll to bottom on key press */ 3772 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 3773 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 3774 break;
4067 case 1047: /* secondary screen w/ clearing last */ 3775 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 3776 if (option (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 3778 scr_erase_screen (2);
4071 scr_change_screen (state); 3779 scr_change_screen (state);
4072 break; 3780 break;
4073 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 3782 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 3783 if (option (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 3784 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 3785 scr_erase_screen (2);
4078 break; 3786 break;
4079 default: 3787 default:
4080 break; 3788 break;
… …
4208 scr_color (Color_bg, Color_bg); 3916 scr_color (Color_bg, Color_bg);
4209 break; 3917 break;
4210 3918
4211 //case 50: // not variable spacing 3919 //case 50: // not variable spacing
4212 3920
4213#ifndef NO_BRIGHTCOLOR 3921#if !ENABLE_MINIMAL
4214 case 90: 3922 case 90:
4215 case 91: /* set bright fg color */ 3923 case 91: /* set bright fg color */
4216 case 92: 3924 case 92:
4217 case 93: 3925 case 93:
4218 case 94: 3926 case 94:
… …
4230 case 106: 3938 case 106:
4231 case 107: 3939 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3940 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 3941 break;
4234#endif 3942#endif
4235
4236 } 3943 }
4237 } 3944 }
4238} 3945}
4239/*}}} */ 3946/*}}} */
4240 3947
… …
4264 */ 3971 */
4265void 3972void
4266rxvt_term::tt_printf (const char *fmt,...) 3973rxvt_term::tt_printf (const char *fmt,...)
4267{ 3974{
4268 va_list arg_ptr; 3975 va_list arg_ptr;
4269 unsigned char buf[256]; 3976 char buf[256];
4270 3977
4271 va_start (arg_ptr, fmt); 3978 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3979 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 3980 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 3981 tt_write (buf, strlen (buf));
… …
4279 * or generated by us in response to a query ESC sequence. 3986 * or generated by us in response to a query ESC sequence.
4280 */ 3987 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3988const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282 3989
4283void 3990void
4284rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3991rxvt_term::tt_write (const char *data, unsigned int len)
4285{ 3992{
3993 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3994 return;
3995
3996 if (pty->pty < 0)
3997 return;
3998
4286 if (v_buflen == 0) 3999 if (v_buflen == 0)
4287 { 4000 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4001 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4289 4002
4290 if ((unsigned int)written == len) 4003 if ((unsigned int)written == len)
4291 return; 4004 return;
4292 4005
4293 data += written; 4006 data += written;
4294 len -= written; 4007 len -= written;
4295 } 4008 }
4296 4009
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4298 4011
4299 memcpy (v_buffer + v_buflen, data, len); 4012 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len; 4013 v_buflen += len;
4301 4014
4302 pty_ev.set (EVENT_READ | EVENT_WRITE); 4015 pty_ev.set (EVENT_READ | EVENT_WRITE);
4303} 4016}
4304 4017
4305void rxvt_term::pty_write () 4018void rxvt_term::pty_write ()
4306{ 4019{
4307 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4308 4021
4309 if (written > 0) 4022 if (written > 0)
4310 { 4023 {
4311 v_buflen -= written; 4024 v_buflen -= written;
4312 4025
… …
4321 } 4034 }
4322 4035
4323 memmove (v_buffer, v_buffer + written, v_buflen); 4036 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 4037 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 4039 pty_ev.set (EVENT_READ);
4327 destroy ();
4328} 4040}
4329 4041
4330/*----------------------- end-of-file (C source) -----------------------*/ 4042/*----------------------- end-of-file (C source) -----------------------*/
4331 4043

Diff Legend

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