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.227 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.464 by sf-exg, Tue Dec 14 08:01:51 2010 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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 56# include "keyboard.h"
60#endif 57#endif
61 58
62#include <csignal> 59#include <csignal>
63 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 68
71#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
72 70
73#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
98 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
99 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
100 98
101 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
102 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
105 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
106 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
107 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
108 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 144 return;
148 145
149 for (;;) 146 for (;;)
150 { 147 {
151 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
152 149
153 text_t t = l.t[x]; 150 text_t t = l.t[x];
154 151
155 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
156 { 153 {
… …
165 162
166void 163void
167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
168{ 165{
169 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
170 rxvt_font *f = (*fs)[fs->find_font (ch)];
171 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
172 int len; 168 int len;
173
174 fname = rxvt_utf8towcs (f->name);
175 169
176# if ENABLE_COMBINING 170# if ENABLE_COMBINING
177 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
178 { 172 {
179 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
200 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
201 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
202 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
203 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
204 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
205 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
206 207
207 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
208 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
209 210
210 if (y >= 0) 211 if (y >= 0)
211 { 212 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0; 214 x = 0;
214 } 215 }
215 216
216 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
217 218
218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
219 220
220 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
221 { 222 {
… …
224 ch = *chr++; 225 ch = *chr++;
225 226
226 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
227 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
228 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
229# if !UNICODE3 230# if !UNICODE_3
230 if (ch >= 0x10000) 231 if (ch >= 0x10000)
231 ch = 0xfffd; 232 ch = 0xfffd;
232# endif 233# endif
233 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
235
236 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 237 scr_overlay_set (12, y, NOCHAR, r);
235 } 238 }
236 239
240// {
241// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf);
244// }
237 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
238 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
239
240 free (fname); 249 free (fname[i]);
250 }
241 251
242# if ENABLE_COMBINING 252# if ENABLE_COMBINING
243 if (alloc) 253 if (alloc)
244 delete [] alloc; 254 delete [] alloc;
245# endif 255# endif
… …
267 mb[0] = ch[0]; 277 mb[0] = ch[0];
268 len = 1; 278 len = 1;
269 } 279 }
270 280
271 if (len > 0) 281 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 282 tt_write (mb, len);
273 else 283 else
274 scr_bell (); 284 scr_bell ();
275 } 285 }
276 286
277 iso14755buf = 0; 287 iso14755buf = 0;
278} 288}
279 289
280int 290static int
281rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
282{ 292{
283 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
284 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
285 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
286 { 296 {
287 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
288 298
… …
294 304
295 return -1; 305 return -1;
296} 306}
297#endif 307#endif
298 308
299/*{{{ Convert the keypress event into a string */ 309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
300void 404void
301rxvt_term::lookup_key (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
302{ 406{
303 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
304 unsigned int newlen;
305 KeySym keysym; 408 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 409 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
411
412#if ISO_14755
413 if (iso14755buf & ISO_14755_52)
414 return;
415#endif
311 416
312 /* 417 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 418 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 419 * escape sequence to toggle the Keypad.
315 * 420 *
… …
317 */ 422 */
318 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
319 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
320 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
321 426
322 if (numlock_state || (ev.state & ModNumLockMask))
323 {
324 numlock_state = (ev.state & ModNumLockMask);
325 PrivMode ((!numlock_state), PrivMode_aplKP);
326 }
327
328 kbuf[0] = 0; 427 kbuf[0] = 0;
329 428
330#ifdef USE_XIM 429#ifdef USE_XIM
331 if (Input_Context) 430 if (Input_Context)
332 { 431 {
333 Status status_return; 432 Status status_return;
334 433
335#if 0 434#if 0
336#ifdef X_HAVE_UTF8_STRING 435#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 436 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 437 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 438 KBUFSZ, &keysym, &status_return);
340 else 439 else
341#endif 440#endif
342#endif 441#endif
343 { 442 {
… …
380 || status_return == XLookupBoth; 479 || status_return == XLookupBoth;
381 } 480 }
382 else 481 else
383#endif 482#endif
384 { 483 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 485 valid_keysym = keysym != NoSymbol;
387 } 486 }
388 487
389 if (valid_keysym) 488 if (valid_keysym)
390 { 489 {
… …
406#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
407 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
408#else 507#else
409 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
410#endif 509#endif
510 max_it (lnsppg, 1);
511
411 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
412 { 513 {
413 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
414 return; 515 return;
415 } 516 }
… …
442 scr_move_to (0, 1); 543 scr_move_to (0, 1);
443 return; 544 return;
444 } 545 }
445 else if (keysym == XK_End) 546 else if (keysym == XK_End)
446 { 547 {
447 scr_move_to (1, 0); 548 scr_move_to (1, 1);
448 return; 549 return;
449 } 550 }
450 } 551 }
451#endif 552#endif
452 } 553 }
… …
463 { 564 {
464 switch (keysym) 565 switch (keysym)
465 { 566 {
466 /* normal XTerm key bindings */ 567 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 568 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 569 selection_request (ev.time);
469 return; 570 return;
470#if TODO 571#if TODO
471 /* rxvt extras */ 572 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 574 change_font (FONT_UP);
… …
480 } 581 }
481 } 582 }
482 583
483#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
484 // ISO 14755 support 585 // ISO 14755 support
485 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
486 { 587 {
487 int hv; 588 int hv;
488 589
489 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
490 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
492 { 593 {
493 commit_iso14755 (); 594 commit_iso14755 ();
494 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
495# if ISO_14755 596# if ISO_14755
496 iso14755_51 (0); 597 iso14755_51 (0);
598# endif
599 return;
600 }
601 else if (keysym == XK_BackSpace)
602 {
603 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
604# if ISO_14755
605 iso14755_51 (iso14755buf & ISO_14755_MASK);
497# endif 606# endif
498 return; 607 return;
499 } 608 }
500 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
501 { 610 {
… …
506# endif 615# endif
507 return; 616 return;
508 } 617 }
509 else 618 else
510 { 619 {
511# if ENABLE_OVERLAY 620# if ISO_14755
512 scr_overlay_off (); 621 scr_overlay_off ();
513# endif 622# endif
514 iso14755buf = 0; 623 iso14755buf = 0;
515 } 624 }
516 } 625 }
626 else if (option (Opt_iso14755) &&
517 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
518 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
519 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
520 { 630 {
521 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
522# if ENABLE_OVERLAY 632# if ISO_14755
523 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
524 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
525# endif 635# endif
526 } 636 }
527#endif 637#endif
528 638
529#ifdef PRINTPIPE 639#ifdef PRINTPIPE
530 if (keysym == XK_Print) 640 if (keysym == XK_Print)
531 { 641 {
532 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
533 return; 643 return;
534 } 644 }
535#endif 645#endif
536 646
537 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
538 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
539 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
540 newlen = 1; 689 newlen = 0;
541 switch (keysym) 690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
542 { 773 {
543#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
544 case XK_BackSpace: 775 if (param > 0)
545 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
546 {
547 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
548 ^ !!ctrl) ? '\b' : '\177';
549 kbuf[1] = '\0';
550 }
551 else 777 else
552 strcpy (kbuf, key_backspace);
553 break;
554#endif
555#ifndef NO_DELETE_KEY
556# ifdef XK_KP_Prior
557 case XK_KP_Delete:
558 /* allow shift to override */
559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
560 {
561 strcpy (kbuf, "\033On");
562 break;
563 }
564 /* FALLTHROUGH */
565# endif
566 case XK_Delete:
567 strcpy (kbuf, key_delete);
568 break;
569#endif
570 case XK_Tab:
571 if (shft)
572 strcpy (kbuf, "\033[Z");
573 else
574 {
575#ifdef CTRL_TAB_MAKES_META
576 if (ctrl)
577 meta = 1;
578#endif
579#ifdef MOD4_TAB_MAKES_META
580 if (ev.state & Mod4Mask)
581 meta = 1;
582#endif
583 newlen = 0;
584 }
585 break;
586
587#ifdef XK_KP_Left
588 case XK_KP_Up: /* \033Ox or standard */
589 case XK_KP_Down: /* \033Or or standard */
590 case XK_KP_Right: /* \033Ov or standard */
591 case XK_KP_Left: /* \033Ot or standard */
592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
593 {
594 strcpy (kbuf, "\033OZ");
595 kbuf[2] = "txvr"[keysym - XK_KP_Left];
596 break;
597 }
598 else
599 /* translate to std. cursor key */
600 keysym = XK_Left + (keysym - XK_KP_Left);
601 /* FALLTHROUGH */
602#endif
603 case XK_Up: /* "\033[A" */
604 case XK_Down: /* "\033[B" */
605 case XK_Right: /* "\033[C" */
606 case XK_Left: /* "\033[D" */
607 strcpy (kbuf, "\033[Z");
608 kbuf[2] = "DACB"[keysym - XK_Left];
609 /* do Shift first */
610 if (shft)
611 kbuf[2] = "dacb"[keysym - XK_Left];
612 else if (ctrl)
613 {
614 kbuf[1] = 'O';
615 kbuf[2] = "dacb"[keysym - XK_Left];
616 }
617 else if (priv_modes & PrivMode_aplCUR)
618 kbuf[1] = 'O';
619 break;
620
621#ifndef UNSHIFTED_SCROLLKEYS
622# ifdef XK_KP_Prior
623 case XK_KP_Prior:
624 /* allow shift to override */
625 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
626 {
627 strcpy (kbuf, "\033Oy");
628 break;
629 }
630 /* FALLTHROUGH */
631# endif
632 case XK_Prior:
633 strcpy (kbuf, "\033[5~");
634 break;
635# ifdef XK_KP_Next
636 case XK_KP_Next:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Os");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Next:
646 strcpy (kbuf, "\033[6~");
647 break;
648#endif
649 case XK_KP_Enter:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033OM");
654 break;
655 }
656
657 /* FALLTHROUGH */
658
659 case XK_Return:
660 if (priv_modes & PrivMode_LFNL)
661 {
662 kbuf[0] = '\015';
663 kbuf[1] = '\012';
664 kbuf[2] = '\0';
665 }
666 else
667 {
668 kbuf[0] = '\015';
669 kbuf[1] = '\0';
670 }
671 break;
672
673#ifdef XK_KP_Begin
674 case XK_KP_Begin:
675 strcpy (kbuf, "\033Ou");
676 break;
677
678#endif
679 case XK_KP_F1: /* "\033OP" */
680 case XK_KP_F2: /* "\033OQ" */
681 case XK_KP_F3: /* "\033OR" */
682 case XK_KP_F4: /* "\033OS" */
683 strcpy (kbuf, "\033OP");
684 kbuf[2] += (keysym - XK_KP_F1);
685 break;
686
687 case XK_KP_Multiply: /* "\033Oj" : "*" */
688 case XK_KP_Add: /* "\033Ok" : "+" */
689 case XK_KP_Separator: /* "\033Ol" : "," */
690 case XK_KP_Subtract: /* "\033Om" : "-" */
691 case XK_KP_Decimal: /* "\033On" : "." */
692 case XK_KP_Divide: /* "\033Oo" : "/" */
693 case XK_KP_0: /* "\033Op" : "0" */
694 case XK_KP_1: /* "\033Oq" : "1" */
695 case XK_KP_2: /* "\033Or" : "2" */
696 case XK_KP_3: /* "\033Os" : "3" */
697 case XK_KP_4: /* "\033Ot" : "4" */
698 case XK_KP_5: /* "\033Ou" : "5" */
699 case XK_KP_6: /* "\033Ov" : "6" */
700 case XK_KP_7: /* "\033Ow" : "7" */
701 case XK_KP_8: /* "\033Ox" : "8" */
702 case XK_KP_9: /* "\033Oy" : "9" */
703 /* allow shift to override */
704 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
705 {
706 strcpy (kbuf, "\033Oj");
707 kbuf[2] += (keysym - XK_KP_Multiply);
708 }
709 else
710 {
711 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
712 kbuf[1] = '\0';
713 }
714 break;
715
716 case XK_Find:
717 strcpy (kbuf, "\033[1~");
718 break;
719
720#ifdef XK_KP_End
721 case XK_KP_Insert:
722 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
724 {
725 strcpy (kbuf, "\033Op");
726 break;
727 }
728 /* FALLTHROUGH */
729#endif
730 case XK_Insert:
731 strcpy (kbuf, "\033[2~");
732 break;
733#ifdef DXK_Remove /* support for DEC remove like key */
734 case DXK_Remove:
735 /* FALLTHROUGH */
736#endif
737 case XK_Execute:
738 strcpy (kbuf, "\033[3~");
739 break;
740 case XK_Select:
741 strcpy (kbuf, "\033[4~");
742 break;
743#ifdef XK_KP_End
744 case XK_KP_End:
745 /* allow shift to override */
746 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
747 {
748 strcpy (kbuf, "\033Oq");
749 break;
750 }
751 /* FALLTHROUGH */
752#endif
753 case XK_End:
754 strcpy (kbuf, KS_END);
755 break;
756#ifdef XK_KP_Home
757 case XK_KP_Home:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Ow");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_Home:
767 strcpy (kbuf, KS_HOME);
768 break;
769
770#define FKEY(n, fkey) \
771 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
772
773 case XK_F1: /* "\033[11~" */
774 case XK_F2: /* "\033[12~" */
775 case XK_F3: /* "\033[13~" */
776 case XK_F4: /* "\033[14~" */
777 case XK_F5: /* "\033[15~" */
778 FKEY (11, XK_F1);
779 break;
780 case XK_F6: /* "\033[17~" */
781 case XK_F7: /* "\033[18~" */
782 case XK_F8: /* "\033[19~" */
783 case XK_F9: /* "\033[20~" */
784 case XK_F10: /* "\033[21~" */
785 FKEY (17, XK_F6);
786 break;
787 case XK_F11: /* "\033[23~" */
788 case XK_F12: /* "\033[24~" */
789 case XK_F13: /* "\033[25~" */
790 case XK_F14: /* "\033[26~" */
791 FKEY (23, XK_F11);
792 break;
793 case XK_F15: /* "\033[28~" */
794 case XK_F16: /* "\033[29~" */
795 FKEY (28, XK_F15);
796 break;
797 case XK_Help: /* "\033[28~" */
798 FKEY (28, XK_Help);
799 break;
800 case XK_Menu: /* "\033[29~" */
801 FKEY (29, XK_Menu);
802 break;
803 case XK_F17: /* "\033[31~" */
804 case XK_F18: /* "\033[32~" */
805 case XK_F19: /* "\033[33~" */
806 case XK_F20: /* "\033[34~" */
807 case XK_F21: /* "\033[35~" */
808 case XK_F22: /* "\033[36~" */
809 case XK_F23: /* "\033[37~" */
810 case XK_F24: /* "\033[38~" */
811 case XK_F25: /* "\033[39~" */
812 case XK_F26: /* "\033[40~" */
813 case XK_F27: /* "\033[41~" */
814 case XK_F28: /* "\033[42~" */
815 case XK_F29: /* "\033[43~" */
816 case XK_F30: /* "\033[44~" */
817 case XK_F31: /* "\033[45~" */
818 case XK_F32: /* "\033[46~" */
819 case XK_F33: /* "\033[47~" */
820 case XK_F34: /* "\033[48~" */
821 case XK_F35: /* "\033[49~" */
822 FKEY (31, XK_F17);
823 break;
824#undef FKEY
825 default:
826 newlen = 0; 778 newlen = 0;
827 break;
828 } 779 }
829 780 break;
830 if (newlen)
831 len = strlen (kbuf);
832 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
833 785
834 /* 786 /*
835 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
836 */ 788 */
837#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
854 { 806 {
855#ifdef META8_OPTION 807#ifdef META8_OPTION
856 /* set 8-bit on */ 808 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 809 if (meta && (meta_char == 0x80))
858 { 810 {
859 unsigned char *ch; 811 char *ch;
860 812
861 for (ch = kbuf; ch < kbuf + len; ch++) 813 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 814 *ch |= 0x80;
863 815
864 meta = 0; 816 meta = 0;
… …
866#endif 818#endif
867 /* nil */ ; 819 /* nil */ ;
868 } 820 }
869 } 821 }
870 822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825
871 if (len <= 0) 826 if (len <= 0)
872 return; /* not mapped */ 827 return; /* not mapped */
873 828
874 if (OPTION (Opt_scrollTtyKeypress)) 829 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 830 if (view_start)
876 { 831 {
877 view_start = 0; 832 view_start = 0;
878 want_refresh = 1; 833 want_refresh = 1;
879 } 834 }
… …
897#ifdef META8_OPTION 852#ifdef META8_OPTION
898 && meta_char == C0_ESC 853 && meta_char == C0_ESC
899#endif 854#endif
900 ) 855 )
901 { 856 {
902 const unsigned char ch = C0_ESC; 857 const char ch = C0_ESC;
903 tt_write (&ch, 1); 858 tt_write (&ch, 1);
904 } 859 }
905 860
906#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */
908 unsigned char *p;
909 int i;
910
911 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
912 for (i = 0, p = kbuf; i < len; i++, p++)
913 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
914 fprintf (stderr, "'\n");
915#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
917} 862}
918/*}}} */
919 863
864void
865rxvt_term::key_release (XKeyEvent &ev)
866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym;
869
870 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
871#endif
872
873#if ENABLE_FRILLS || ISO_14755
874 // ISO 14755 support
875 if (iso14755buf)
876 if (iso14755buf & ISO_14755_52)
877 {
878# if ISO_14755
879 scr_overlay_off ();
880# endif
881# if ISO_14755
882 // iso14755 part 5.2 handling: release time
883 // first: controls
884 if ((ev.state & ControlMask)
885 && ((keysym >= 0x40 && keysym <= 0x5f)
886 || (keysym >= 0x61 && keysym <= 0x7f)))
887 {
888 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
889 commit_iso14755 ();
890
891 return;
892 }
893
894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym)
896 {
897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 ();
899
900 return;
901 }
902
903 scr_bell ();
904# endif
905 iso14755buf = 0;
906
907 return;
908 }
909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
910 {
911# if ISO_14755
912 scr_overlay_off ();
913# endif
914 if (iso14755buf & ISO_14755_51)
915 commit_iso14755 ();
916#if ISO_14755
917 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
918 {
919 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
920
921 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
922 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
923 }
924# endif
925 else
926 iso14755buf = 0;
927 }
928#endif
929
930 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
931 return;
932
933#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
934 if (!(ev.state & ControlMask))
935 slip_wheel_ev.stop ();
936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0;
938#endif
939}
940
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 941#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 942unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 943rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 944{
926 unsigned int n, s; 945 unsigned int n, s;
927 946
928 n = cmdbuf_ptr - cmdbuf_base; 947 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
955void 974void
956rxvt_term::flush () 975rxvt_term::flush ()
957{ 976{
958 flush_ev.stop (); 977 flush_ev.stop ();
959 978
960#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
961 if (want_full_refresh) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
962 { 981 {
963 want_full_refresh = 0; 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
964 scr_clear (); 983// scr_clear (true); This needs to be researched further!
965 scr_touch (false); 984 scr_touch (false);
966 } 985 }
967#endif 986#endif
968 987
969 if (want_refresh) 988 if (want_refresh)
970 { 989 {
990 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
991 {
992 int row = view_start;
993 int end_row = row + nrow;
994
995 while (row > top_row && ROW (row - 1).is_longer ())
996 --row;
997
998 do
999 {
1000 int start_row = row;
1001 line_t *l;
1002
1003 do
1004 {
1005 l = &ROW (row++);
1006
1007 if (!(l->f & LINE_FILTERED))
1008 {
1009 // line not filtered, mark it as filtered
1010 l->f |= LINE_FILTERED;
1011 while (l->is_longer ())
1012 {
1013 l = &ROW (row++);
1014 l->f |= LINE_FILTERED;
1015 }
1016
1017 // and filter it
1018 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1019
1020 break;
1021 }
1022 }
1023 while (l->is_longer () && row < end_row);
1024 }
1025 while (row < end_row);
1026 }
1027
971 scr_refresh (refresh_type); 1028 scr_refresh ();
972 scrollbar_show (1); 1029 scrollBar.show (1);
973#ifdef USE_XIM 1030#ifdef USE_XIM
974 IMSendSpot (); 1031 IMSendSpot ();
975#endif 1032#endif
976 } 1033 }
977 1034
978 display->flush (); 1035 display->flush ();
979} 1036}
980 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
981void 1039void
982rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
983{ 1041{
984 SET_R (this); 1042 if (want_refresh && !flush_ev.is_active ())
985 SET_LOCALE (locale); 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
986 1044
987 display->flush (); 1045 display->flush ();
988
989 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1046}
992 1047
993void 1048void
994rxvt_term::flush_cb (time_watcher &w) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
995{ 1050{
996 SET_R (this); 1051 make_current ();
997 SET_LOCALE (locale);
998 1052
999 refresh_limit = 1;
1000 refresh_count = 0; 1053 refresh_count = 0;
1001 flush (); 1054 flush ();
1002} 1055}
1003 1056
1004#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
1005void 1058void
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1007{ 1060{
1008 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1062 want_refresh = 1;
1010 1063 refresh_check ();
1011 w.start (w.at + BLINK_INTERVAL);
1012} 1064}
1013#endif 1065#endif
1014 1066
1015#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1016void 1068void
1017rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
1018{ 1070{
1019 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1020 { 1072 {
1021 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1022 want_refresh = 1; 1074 want_refresh = 1;
1023 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1024 } 1076 }
1077 else
1078 w.stop ();
1025} 1079}
1026#endif 1080#endif
1027 1081
1028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1029void 1083void
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1031{ 1085{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1034 { 1088 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1089 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
1038 } 1091 }
1092 else
1093 w.stop ();
1039} 1094}
1040#endif 1095#endif
1041 1096
1042#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1043void 1098void
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1045{ 1100{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1102 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1104 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1052 } 1106 }
1107 else
1108 w.stop ();
1053} 1109}
1054#endif 1110#endif
1055 1111
1056#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1057void 1113void
1058rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1059{ 1115{
1060 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1117 {
1064 if (view_start == nsaved ||
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0;
1067
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1118 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1071 } 1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1126 }
1072} 1127}
1073#endif 1128#endif
1074 1129
1075#if HAVE_SCHED_YIELD 1130#if LINUX_YIELD_HACK
1076static struct event_handler 1131static struct event_handler
1077{ 1132{
1078 check_watcher cw_yield; 1133 ev::prepare yield_ev;
1079 1134
1080 void yield (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1081 { 1136 {
1082 sched_yield (); 1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1144
1145 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0);
1147
1083 w.stop (); 1148 w.stop ();
1084 } 1149 }
1085 1150
1086 event_handler () 1151 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1152 : yield_ev (this, &event_handler::yield_cb)
1088 { 1153 {
1089 } 1154 }
1090} event_handler; 1155} event_handler;
1091#endif 1156#endif
1092 1157
… …
1095{ 1160{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1162
1098 if (CBUFSIZ == n) 1163 if (CBUFSIZ == n)
1099 { 1164 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1166 n = 0;
1102 } 1167 }
1103 1168
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1170 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1171 cmdbuf_endp = cmdbuf_ptr + n;
1107 1172
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1174
1110 if (r > 0) 1175 if (r > 0)
1111 { 1176 {
1112 cmdbuf_endp += r; 1177 cmdbuf_endp += r;
1113 return true; 1178 return true;
1114 } 1179 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1181 {
1117#if HAVE_SCHED_YIELD 1182#if LINUX_YIELD_HACK
1183 if (display->is_local)
1118 event_handler.cw_yield.start (); 1184 event_handler.yield_ev.start ();
1119#endif 1185#endif
1120 } 1186 }
1121 else 1187 else
1122 { 1188 {
1123 pty_ev.stop (); 1189 pty_ev.stop ();
1124 1190
1125 if (!OPTION (Opt_hold)) 1191 if (!option (Opt_hold))
1126 destroy (); 1192 destroy ();
1127 } 1193 }
1128 1194
1129 return false; 1195 return false;
1130} 1196}
1131 1197
1132void 1198void
1133rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1134{ 1200{
1135 SET_R (this); 1201 make_current ();
1136 SET_LOCALE (locale);
1137 1202
1138 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1139 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1140 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1141 if (cmd_parse ()) 1206 cmd_parse ();
1142 break;
1143 1207
1144 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1145 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1146} 1212}
1147 1213
1148void 1214void
1149rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1150{ 1216{
1151 XDefineCursor (display->display, vt, TermWin_cursor); 1217 XDefineCursor (dpy, vt, TermWin_cursor);
1152 recolour_cursor (); 1218 recolour_cursor ();
1153 1219
1154#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1155 hidden_pointer = 0; 1221 hidden_pointer = 0;
1156 1222
1157 if (OPTION (Opt_pointerBlank)) 1223 if (option (Opt_pointerBlank))
1158 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1159#endif 1225#endif
1160} 1226}
1161 1227
1162#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1163void 1229void
1164rxvt_term::pointer_blank () 1230rxvt_term::pointer_blank ()
1165{ 1231{
1166 if (! OPTION (Opt_pointerBlank)) 1232 if (!option (Opt_pointerBlank))
1167 return; 1233 return;
1168 1234
1169 XDefineCursor (display->display, vt, display->blank_cursor); 1235 XDefineCursor (dpy, vt, display->blank_cursor);
1170 XFlush (display->display); 1236 XFlush (dpy);
1171 1237
1172 hidden_pointer = 1; 1238 hidden_pointer = 1;
1173} 1239}
1174 1240
1175void 1241void
1176rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1177{ 1243{
1178 SET_R (this); 1244 make_current ();
1179 SET_LOCALE (locale);
1180 1245
1181 pointer_blank (); 1246 pointer_blank ();
1182} 1247}
1183#endif 1248#endif
1184 1249
1185void 1250void
1186rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1187{ 1252{
1188 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1189 int x, y; 1254 int x, y;
1255 int code = 32;
1190 1256
1191 x = ev.x; 1257 x = Pixel2Col (ev.x) + 1;
1192 y = ev.y; 1258 y = Pixel2Row (ev.y) + 1;
1193 pixel_position (&x, &y); 1259
1260 if (ev.type == MotionNotify)
1261 {
1262 if (x == mouse_row && y == mouse_col)
1263 return;
1264
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1194 1269
1195 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1196 button_number = 3; 1271 button_number = 3;
1197 else 1272 else
1198 { 1273 {
1199 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1200 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1201 if (button_number >= 3) 1276 if (button_number >= 3)
1202 button_number += (64 - 3); 1277 button_number += 64 - 3;
1203 } 1278 }
1204 1279
1205 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1206 { 1281 {
1207 /* 1282 /*
… …
1239 fputc ('A', stderr); 1314 fputc ('A', stderr);
1240 if (key_state & 32) 1315 if (key_state & 32)
1241 fputc ('2', stderr); 1316 fputc ('2', stderr);
1242 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1243 button_number, 1318 button_number,
1244 x + 1, 1319 x,
1245 y + 1); 1320 y);
1246#endif 1321#endif
1247 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1248 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1249 (32 + button_number + key_state), 1337 code + button_number + key_state,
1250 (32 + x + 1), 1338 32 + x,
1251 (32 + y + 1)); 1339 32 + y);
1252} 1340}
1253
1254#ifdef USING_W11LIB
1255void
1256rxvt_W11_process_x_event (XEvent *ev)
1257{
1258 rxvt_t *r = rxvt_get_r ();
1259
1260 x_cb (*ev);
1261}
1262#endif
1263 1341
1264/*{{{ process an X event */ 1342/*{{{ process an X event */
1265void 1343void
1266rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
1267{ 1345{
1268 dDisp; 1346 make_current ();
1269 1347
1270 SET_R (this); 1348 dLocal (Display *, dpy);
1271 SET_LOCALE (locale);
1272 1349
1273#if defined(CURSOR_BLINK) 1350 if (ev.xany.window == vt
1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1351 && SHOULD_INVOKE (HOOK_X_EVENT)
1275 { 1352 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1276 if (hidden_cursor) 1353 return;
1277 {
1278 hidden_cursor = 0;
1279 want_refresh = 1;
1280 }
1281 1354
1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1355 // for XQueryPointer
1283 }
1284#endif
1285
1286#if defined(POINTER_BLANK)
1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1288 {
1289 if (ev.type == MotionNotify
1290 || ev.type == ButtonPress
1291 || ev.type == ButtonRelease)
1292 if (hidden_pointer)
1293 pointer_unblank ();
1294
1295 if (ev.type == KeyPress && hidden_pointer == 0)
1296 pointer_blank ();
1297 }
1298#endif
1299
1300 Window unused_root, unused_child; 1356 Window unused_root, unused_child;
1301 int unused_root_x, unused_root_y; 1357 int unused_root_x, unused_root_y;
1302 unsigned int unused_mask; 1358 unsigned int unused_mask;
1303 1359
1304 switch (ev.type) 1360 switch (ev.type)
1305 { 1361 {
1306 case KeyPress: 1362 case KeyPress:
1307#if ISO_14755 1363 key_press (ev.xkey);
1308 if (!(iso14755buf & ISO_14755_52))
1309#endif
1310 lookup_key (ev.xkey);
1311
1312 break; 1364 break;
1313 1365
1314 case KeyRelease: 1366 case KeyRelease:
1315 { 1367 key_release (ev.xkey);
1316#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1317 KeySym ks;
1318
1319 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1320#endif
1321
1322#if ENABLE_FRILLS || ISO_14755
1323 // ISO 14755 support
1324 if (iso14755buf)
1325 if (iso14755buf & ISO_14755_52)
1326 {
1327# if ENABLE_OVERLAY
1328 scr_overlay_off ();
1329# endif
1330# if ISO_14755
1331 // iso14755 part 5.2 handling: release time
1332 // first: controls
1333 if ((ev.xkey.state & ControlMask)
1334 && ((ks >= 0x40 && ks <= 0x5f)
1335 || (ks >= 0x61 && ks <= 0x7f)))
1336 {
1337 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1338 commit_iso14755 ();
1339 return; // case-break;
1340 }
1341
1342 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1343 if (i[0] == ks)
1344 {
1345 iso14755buf = ISO_14755_51 | i[1];
1346 commit_iso14755 ();
1347 return; // case-break;
1348 }
1349
1350 scr_bell ();
1351# endif
1352 iso14755buf = 0;
1353 break;
1354 }
1355 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1356 {
1357# if ENABLE_OVERLAY
1358 scr_overlay_off ();
1359# endif
1360 if (iso14755buf & ISO_14755_51)
1361 commit_iso14755 ();
1362#if ISO_14755
1363 else if (iso14755buf & ISO_14755_STARTED)
1364 {
1365 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1366
1367 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1368 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1369 }
1370# endif
1371 else
1372 iso14755buf = 0;
1373 }
1374#endif
1375
1376#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1377 if (!(ev.xkey.state & ControlMask))
1378 slip_wheel_ev.stop ();
1379 else if (ks == XK_Control_L || ks == XK_Control_R)
1380 mouse_slip_wheel_speed = 0;
1381#endif
1382 break; 1368 break;
1383 }
1384 1369
1385 case ButtonPress: 1370 case ButtonPress:
1386 button_press (ev.xbutton); 1371 button_press (ev.xbutton);
1387 break; 1372 break;
1388 1373
… …
1390 button_release (ev.xbutton); 1375 button_release (ev.xbutton);
1391 break; 1376 break;
1392 1377
1393 case ClientMessage: 1378 case ClientMessage:
1394 if (ev.xclient.format == 32 1379 if (ev.xclient.format == 32
1395 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1380 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1396 { 1381 {
1382 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1383 {
1384 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1385 {
1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1386 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1387 {
1388 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1398 destroy (); 1389 destroy ();
1390 }
1399#if ENABLE_EWMH 1391#if ENABLE_EWMH
1400 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1392 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1401 XSendEvent (disp, ev.xclient.window = display->root, 1393 XSendEvent (dpy, ev.xclient.window = display->root,
1402 False, SubstructureRedirectMask | SubstructureNotifyMask, 1394 False, SubstructureRedirectMask | SubstructureNotifyMask,
1403 &ev); 1395 &ev);
1396#endif
1397 }
1398 }
1399#if ENABLE_XEMBED
1400 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1401 {
1402 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1403 focus_in ();
1404 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1405 focus_out ();
1406 }
1404#endif 1407#endif
1405 } 1408 }
1406#if ENABLE_XEMBED
1407 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1408 {
1409 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1410 focus_in ();
1411 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1412 focus_out ();
1413 }
1414#endif
1415#ifdef OFFIX_DND
1416 /* OffiX Dnd (drag 'n' drop) protocol */
1417 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1418 && (ev.xclient.data.l[0] == DndFile
1419 || ev.xclient.data.l[0] == DndDir
1420 || ev.xclient.data.l[0] == DndLink))
1421 {
1422 /* Get Dnd data */
1423 Atom ActualType;
1424 int ActualFormat;
1425 unsigned char *data;
1426 unsigned long Size, RemainingBytes;
1427
1428 XGetWindowProperty (disp, display->root,
1429 xa[XA_DNDSELECTION],
1430 0L, 1000000L,
1431 False, AnyPropertyType,
1432 &ActualType, &ActualFormat,
1433 &Size, &RemainingBytes,
1434 &data);
1435 set_string_property (XA_CUT_BUFFER0, data);
1436 XFree (data);
1437 selection_paste (display->root, XA_CUT_BUFFER0, true);
1438 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1439 }
1440#endif /* OFFIX_DND */
1441 break;
1442
1443 case MappingNotify:
1444 XRefreshKeyboardMapping (&ev.xmapping);
1445 break; 1409 break;
1446 1410
1447 /* 1411 /*
1448 * XXX: this is not the _current_ arrangement 1412 * XXX: this is not the _current_ arrangement
1449 * Here's my conclusion: 1413 * Here's my conclusion:
… …
1468 break; 1432 break;
1469 } 1433 }
1470 break; 1434 break;
1471 1435
1472 case FocusIn: 1436 case FocusIn:
1437 if (ev.xfocus.detail != NotifyInferior
1438 && ev.xfocus.detail != NotifyPointer
1439 && ev.xfocus.mode != NotifyGrab)
1473 focus_in (); 1440 focus_in ();
1474 break; 1441 break;
1475 1442
1476 case FocusOut: 1443 case FocusOut:
1444 if (ev.xfocus.detail != NotifyInferior
1445 && ev.xfocus.detail != NotifyPointer
1446 && ev.xfocus.mode != NotifyGrab)
1477 focus_out (); 1447 focus_out ();
1478 break; 1448 break;
1479 1449
1480 case ConfigureNotify: 1450 case ConfigureNotify:
1481 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1482 { 1452 {
1483 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1485 1474
1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1487 { 1476 {
1488 seen_resize = 1; 1477 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 } 1479 }
1491 1480 else
1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1481 {
1493 if (OPTION (Opt_transparent)) 1482#ifdef HAVE_BG_PIXMAP
1494 check_our_parents (); 1483 if (moved)
1484 {
1485 if (mapped)
1486 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1495#endif 1490#endif
1491 }
1492
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1496 } 1494 }
1497 break; 1495 break;
1498 1496
1499 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1500 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1501 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1502 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1503 1502
1504 break; 1503 break;
1505 1504
1506 case SelectionClear: 1505 case SelectionClear:
1507 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1508 break; 1507 break;
1509 1508
1510 case SelectionNotify: 1509 case SelectionNotify:
1511 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1512 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1513 break; 1512 break;
1514 1513
1515 case SelectionRequest: 1514 case SelectionRequest:
1516 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1516 break;
1517
1518 case MapNotify:
1519#ifdef HAVE_BG_PIXMAP
1520 /* This is needed specifically to fix the case of no window manager or a
1521 * non-reparenting window manager. In those cases we never get first
1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1524 * reparenting.
1525 * We should not render background immediately, as there could be several
1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1527 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results.
1531 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1533 update_background_ev.start (0.025);
1534#endif
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start ();
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1517 break; 1540 break;
1518 1541
1519 case UnmapNotify: 1542 case UnmapNotify:
1520 mapped = 0; 1543 mapped = 0;
1521#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1522 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1523#endif 1546#endif
1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break; 1548 break;
1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1549
1539 case GraphicsExpose: 1550 case GraphicsExpose:
1540 case Expose: 1551 case Expose:
1541 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1542 { 1553 {
1543 do 1554 do
1555 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1558 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1560
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1562
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, False);
1567 }
1553 1568
1554 scr_refresh (refresh_type); 1569 want_refresh = 1;
1555 } 1570 }
1556 else 1571 else
1557 { 1572 {
1558 XEvent unused_event; 1573 XEvent unused_event;
1559 1574
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1576 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1578 ;
1564 1579
1565 if (isScrollbarWindow (ev.xany.window)) 1580 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1581 {
1567 scrollBar.setIdle (); 1582 scrollBar.state = STATE_IDLE;
1568 scrollbar_show (0); 1583 scrollBar.show (0);
1569 } 1584 }
1570#ifdef MENUBAR
1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1572 menubar_expose ();
1573#endif
1574
1575#ifdef TRANSPARENT
1576 if (am_transparent && ev.xany.window == parent[0])
1577 XClearWindow (disp, ev.xany.window);
1578#endif
1579 } 1585 }
1580 break; 1586 break;
1581 1587
1582 case MotionNotify: 1588 case MotionNotify:
1583#ifdef POINTER_BLANK 1589#ifdef POINTER_BLANK
1584 if (hidden_pointer) 1590 if (hidden_pointer)
1585 pointer_unblank (); 1591 pointer_unblank ();
1586#endif 1592#endif
1587#if MENUBAR 1593 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1588 if (isMenuBarWindow (ev.xany.window)) 1594 || priv_modes & PrivMode_MouseAnyEvent)
1589 {
1590 menubar_control (ev.xbutton); 1595 mouse_report (ev.xbutton);
1591 break;
1592 }
1593#endif
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1597 break;
1596 1598
1597 if (ev.xany.window == vt) 1599 if (ev.xany.window == vt)
1598 { 1600 {
1601 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1602 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1603 ; // nop
1599 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1604 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1600 { 1605 {
1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1606 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1602 ; 1607 ;
1603 1608
1604 XQueryPointer (disp, vt, 1609 XQueryPointer (dpy, vt,
1605 &unused_root, &unused_child, 1610 &unused_root, &unused_child,
1606 &unused_root_x, &unused_root_y, 1611 &unused_root_x, &unused_root_y,
1607 &ev.xbutton.x, &ev.xbutton.y, 1612 &ev.xbutton.x, &ev.xbutton.y,
1608 &ev.xbutton.state); 1613 &ev.xbutton.state);
1609#ifdef MOUSE_THRESHOLD 1614#ifdef MOUSE_THRESHOLD
… …
1629 int dist; 1634 int dist;
1630 1635
1631 /* don't clobber the current delay if we are 1636 /* don't clobber the current delay if we are
1632 * already in the middle of scrolling. 1637 * already in the middle of scrolling.
1633 */ 1638 */
1634 if (!sel_scroll_ev.active) 1639 if (!sel_scroll_ev.is_active ())
1635 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1640 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1636 1641
1637 /* save the event params so we can highlight 1642 /* save the event params so we can highlight
1638 * the selection in the pending-scroll loop 1643 * the selection in the pending-scroll loop
1639 */ 1644 */
1640 selection_save_x = ev.xbutton.x; 1645 selection_save_x = ev.xbutton.x;
… …
1662 else 1667 else
1663 { 1668 {
1664 /* we are within the text window, so we 1669 /* we are within the text window, so we
1665 * shouldn't be scrolling 1670 * shouldn't be scrolling
1666 */ 1671 */
1667 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1669 } 1673 }
1670#endif 1674#endif
1671#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1672 } 1676 }
1673#endif 1677#endif
1674 } 1678 }
1675 } 1679 }
1676 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1677 { 1681 {
1678 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1679 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1680 ; 1684 ;
1681 1685
1682 XQueryPointer (disp, scrollBar.win, 1686 XQueryPointer (dpy, scrollBar.win,
1683 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1684 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1685 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1686 &unused_mask); 1690 &unused_mask);
1687 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1688 scrollbar_size ()); 1692 scrollBar.size ());
1689 scr_refresh (refresh_type);
1690 refresh_limit = 0; 1693 want_refresh = 1;
1691 scrollbar_show (1); 1694 scrollBar.show (1);
1692 } 1695 }
1693 break; 1696 break;
1694 } 1697 }
1698
1699#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.again ();
1709 }
1710#endif
1711
1712#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 {
1715 if (ev.type == MotionNotify
1716 || ev.type == ButtonPress
1717 || ev.type == ButtonRelease)
1718 if (hidden_pointer)
1719 pointer_unblank ();
1720
1721 if (ev.type == KeyPress && hidden_pointer == 0)
1722 pointer_blank ();
1723 }
1724#endif
1725
1726 refresh_check ();
1695} 1727}
1728
1729#if ENABLE_FRILLS
1730void
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h);
1740 urgency_hint = enable;
1741 }
1742}
1743#endif
1696 1744
1697void 1745void
1698rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1699{ 1747{
1700 if (!focus) 1748 if (!focus)
1701 { 1749 {
1702 focus = 1; 1750 focus = 1;
1703 want_refresh = 1; 1751 want_refresh = 1;
1704 1752
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1707#if USE_XIM 1753#if USE_XIM
1708 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1709 { 1755 {
1710 IMSetStatusPosition (); 1756 IMSetPosition ();
1711 XSetICFocus (Input_Context); 1757 XSetICFocus (Input_Context);
1712 } 1758 }
1713#endif 1759#endif
1714#if CURSOR_BLINK 1760#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1761 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1762 cursor_blink_ev.again ();
1717#endif 1763#endif
1718#if OFF_FOCUS_FADING 1764#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade]) 1765 if (rs[Rs_fade])
1720 { 1766 {
1721 pix_colors = pix_colors_focused; 1767 pix_colors = pix_colors_focused;
1722 scr_recolour (); 1768 scr_recolour ();
1723 } 1769 }
1724#endif 1770#endif
1771#if ENABLE_FRILLS
1772 if (option (Opt_urgentOnBell))
1773 set_urgency (0);
1774#endif
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1777 }
1726} 1778}
1727 1779
1728void 1780void
1729rxvt_term::focus_out () 1781rxvt_term::focus_out ()
… …
1731 if (focus) 1783 if (focus)
1732 { 1784 {
1733 focus = 0; 1785 focus = 0;
1734 want_refresh = 1; 1786 want_refresh = 1;
1735 1787
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788#if ENABLE_FRILLS
1737 1789 if (option (Opt_urgentOnBell))
1790 set_urgency (0);
1791#endif
1738#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1793 if (iso14755buf)
1740 { 1794 {
1741 iso14755buf = 0; 1795 iso14755buf = 0;
1742# if ENABLE_OVERLAY 1796# if ISO_14755
1743 scr_overlay_off (); 1797 scr_overlay_off ();
1744# endif 1798# endif
1745 } 1799 }
1746#endif 1800#endif
1747#if USE_XIM 1801#if USE_XIM
1748 if (Input_Context != NULL) 1802 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1750#endif 1804#endif
1751#if CURSOR_BLINK 1805#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1806 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.stop (); 1807 cursor_blink_ev.stop ();
1808
1754 hidden_cursor = 0; 1809 hidden_cursor = 0;
1755#endif 1810#endif
1756#if OFF_FOCUS_FADING 1811#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1812 if (rs[Rs_fade])
1758 { 1813 {
1759 pix_colors = pix_colors_unfocused; 1814 pix_colors = pix_colors_unfocused;
1760 scr_recolour (); 1815 scr_recolour ();
1761 } 1816 }
1762#endif 1817#endif
1818
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1820 }
1821}
1822
1823void
1824rxvt_term::update_fade_color (unsigned int idx)
1825{
1826#if OFF_FOCUS_FADING
1827 if (rs[Rs_fade])
1763 } 1828 {
1829 rgba c;
1830 pix_colors [Color_fade].get (c);
1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1832 }
1833#endif
1764} 1834}
1765 1835
1766#if TRANSPARENT 1836#if ENABLE_TRANSPARENCY || ENABLE_PERL
1767void 1837void
1768rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1839{
1770 SET_R (this); 1840 make_current ();
1771 SET_LOCALE (locale);
1772 1841
1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1846# if ENABLE_TRANSPARENCY
1773 switch (ev.type) 1847 switch (ev.type)
1774 { 1848 {
1775 case PropertyNotify: 1849 case PropertyNotify:
1776 /* 1850 /*
1777 * if user used some Esetroot compatible prog to set the root bg, 1851 * if user used some Esetroot compatible prog to set the root bg,
1778 * use the property to determine the pixmap. We use it later on. 1852 * use the property to determine the pixmap. We use it later on.
1779 */ 1853 */
1780 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1782 return; 1856 {
1857 bgPixmap.set_root_pixmap ();
1858 update_background ();
1859 }
1783 1860
1784 /* FALLTHROUGH */
1785 case ReparentNotify:
1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1787 want_refresh = want_full_refresh = 1;
1788 break; 1861 break;
1789 } 1862 }
1863# endif
1864
1865 refresh_check ();
1790} 1866}
1791#endif 1867#endif
1792 1868
1793void 1869void
1794rxvt_term::button_press (XButtonEvent &ev) 1870rxvt_term::button_press (XButtonEvent &ev)
1795{ 1871{
1796 int reportmode = 0, clickintime; 1872 int reportmode = 0, clickintime;
1797 1873
1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1874 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1875
1799 if (!bypass_keystate) 1876 if (!bypass_keystate)
1800 reportmode = !! (priv_modes & PrivMode_mouse_report); 1877 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801 1878
1802 /* 1879 /*
1803 * VT window processing of button press 1880 * VT window processing of button press
1804 */ 1881 */
1805 if (ev.window == vt) 1882 if (ev.window == vt)
1806 { 1883 {
1884 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1885 return;
1886
1807#if ISO_14755 1887#if ISO_14755
1808 // 5.4 1888 // 5.4
1809 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1889 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1810 { 1890 {
1811 iso14755_54 (ev.x, ev.y); 1891 iso14755_54 (ev.x, ev.y);
… …
1821 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1822 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1823#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1824 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1825 { 1905 {
1826 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1827 MEvent.clicks++; 1907 MEvent.clicks++;
1908
1828 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1829 { 1910 {
1830 /* only report double clicks */ 1911 /* only report double clicks */
1831 MEvent.clicks = 2; 1912 MEvent.clicks = 2;
1832 mouse_report (ev); 1913 mouse_report (ev);
… …
1844 mouse_report (ev); 1925 mouse_report (ev);
1845 } 1926 }
1846#else 1927#else
1847 MEvent.button = ev.button; 1928 MEvent.button = ev.button;
1848 mouse_report (ev); 1929 mouse_report (ev);
1849#endif /* MOUSE_REPORT_DOUBLECLICK */ 1930#endif /* MOUSE_REPORT_DOUBLECLICK */
1850 1931
1851 } 1932 }
1852 else 1933 else
1853 { 1934 {
1854 if (ev.button != MEvent.button) 1935 if (ev.button != MEvent.button)
… …
1864#else 1945#else
1865 selection.rect = false; 1946 selection.rect = false;
1866#endif 1947#endif
1867 1948
1868 /* allow shift+left click to extend selection */ 1949 /* allow shift+left click to extend selection */
1869 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1950 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1870 { 1951 {
1871 if (MEvent.button == Button1 && clickintime) 1952 if (MEvent.button == Button1 && clickintime)
1872 selection_rotate (ev.x, ev.y); 1953 selection_rotate (ev.x, ev.y);
1873 else 1954 else
1874 selection_extend (ev.x, ev.y, 1); 1955 selection_extend (ev.x, ev.y, 1);
… …
1902 } 1983 }
1903 1984
1904 /* 1985 /*
1905 * Scrollbar window processing of button press 1986 * Scrollbar window processing of button press
1906 */ 1987 */
1907 if (isScrollbarWindow (ev.window)) 1988 if (scrollBar.state && ev.window == scrollBar.win)
1908 { 1989 {
1909 scrollBar.setIdle (); 1990 page_dirn direction = NO_DIR;
1991
1992 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */
1996
1997 scrollBar.state = STATE_IDLE;
1910 /* 1998 /*
1911 * Rxvt-style scrollbar: 1999 * Rxvt-style scrollbar:
1912 * move up if mouse is above slider 2000 * move up if mouse is above slider
1913 * move dn if mouse is below slider 2001 * move dn if mouse is below slider
1914 * 2002 *
… …
1923 /* 2011 /*
1924 * Mouse report disabled scrollbar: 2012 * Mouse report disabled scrollbar:
1925 * arrow buttons - send up/down 2013 * arrow buttons - send up/down
1926 * click on scrollbar - send pageup/down 2014 * click on scrollbar - send pageup/down
1927 */ 2015 */
1928 if ((scrollBar.style == R_SB_NEXT 2016 if (direction == UP)
1929 && scrollbarnext_upButton (ev.y))
1930 || (scrollBar.style == R_SB_RXVT
1931 && scrollbarrxvt_upButton (ev.y)))
1932 tt_printf ("\033[A"); 2017 tt_printf ("\033[A");
1933 else if ((scrollBar.style == R_SB_NEXT 2018 else if (direction == DN)
1934 && scrollbarnext_dnButton (ev.y))
1935 || (scrollBar.style == R_SB_RXVT
1936 && scrollbarrxvt_dnButton (ev.y)))
1937 tt_printf ("\033[B"); 2019 tt_printf ("\033[B");
1938 else 2020 else
1939 switch (ev.button) 2021 switch (ev.button)
1940 { 2022 {
1941 case Button2: 2023 case Button2:
… …
1948 tt_printf ("\033[5~"); 2030 tt_printf ("\033[5~");
1949 break; 2031 break;
1950 } 2032 }
1951 } 2033 }
1952 else 2034 else
1953#endif /* NO_SCROLLBAR_REPORT */ 2035#endif /* NO_SCROLLBAR_REPORT */
1954
1955 {
1956 char upordown = 0;
1957
1958 if (scrollBar.style == R_SB_NEXT)
1959 { 2036 {
1960 if (scrollbarnext_upButton (ev.y)) 2037 if (direction != NO_DIR)
1961 upordown = -1; /* up */
1962 else if (scrollbarnext_dnButton (ev.y))
1963 upordown = 1; /* down */
1964 }
1965 else if (scrollBar.style == R_SB_RXVT)
1966 {
1967 if (scrollbarrxvt_upButton (ev.y))
1968 upordown = -1; /* up */
1969 else if (scrollbarrxvt_dnButton (ev.y))
1970 upordown = 1; /* down */
1971 }
1972 if (upordown)
1973 { 2038 {
1974#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2040 if (!cont_scroll_ev.is_active ())
1975 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1976#endif 2042#endif
1977 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (direction, 1))
1978 { 2044 {
1979 if (upordown < 0) 2045 if (direction == UP)
1980 scrollBar.setUp (); 2046 scrollBar.state = STATE_UP;
1981 else 2047 else
1982 scrollBar.setDn (); 2048 scrollBar.state = STATE_DOWN;
1983 } 2049 }
1984 } 2050 }
1985 else 2051 else
1986 switch (ev.button) 2052 switch (ev.button)
1987 { 2053 {
1988 case Button2: 2054 case Button2:
1989 switch (scrollbar_align) 2055 switch (scrollBar.align)
1990 { 2056 {
1991 case R_SB_ALIGN_TOP: 2057 case R_SB_ALIGN_TOP:
1992 csrO = 0; 2058 csrO = 0;
1993 break; 2059 break;
1994 case R_SB_ALIGN_CENTRE: 2060 case R_SB_ALIGN_CENTRE:
… …
2000 } 2066 }
2001 2067
2002 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
2003 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
2004 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
2005 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2006 2072
2007 scrollBar.setMotion (); 2073 scrollBar.state = STATE_MOTION;
2008 break; 2074 break;
2009 2075
2010 case Button1: 2076 case Button1:
2011 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2012 csrO = ev.y - scrollBar.top; 2078 csrO = ev.y - scrollBar.top;
2013 /* FALLTHROUGH */ 2079 /* FALLTHROUGH */
2014 2080
2015 case Button3: 2081 case Button3:
2016 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
… …
2026 scr_page (DN, nrow - 1); 2092 scr_page (DN, nrow - 1);
2027# else 2093# else
2028 scr_page (DN, nrow / 4); 2094 scr_page (DN, nrow / 4);
2029# endif 2095# endif
2030 else 2096 else
2031 scrollBar.setMotion (); 2097 scrollBar.state = STATE_MOTION;
2032 } 2098 }
2033 else 2099 else
2034 { 2100 {
2035 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
2036 (nrow 2102 (nrow
2037 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
2038 / scrollbar_size ())); 2104 / scrollBar.size ()));
2039 } 2105 }
2040 2106
2041 break; 2107 break;
2042 } 2108 }
2043 } 2109 }
2110
2044 return; 2111 return;
2045 } 2112 }
2046#if MENUBAR
2047 /*
2048 * Menubar window processing of button press
2049 */
2050 if (isMenuBarWindow (ev.window))
2051 menubar_control (ev);
2052#endif
2053} 2113}
2054 2114
2055void 2115void
2056rxvt_term::button_release (XButtonEvent &ev) 2116rxvt_term::button_release (XButtonEvent &ev)
2057{ 2117{
… …
2059 2119
2060 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2121 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2123
2064 if (scrollbar_isUpDn ()) 2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2125 {
2066 scrollBar.setIdle (); 2126 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2127 scrollBar.show (0);
2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2069 refresh_type &= ~SMOOTH_REFRESH;
2070#endif
2071 } 2128 }
2072 2129
2073#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2076#endif 2132#endif
2077 2133
2078 if (ev.window == vt) 2134 if (ev.window == vt)
2079 { 2135 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2137 return;
2138
2080#if ISO_14755 2139#if ISO_14755
2081 // 5.4 2140 // 5.4
2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2083 return; 2142 return;
2084#endif 2143#endif
2144
2085 if (reportmode) 2145 if (reportmode)
2086 { 2146 {
2087 /* mouse report from vt window */ 2147 /* mouse report from vt window */
2088 /* don't report release of wheel "buttons" */ 2148 /* don't report release of wheel "buttons" */
2089 if (ev.button >= 4) 2149 if (ev.button >= 4)
… …
2100 mouse_report (ev); 2160 mouse_report (ev);
2101 } 2161 }
2102#else /* MOUSE_REPORT_DOUBLECLICK */ 2162#else /* MOUSE_REPORT_DOUBLECLICK */
2103 MEvent.button = AnyButton; 2163 MEvent.button = AnyButton;
2104 mouse_report (ev); 2164 mouse_report (ev);
2105#endif /* MOUSE_REPORT_DOUBLECLICK */ 2165#endif /* MOUSE_REPORT_DOUBLECLICK */
2106 return; 2166 return;
2107 } 2167 }
2108 2168
2109 /* 2169 /*
2110 * dumb hack to compensate for the failure of click-and-drag 2170 * dumb hack to compensate for the failure of click-and-drag
… …
2119 { 2179 {
2120 case Button1: 2180 case Button1:
2121 case Button3: 2181 case Button3:
2122 selection_make (ev.time); 2182 selection_make (ev.time);
2123 break; 2183 break;
2184
2124 case Button2: 2185 case Button2:
2125 selection_request (ev.time, ev.x, ev.y); 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2126 break; 2188 break;
2189
2127#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2128 case Button4: 2191 case Button4:
2129 case Button5: 2192 case Button5:
2130 { 2193 {
2131 int i; 2194 int i;
… …
2133 2196
2134 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2135 2198
2136 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2137 i = 1; 2200 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2202 i = nrow - 1;
2140 else 2203 else
2141 i = 5; 2204 i = 5;
2142 2205
2143# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2145 { 2208 {
2146 mouse_slip_wheel_speed += v ? -1 : 1; 2209 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149 2212
2150 if (slip_wheel_ev.at < NOW) 2213 if (!slip_wheel_ev.is_active ())
2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2152
2153 slip_wheel_ev.start ();
2154 } 2215 }
2155 else 2216 else
2217# endif
2156 { 2218 {
2157# endif
2158# ifdef JUMP_MOUSE_WHEEL
2159 scr_page (v, i); 2219 scr_page (v, i);
2160 scr_refresh (SMOOTH_REFRESH);
2161 scrollbar_show (1); 2220 scrollBar.show (1);
2162# else
2163 while (i--)
2164 {
2165 scr_page (v, 1);
2166 scr_refresh (SMOOTH_REFRESH);
2167 scrollbar_show (1);
2168 }
2169# endif
2170# ifdef MOUSE_SLIP_WHEELING
2171 } 2221 }
2172#endif
2173 } 2222 }
2174 break; 2223 break;
2175#endif 2224#endif
2176 } 2225 }
2177 } 2226 }
2178#ifdef MENUBAR
2179 else if (isMenuBarWindow (ev.window))
2180 menubar_control (ev);
2181#endif
2182} 2227}
2183
2184#ifdef TRANSPARENT
2185#if TINTING
2186/* taken from aterm-0.4.2 */
2187
2188typedef uint32_t RUINT32T;
2189
2190void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2191{
2192 int sh_r, sh_g, sh_b;
2193 RUINT32T mask_r, mask_g, mask_b;
2194 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2195 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2196 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2197 int i;
2198
2199 Visual *visual = display->visual;
2200
2201 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2202
2203 /* for convenience */
2204 mask_r = visual->red_mask;
2205 mask_g = visual->green_mask;
2206 mask_b = visual->blue_mask;
2207
2208 /* boring lookup table pre-initialization */
2209 switch (srcImage->bits_per_pixel) {
2210 case 15:
2211 if ((mask_r != 0x7c00) ||
2212 (mask_g != 0x03e0) ||
2213 (mask_b != 0x001f))
2214 return;
2215 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2216 lookup_r = lookup;
2217 lookup_g = lookup+32;
2218 lookup_b = lookup+32+32;
2219 sh_r = 10;
2220 sh_g = 5;
2221 sh_b = 0;
2222 break;
2223 case 16:
2224 if ((mask_r != 0xf800) ||
2225 (mask_g != 0x07e0) ||
2226 (mask_b != 0x001f))
2227 return;
2228 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2229 lookup_r = lookup;
2230 lookup_g = lookup+32;
2231 lookup_b = lookup+32+64;
2232 sh_r = 11;
2233 sh_g = 5;
2234 sh_b = 0;
2235 break;
2236 case 24:
2237 if ((mask_r != 0xff0000) ||
2238 (mask_g != 0x00ff00) ||
2239 (mask_b != 0x0000ff))
2240 return;
2241 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2242 lookup_r = lookup;
2243 lookup_g = lookup+256;
2244 lookup_b = lookup+256+256;
2245 sh_r = 16;
2246 sh_g = 8;
2247 sh_b = 0;
2248 break;
2249 case 32:
2250 if ((mask_r != 0xff0000) ||
2251 (mask_g != 0x00ff00) ||
2252 (mask_b != 0x0000ff))
2253 return;
2254 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2255 lookup_r = lookup;
2256 lookup_g = lookup+256;
2257 lookup_b = lookup+256+256;
2258 sh_r = 16;
2259 sh_g = 8;
2260 sh_b = 0;
2261 break;
2262 default:
2263 return; /* we do not support this color depth */
2264 }
2265
2266 /* prepare limits for color transformation (each channel is handled separately) */
2267 if (shade < 0) {
2268 shade = -shade;
2269 if (shade < 0) shade = 0;
2270 if (shade > 100) shade = 100;
2271
2272 lower_lim_r = 65535-rm;
2273 lower_lim_g = 65535-gm;
2274 lower_lim_b = 65535-bm;
2275
2276 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2277 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2278 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2279
2280 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2281 } else {
2282 if (shade < 0) shade = 0;
2283 if (shade > 100) shade = 100;
2284
2285 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2286
2287 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2288 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2289 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2290 }
2291
2292 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2293 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2294 {
2295 unsigned int tmp;
2296
2297 tmp = lower_lim_r;
2298 lower_lim_r = lower_lim_b;
2299 lower_lim_b = tmp;
2300
2301 tmp = upper_lim_r;
2302 upper_lim_r = upper_lim_b;
2303 upper_lim_b = tmp;
2304 }
2305
2306 /* fill our lookup tables */
2307 for (i = 0; i <= mask_r>>sh_r; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2311 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2312 lookup_r[i] = (tmp/65535)<<sh_r;
2313 }
2314 for (i = 0; i <= mask_g>>sh_g; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2318 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2319 lookup_g[i] = (tmp/65535)<<sh_g;
2320 }
2321 for (i = 0; i <= mask_b>>sh_b; i++)
2322 {
2323 RUINT32T tmp;
2324 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2325 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2326 lookup_b[i] = (tmp/65535)<<sh_b;
2327 }
2328
2329 /* apply table to input image (replacing colors by newly calculated ones) */
2330 switch (srcImage->bits_per_pixel)
2331 {
2332 case 15:
2333 {
2334 unsigned short *p1, *pf, *p, *pl;
2335 p1 = (unsigned short *) srcImage->data;
2336 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2337 while (p1 < pf)
2338 {
2339 p = p1;
2340 pl = p1 + srcImage->width;
2341 for (; p < pl; p++)
2342 {
2343 *p = lookup_r[(*p & 0x7c00)>>10] |
2344 lookup_g[(*p & 0x03e0)>> 5] |
2345 lookup_b[(*p & 0x001f)];
2346 }
2347 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2348 }
2349 break;
2350 }
2351 case 16:
2352 {
2353 unsigned short *p1, *pf, *p, *pl;
2354 p1 = (unsigned short *) srcImage->data;
2355 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2356 while (p1 < pf)
2357 {
2358 p = p1;
2359 pl = p1 + srcImage->width;
2360 for (; p < pl; p++)
2361 {
2362 *p = lookup_r[(*p & 0xf800)>>11] |
2363 lookup_g[(*p & 0x07e0)>> 5] |
2364 lookup_b[(*p & 0x001f)];
2365 }
2366 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2367 }
2368 break;
2369 }
2370 case 24:
2371 {
2372 unsigned char *p1, *pf, *p, *pl;
2373 p1 = (unsigned char *) srcImage->data;
2374 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2375 while (p1 < pf)
2376 {
2377 p = p1;
2378 pl = p1 + srcImage->width * 3;
2379 for (; p < pl; p += 3)
2380 {
2381 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2382 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2383 p[2] = lookup_r[(p[2] & 0x0000ff)];
2384 }
2385 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2386 }
2387 break;
2388 }
2389 case 32:
2390 {
2391 RUINT32T *p1, *pf, *p, *pl;
2392 p1 = (RUINT32T *) srcImage->data;
2393 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2394
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width;
2399 for (; p < pl; p++)
2400 {
2401 *p = lookup_r[(*p & 0xff0000)>>16] |
2402 lookup_g[(*p & 0x00ff00)>> 8] |
2403 lookup_b[(*p & 0x0000ff)] |
2404 (*p & ~0xffffff);
2405 }
2406 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 }
2411
2412 free (lookup);
2413}
2414#endif
2415
2416/*
2417 * Check our parents are still who we think they are.
2418 * Do transparency updates if required
2419 */
2420int
2421rxvt_term::check_our_parents ()
2422{
2423 int i, pchanged, aformat, have_pixmap, rootdepth;
2424 unsigned long nitems, bytes_after;
2425 Atom atype;
2426 unsigned char *prop = NULL;
2427 Window root, oldp, *list;
2428 Pixmap rootpixmap = None;
2429 XWindowAttributes wattr, wrootattr;
2430 dDisp;
2431
2432 pchanged = 0;
2433
2434 if (!OPTION (Opt_transparent))
2435 return pchanged; /* Don't try any more */
2436
2437 XGetWindowAttributes (disp, display->root, &wrootattr);
2438 rootdepth = wrootattr.depth;
2439
2440 XGetWindowAttributes (disp, parent[0], &wattr);
2441
2442 if (rootdepth != wattr.depth)
2443 {
2444 if (am_transparent)
2445 {
2446 pchanged = 1;
2447 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2448 am_transparent = am_pixmap_trans = 0;
2449 }
2450
2451 return pchanged; /* Don't try any more */
2452 }
2453
2454 /* Get all X ops out of the queue so that our information is up-to-date. */
2455 XSync (disp, False);
2456
2457 /*
2458 * Make the frame window set by the window manager have
2459 * the root background. Some window managers put multiple nested frame
2460 * windows for each client, so we have to take care about that.
2461 */
2462 i = (xa[XA_XROOTPMAP_ID]
2463 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2464 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2465 &nitems, &bytes_after, &prop) == Success);
2466
2467 if (!i || prop == NULL)
2468 i = (xa[XA_ESETROOT_PMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL
2474#if TINTING
2475 || !rs[Rs_color + Color_tint]
2476#endif
2477 )
2478 have_pixmap = 0;
2479 else
2480 {
2481 have_pixmap = 1;
2482 rootpixmap = *(Pixmap *)prop;
2483 XFree (prop);
2484 }
2485
2486 if (have_pixmap)
2487 {
2488 /*
2489 * Copy display->root pixmap transparency
2490 */
2491 int sx, sy, nx, ny;
2492 unsigned int nw, nh;
2493 Window cr;
2494 XImage *image;
2495 GC gc;
2496 XGCValues gcvalue;
2497
2498 XTranslateCoordinates (disp, parent[0], display->root,
2499 0, 0, &sx, &sy, &cr);
2500 nw = (unsigned int)szHint.width;
2501 nh = (unsigned int)szHint.height;
2502 nx = ny = 0;
2503
2504 if (sx < 0)
2505 {
2506 nw += sx;
2507 nx = -sx;
2508 sx = 0;
2509 }
2510
2511 if (sy < 0)
2512 {
2513 nh += sy;
2514 ny = -sy;
2515 sy = 0;
2516 }
2517
2518 min_it (nw, (unsigned int) (wrootattr.width - sx));
2519 min_it (nh, (unsigned int) (wrootattr.height - sy));
2520
2521 XSync (disp, False);
2522 allowedxerror = -1;
2523 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2524
2525 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2526 /* XXX: may need a delay here? */
2527 allowedxerror = 0;
2528
2529 if (image == NULL)
2530 {
2531 if (am_transparent && am_pixmap_trans)
2532 {
2533 pchanged = 1;
2534 if (pixmap != None)
2535 {
2536 XFreePixmap (disp, pixmap);
2537 pixmap = None;
2538 }
2539 }
2540
2541 am_pixmap_trans = 0;
2542 }
2543 else
2544 {
2545 if (pixmap != None)
2546 XFreePixmap (disp, pixmap);
2547
2548#if TINTING
2549 if (ISSET_PIXCOLOR (Color_tint))
2550 {
2551 unsigned short rm, gm, bm;
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2555
2556 ShadeXImage (display, image, shade, rm, gm, bm);
2557 }
2558#endif
2559
2560 pixmap = XCreatePixmap (disp, vt,
2561 szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2563 XPutImage (disp, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (disp, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2568 XClearWindow (disp, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (disp, parent[i - 1], &root,
2589 &parent[i], &list, &n);
2590 XFree (list);
2591
2592 if (parent[i] == display->root)
2593 {
2594 if (oldp != None)
2595 pchanged = 1;
2596
2597 break;
2598 }
2599
2600 if (oldp != parent[i])
2601 pchanged = 1;
2602 }
2603
2604 n = 0;
2605
2606 if (pchanged)
2607 {
2608 for (; n < (unsigned int)i; n++)
2609 {
2610 XGetWindowAttributes (disp, parent[n], &wattr);
2611 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2612 {
2613 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2614 break;
2615 }
2616 }
2617 }
2618
2619 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2620 {
2621 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2622 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2623 am_transparent = 0;
2624 /* XXX: also turn off Opt_transparent? */
2625 }
2626 else
2627 {
2628#if WAIT_FOR_WM
2629 /* wait (an arbitrary period) for the WM to do its thing
2630 * needed for fvwm2.2.2 (and before?) */
2631 sleep (1);
2632#endif
2633 for (n = 0; n < (unsigned int)i; n++)
2634 {
2635 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2636 XClearWindow (disp, parent[n]);
2637 }
2638
2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2640 am_transparent = 1;
2641 }
2642
2643 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 parent[i] = None;
2645 }
2646
2647 if (scrollBar.win)
2648 {
2649 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2650 scrollBar.setIdle ();
2651 scrollbar_show (0);
2652 }
2653
2654 if (am_transparent)
2655 {
2656 want_refresh = want_full_refresh = 1;
2657 if (am_pixmap_trans)
2658 flush ();
2659 }
2660
2661 return pchanged;
2662}
2663#endif
2664 2228
2665/*}}} */ 2229/*}}} */
2666 2230
2667bool 2231void
2668rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2669{ 2233{
2670 bool flag = false;
2671 unicode_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2672 unsigned char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2673 2236
2674 for (;;) 2237 for (;;)
2675 { 2238 {
2676 if (ch == NOCHAR) 2239 if (expect_false (ch == NOCHAR))
2677 { 2240 {
2678 seq_begin = cmdbuf_ptr; 2241 seq_begin = cmdbuf_ptr;
2679 ch = next_char (); 2242 ch = next_char ();
2680 }
2681 2243
2682 if (ch == NOCHAR) // TODO: improve 2244 if (ch == NOCHAR)
2683 break; 2245 break;
2246 }
2684 2247
2685 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2686 { 2249 {
2687 if (!seen_input) 2250 if (expect_false (!seen_input))
2688 { 2251 {
2689 seen_input = 1; 2252 seen_input = 1;
2690 // many badly-written programs (e.g. jed) contain a race condition: 2253 // many badly-written programs (e.g. jed) contain a race condition:
2691 // they first read the screensize and then install a SIGWINCH handler. 2254 // they first read the screensize and then install a SIGWINCH handler.
2692 // some window managers resize the window early, and these programs 2255 // some window managers resize the window early, and these programs
… …
2697 if (seen_resize && cmd_pid) 2260 if (seen_resize && cmd_pid)
2698 kill (-cmd_pid, SIGWINCH); 2261 kill (-cmd_pid, SIGWINCH);
2699 } 2262 }
2700 2263
2701 /* Read a text string from the input buffer */ 2264 /* Read a text string from the input buffer */
2702 unicode_t buf[UBUFSIZ]; 2265 wchar_t buf[UBUFSIZ];
2703 bool refreshnow = false; 2266 bool refreshnow = false;
2704 int nlines = 0; 2267 int nlines = 0;
2705 unicode_t *str = buf; 2268 wchar_t *str = buf;
2706 unicode_t *eol = str + min (ncol, UBUFSIZ); 2269 wchar_t *eol = str + min (ncol, UBUFSIZ);
2707 2270
2708 for (;;) 2271 for (;;)
2709 { 2272 {
2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2711 break; 2274 break;
2712 2275
2713 *str++ = ch; 2276 *str++ = ch;
2714 2277
2715 if (ch == C0_LF || str >= eol) 2278 if (expect_false (ch == C0_LF || str >= eol))
2716 { 2279 {
2717 if (ch == C0_LF) 2280 if (ch == C0_LF)
2718 nlines++; 2281 nlines++;
2719 2282
2720 refresh_count++; 2283 refresh_count++;
2721 2284
2722 if (!OPTION (Opt_jumpScroll) 2285 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2724 { 2286 {
2725 refreshnow = true;
2726 refresh_count = 0; 2287 refresh_count = 0;
2288
2289 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2290 {
2291 refreshnow = true;
2727 ch = NOCHAR; 2292 ch = NOCHAR;
2728 break; 2293 break;
2294 }
2729 } 2295 }
2730 2296
2731 // scr_add_lines only works for nlines <= nrow - 1. 2297 // scr_add_lines only works for nlines <= nrow - 1.
2732 if (nlines >= nrow - 1) 2298 if (nlines >= nrow - 1)
2733 { 2299 {
2300 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2301 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2734 scr_add_lines (buf, nlines, str - buf); 2302 scr_add_lines (buf, str - buf, nlines);
2303
2735 nlines = 0; 2304 nlines = 0;
2736 str = buf; 2305 str = buf;
2737 eol = str + min (ncol, UBUFSIZ); 2306 eol = str + min (ncol, UBUFSIZ);
2738 } 2307 }
2739 2308
… …
2752 2321
2753 seq_begin = cmdbuf_ptr; 2322 seq_begin = cmdbuf_ptr;
2754 ch = next_char (); 2323 ch = next_char ();
2755 } 2324 }
2756 2325
2326 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2327 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2757 scr_add_lines (buf, nlines, str - buf); 2328 scr_add_lines (buf, str - buf, nlines);
2758 2329
2759 /* 2330 /*
2760 * If there have been a lot of new lines, then update the screen 2331 * If there have been a lot of new lines, then update the screen
2761 * What the heck I'll cheat and only refresh less than every page-full. 2332 * What the heck we'll cheat and only refresh less than every page-full.
2762 * the number of pages between refreshes is refresh_limit, which 2333 * if skipScroll is enabled.
2763 * is incremented here because we must be doing flat-out scrolling.
2764 */ 2334 */
2765 if (refreshnow) 2335 if (refreshnow)
2766 { 2336 {
2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2768 refresh_limit++;
2769 else
2770 {
2771 flag = true;
2772 scr_refresh (refresh_type); 2337 scr_refresh ();
2773 flush_ev.stop (); 2338 want_refresh = 1;
2774 }
2775 } 2339 }
2776
2777 } 2340 }
2778 else 2341 else
2779 { 2342 {
2780 try 2343 try
2781 { 2344 {
… …
2789 } 2352 }
2790 2353
2791 ch = NOCHAR; 2354 ch = NOCHAR;
2792 } 2355 }
2793 } 2356 }
2794
2795 return flag;
2796}
2797
2798// read the next octet
2799unicode_t
2800rxvt_term::next_octet ()
2801{
2802 return cmdbuf_ptr < cmdbuf_endp
2803 ? *cmdbuf_ptr++
2804 : NOCHAR;
2805} 2357}
2806 2358
2807// read the next character 2359// read the next character
2808unicode_t 2360wchar_t
2809rxvt_term::next_char () 2361rxvt_term::next_char () NOTHROW
2810{ 2362{
2811 while (cmdbuf_ptr < cmdbuf_endp) 2363 while (cmdbuf_ptr < cmdbuf_endp)
2812 { 2364 {
2813 // assume 7-bit to be ascii ALWAYS 2365 // assume 7-bit to be ascii ALWAYS
2814 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2815 return *cmdbuf_ptr++; 2367 return *cmdbuf_ptr++;
2816 2368
2817 wchar_t wc; 2369 wchar_t wc;
2818 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2819 2371
2820 if (len == (size_t)-2) 2372 if (len == (size_t)-2)
2821 { 2373 {
2822 // the mbstate stores incomplete sequences. didn't know this :/ 2374 // the mbstate stores incomplete sequences. didn't know this :/
2823 cmdbuf_ptr = cmdbuf_endp; 2375 cmdbuf_ptr = cmdbuf_endp;
2824 break; 2376 break;
2825 } 2377 }
2826 2378
2827 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2380 {
2381 mbstate.reset (); // reset now undefined conversion state
2828 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 }
2829 2384
2830 // assume wchar == unicode 2385 // assume wchar == unicode
2831 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2832 return wc & UNICODE_MASK; 2387 return wc & UNICODE_MASK;
2833 } 2388 }
2834 2389
2835 return NOCHAR; 2390 return NOCHAR;
2836} 2391}
2392
2393// read the next octet
2394uint32_t
2395rxvt_term::next_octet () NOTHROW
2396{
2397 return cmdbuf_ptr < cmdbuf_endp
2398 ? (unsigned char)*cmdbuf_ptr++
2399 : NOCHAR;
2400}
2401
2402static class out_of_input out_of_input;
2837 2403
2838/* rxvt_cmd_getc () - Return next input character */ 2404/* rxvt_cmd_getc () - Return next input character */
2839/* 2405/*
2840 * Return the next input character after first passing any keyboard input 2406 * Return the next input character after first passing any keyboard input
2841 * to the command. 2407 * to the command.
2842 */ 2408 */
2843unicode_t 2409wchar_t
2844rxvt_term::cmd_getc () 2410rxvt_term::cmd_getc () THROW ((class out_of_input))
2845{ 2411{
2846 unicode_t c = next_char (); 2412 wchar_t c = next_char ();
2847 2413
2848 if (c == NOCHAR) 2414 if (c == NOCHAR)
2849 throw out_of_input; 2415 throw out_of_input;
2850 2416
2851 return c; 2417 return c;
2852} 2418}
2853 2419
2854unicode_t 2420uint32_t
2855rxvt_term::cmd_get8 () 2421rxvt_term::cmd_get8 () THROW ((class out_of_input))
2856{ 2422{
2857 unicode_t c = next_octet (); 2423 uint32_t c = next_octet ();
2858 2424
2859 if (c == NOCHAR) 2425 if (c == NOCHAR)
2860 throw out_of_input; 2426 throw out_of_input;
2861 2427
2862 return c; 2428 return c;
… …
2866/*----------------------------------------------------------------------*/ 2432/*----------------------------------------------------------------------*/
2867#ifdef PRINTPIPE 2433#ifdef PRINTPIPE
2868FILE * 2434FILE *
2869rxvt_term::popen_printer () 2435rxvt_term::popen_printer ()
2870{ 2436{
2871 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2872 2438
2873 if (stream == NULL) 2439 if (stream == NULL)
2874 rxvt_warn ("can't open printer pipe, not printing.\n"); 2440 rxvt_warn ("can't open printer pipe, not printing.\n");
2875 2441
2876 return stream; 2442 return stream;
… …
2887 * simulate attached vt100 printer 2453 * simulate attached vt100 printer
2888 */ 2454 */
2889void 2455void
2890rxvt_term::process_print_pipe () 2456rxvt_term::process_print_pipe ()
2891{ 2457{
2892 int done; 2458 FILE *fd = popen_printer ();
2893 FILE *fd;
2894 2459
2895 if ((fd = popen_printer ()) == NULL) 2460 if (!fd)
2896 return; 2461 return;
2897 2462
2898 /* 2463 /*
2899 * Send all input to the printer until either ESC[4i or ESC[?4i 2464 * Send all input to the printer until either ESC[4i or ESC[?4i
2900 * is received. 2465 * is received.
2901 */ 2466 */
2902 for (done = 0; !done;) 2467 for (int done = 0; !done; )
2903 { 2468 {
2904 unsigned char buf[8]; 2469 unsigned char buf[8];
2905 unicode_t ch; 2470 unicode_t ch;
2906 unsigned int i, len; 2471 unsigned int i, len;
2907 2472
… …
2926 { 2491 {
2927 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2928 break; /* done = 1 */ 2493 break; /* done = 1 */
2929 } 2494 }
2930 } 2495 }
2931 2496
2932 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2933 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2934 { 2499 {
2935 done = 1; 2500 done = 1;
2936 break; 2501 break;
… …
2938 } 2503 }
2939 } 2504 }
2940 2505
2941 pclose_printer (fd); 2506 pclose_printer (fd);
2942} 2507}
2943#endif /* PRINTPIPE */ 2508#endif /* PRINTPIPE */
2944/*}}} */ 2509/*}}} */
2945 2510
2946/* *INDENT-OFF* */ 2511/* *INDENT-OFF* */
2947enum { 2512enum {
2948 C1_40 = 0x40, 2513 C1_40 = 0x40,
… …
2962 case C0_ESC: 2527 case C0_ESC:
2963 process_escape_seq (); 2528 process_escape_seq ();
2964 break; 2529 break;
2965 case C0_ENQ: /* terminal Status */ 2530 case C0_ENQ: /* terminal Status */
2966 if (rs[Rs_answerbackstring]) 2531 if (rs[Rs_answerbackstring])
2967 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2532 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2968 (unsigned int)strlen (rs[Rs_answerbackstring]));
2969 else 2533 else
2970 tt_write ((unsigned char *)VT100_ANS, 2534 tt_write (VT100_ANS, strlen (VT100_ANS));
2971 (unsigned int)strlen (VT100_ANS));
2972 break; 2535 break;
2973 case C0_BEL: /* bell */ 2536 case C0_BEL: /* bell */
2974 scr_bell (); 2537 scr_bell ();
2975 break; 2538 break;
2976 case C0_BS: /* backspace */ 2539 case C0_BS: /* backspace */
… …
3000 process_dcs_seq (); 2563 process_dcs_seq ();
3001 break; 2564 break;
3002 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
3003 process_csi_seq (); 2566 process_csi_seq ();
3004 break; 2567 break;
3005 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
3006 process_osc_seq (); 2569 process_osc_seq ();
3007 break; 2570 break;
3008#endif 2571#endif
3009 } 2572 }
3010} 2573}
… …
3054 break; 2617 break;
3055 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
3056 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3057 break; 2620 break;
3058 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
3059 PrivMode (0, PrivMode_vt52); 2622 set_privmode (PrivMode_vt52, 0);
3060 break; 2623 break;
3061 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
3062 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
3063 /* unimplemented */ 2626 /* unimplemented */
3064 break; 2627 break;
… …
3100 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
3101 break; 2664 break;
3102 case '+': 2665 case '+':
3103 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
3104 break; 2667 break;
3105#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3106 case '6': 2669 case '6':
3107 scr_backindex (); 2670 scr_backindex ();
3108 break; 2671 break;
3109#endif 2672#endif
3110 case '7': 2673 case '7':
3111 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
3112 break; 2675 break;
3113 case '8': 2676 case '8':
3114 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
3115 break; 2678 break;
3116#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3117 case '9': 2680 case '9':
3118 scr_forwardindex (); 2681 scr_forwardindex ();
3119 break; 2682 break;
3120#endif 2683#endif
3121 case '=': 2684 case '=':
3122 case '>': 2685 case '>':
3123 PrivMode ((ch == '='), PrivMode_aplKP); 2686 set_privmode (PrivMode_aplKP, ch == '=');
3124 break; 2687 break;
3125 2688
3126 case C1_40: 2689 case C1_40:
3127 cmd_getc (); 2690 cmd_getc ();
3128 break; 2691 break;
… …
3131 break; 2694 break;
3132 2695
3133 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
3134 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
3135 { 2698 {
3136 unicode_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
3137 scr_add_lines (nlcr, 1, 2); 2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3138 } 2701 }
3139 break; 2702 break;
3140 2703
3141 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
3142 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
3164 process_dcs_seq (); 2727 process_dcs_seq ();
3165 break; 2728 break;
3166 2729
3167 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3168 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
3169 tt_write ((const unsigned char *)ESCZ_ANSWER, 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3170 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3171 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
3172 2734
3173 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3174 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
3175 process_csi_seq (); 2737 process_csi_seq ();
3176 break; 2738 break;
3177 2739
3178 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3179 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
3180 process_osc_seq (); 2742 process_osc_seq ();
3181 break; 2743 break;
3182 2744
3183 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3184 case 'c': 2746 case 'c':
3185 mbstate.reset (); 2747 mbstate.reset ();
3186 scr_poweron (); 2748 scr_poweron ();
3187 scrollbar_show (1); 2749 scrollBar.show (1);
3188 break; 2750 break;
3189 2751
3190 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3191 case 'n': 2753 case 'n':
3192 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
3218 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3219 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3220#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
3221 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
3222 2784
3223const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
3224 { 2786 {
3225 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3226 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3227 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3228 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3237rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3238{ 2800{
3239 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3240 unsigned int nargs, p; 2802 unsigned int nargs, p;
3241 int n, ndef; 2803 int n, ndef;
3242 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3243 2805
3244 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3245 arg[--nargs] = 0;
3246 2807
3247 priv = 0; 2808 priv = 0;
3248 ch = cmd_getc (); 2809 ch = cmd_getc ();
3249 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2811 {
3250 { /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
3251 priv = ch; 2813 priv = ch;
3252 ch = cmd_getc (); 2814 ch = cmd_getc ();
3253 } 2815 }
3254 2816
3255 /* read any numerical arguments */ 2817 /* read any numerical arguments */
… …
3284 ndef = get_byte_array_bit (csi_defaults, i); 2846 ndef = get_byte_array_bit (csi_defaults, i);
3285 for (p = 0; p < nargs; p++) 2847 for (p = 0; p < nargs; p++)
3286 if (arg[p] == -1) 2848 if (arg[p] == -1)
3287 arg[p] = ndef; 2849 arg[p] = ndef;
3288 2850
3289#ifdef DEBUG_CMD
3290 fprintf (stderr, "CSI ");
3291 for (p = 0; p < nargs; p++)
3292 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3293 fprintf (stderr, "%c\n", ch);
3294#endif
3295
3296 /* 2851 /*
3297 * private mode handling 2852 * private mode handling
3298 */ 2853 */
3299 if (priv) 2854 if (priv)
3300 { 2855 {
3301 switch (priv) 2856 switch (priv)
3302 { 2857 {
3303 case '>': 2858 case '>':
3304 if (ch == CSI_DA) /* secondary device attributes */ 2859 if (ch == CSI_DA) /* secondary device attributes */
3305 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2860 {
2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2863 //
2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2866 // versions.
2867 //
2868 tt_printf ("\033[>%d;95;0c", 'U');
2869 }
3306 break; 2870 break;
2871
3307 case '?': 2872 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
3310 break; 2875 break;
2876
2877 case '!':
2878 if (ch == CSI_70)
2879 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset ();
2882
2883 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3311 } 2888 }
2889 break;
2890 }
2891
3312 return; 2892 return;
3313 } 2893 }
3314 2894
3315 switch (ch) 2895 switch (ch)
3316 { 2896 {
… …
3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2999 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3000 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3421 break; 3001 break;
3422 3002
3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3003 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3424 tt_write ((const unsigned char *)VT100_ANS, 3004 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3425 (unsigned int) (sizeof (VT100_ANS) - 1));
3426 break; 3005 break;
3427 3006
3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3007 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3429 process_sgr_mode (nargs, arg); 3008 process_sgr_mode (nargs, arg);
3430 break; 3009 break;
… …
3437 break; 3016 break;
3438 case 6: /* CPR requested */ 3017 case 6: /* CPR requested */
3439 scr_report_position (); 3018 scr_report_position ();
3440 break; 3019 break;
3441 case 7: /* unofficial extension */ 3020 case 7: /* unofficial extension */
3442 if (OPTION (Opt_insecure)) 3021 if (option (Opt_insecure))
3443 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3022 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3444 break; 3023 break;
3445 case 8: /* unofficial extension */ 3024 case 8: /* unofficial extension */
3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3025 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3447 break; 3026 break;
… …
3514 break; 3093 break;
3515 case CSI_75: 3094 case CSI_75:
3516 scr_cursor (RESTORE); 3095 scr_cursor (RESTORE);
3517 break; 3096 break;
3518 3097
3519#if ENABLE_FRILLS 3098#if !ENABLE_MINIMAL
3520 case CSI_74: 3099 case CSI_74:
3521 process_window_ops (arg, nargs); 3100 process_window_ops (arg, nargs);
3522 break; 3101 break;
3523#endif 3102#endif
3524 3103
… …
3531 break; 3110 break;
3532 } 3111 }
3533} 3112}
3534/*}}} */ 3113/*}}} */
3535 3114
3536#if ENABLE_FRILLS 3115#if !ENABLE_MINIMAL
3537/* ARGSUSED */ 3116/* ARGSUSED */
3538void 3117void
3539rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3540{ 3119{
3541 int x, y; 3120 int x, y;
3542 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
3543 Window wdummy; 3122 Window wdummy;
3544 dDisp; 3123
3124 dLocal (Display *, dpy);
3545 3125
3546 if (nargs == 0) 3126 if (nargs == 0)
3547 return; 3127 return;
3548 3128
3549 switch (args[0]) 3129 switch (args[0])
3550 { 3130 {
3551 /* 3131 /*
3552 * commands 3132 * commands
3553 */ 3133 */
3554 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3555 XMapWindow (disp, parent[0]); 3135 XMapWindow (dpy, parent[0]);
3556 break; 3136 break;
3557 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3558 XIconifyWindow (disp, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent[0], display->screen);
3559 break; 3139 break;
3560 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3561 XMoveWindow (disp, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent[0], args[1], args[2]);
3562 break; 3142 break;
3563 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3565 break; 3145 break;
3566 case 5: /* raise window */ 3146 case 5: /* raise window */
3567 XRaiseWindow (disp, parent[0]); 3147 XRaiseWindow (dpy, parent[0]);
3568 break; 3148 break;
3569 case 6: /* lower window */ 3149 case 6: /* lower window */
3570 XLowerWindow (disp, parent[0]); 3150 XLowerWindow (dpy, parent[0]);
3571 break; 3151 break;
3572 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3573 scr_touch (true); 3153 scr_touch (true);
3574 break; 3154 break;
3575 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3582 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3583 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)width,
3584 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3585 break; 3165 break;
3586 3166
3587
3588 /* 3167 /*
3589 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3590 */ 3169 */
3591 case 11: /* report window state */ 3170 case 11: /* report window state */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3594 break; 3173 break;
3595 case 13: /* report window position */ 3174 case 13: /* report window position */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 XTranslateCoordinates (disp, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent[0], wattr.root,
3598 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3599 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3600 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3601 break; 3180 break;
3602 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent[0], &wattr);
3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3605 break; 3184 break;
3606 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3607 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3608 break; 3187 break;
… …
3610 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3611 break; 3190 break;
3612 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3613 { 3192 {
3614 char *s; 3193 char *s;
3615 XGetIconName (disp, parent[0], &s); 3194 XGetIconName (dpy, parent[0], &s);
3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3196 XFree (s);
3618 } 3197 }
3619 break; 3198 break;
3620 case 21: /* report window title */ 3199 case 21: /* report window title */
3621 { 3200 {
3622 char *s; 3201 char *s;
3623 XFetchName (disp, parent[0], &s); 3202 XFetchName (dpy, parent[0], &s);
3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3204 XFree (s);
3626 } 3205 }
3627 break; 3206 break;
3628 } 3207 }
3629} 3208}
… …
3632/*----------------------------------------------------------------------*/ 3211/*----------------------------------------------------------------------*/
3633/* 3212/*
3634 * get input up until STRING TERMINATOR (or BEL) 3213 * get input up until STRING TERMINATOR (or BEL)
3635 * ends_how is terminator used. returned input must be free()'d 3214 * ends_how is terminator used. returned input must be free()'d
3636 */ 3215 */
3637unsigned char * 3216char *
3638rxvt_term::get_to_st (unicode_t &ends_how) 3217rxvt_term::get_to_st (unicode_t &ends_how)
3639{ 3218{
3640 unicode_t ch; 3219 unicode_t ch;
3641 bool seen_esc = false; 3220 bool seen_esc = false;
3642 unsigned int n = 0; 3221 unsigned int n = 0;
… …
3656 seen_esc = true; 3235 seen_esc = true;
3657 continue; 3236 continue;
3658 } 3237 }
3659 else if (ch == C0_BEL || ch == CHAR_ST) 3238 else if (ch == C0_BEL || ch == CHAR_ST)
3660 break; 3239 break;
3240 else if (ch == C0_SYN)
3241 ch = cmd_get8 ();
3661 else if (ch < 0x20) 3242 else if (ch < 0x20)
3662 return NULL; /* other control character - exit */ 3243 return NULL; /* other control character - exit */
3663 3244
3664 seen_esc = false; 3245 seen_esc = false;
3665 3246
3666 if (n >= STRING_MAX - 1) 3247 if (n >= STRING_MAX - 1)
3667 // stop at some sane length 3248 // stop at some sane length
3668 return NULL; 3249 return NULL;
3669 3250
3670 if (ch == C0_SYN)
3671 string[n++] = cmd_get8 ();
3672 else
3673 string[n++] = ch; 3251 string[n++] = ch;
3674 } 3252 }
3675 3253
3676 string[n++] = '\0'; 3254 string[n++] = '\0';
3677 3255
3678 ends_how = (ch == 0x5c ? C0_ESC : ch); 3256 ends_how = (ch == 0x5c ? C0_ESC : ch);
3679 3257
3680 return (unsigned char *)rxvt_wcstombs (string); 3258 return rxvt_wcstombs (string);
3681} 3259}
3682 3260
3683/*----------------------------------------------------------------------*/ 3261/*----------------------------------------------------------------------*/
3684/* 3262/*
3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3686 */ 3264 */
3687void 3265void
3688rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3689{ 3267{
3690 unsigned char *s;
3691 unicode_t eh;
3692
3693 /* 3268 /*
3694 * Not handled yet 3269 * Not handled yet
3695 */ 3270 */
3271
3272 unicode_t eh;
3696 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3697 if (s) 3274 if (s)
3698 free (s); 3275 free (s);
3699 3276
3700 return; 3277 return;
3701} 3278}
… …
3705 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3706 */ 3283 */
3707void 3284void
3708rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3709{ 3286{
3710 unicode_t ch, eh;
3711 int arg; 3287 int arg;
3712 3288
3713 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3714 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3715 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3716 3292
3717 if (ch == ';') 3293 if (ch == ';')
3718 { 3294 {
3295 unicode_t eh;
3719 unsigned char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3720 3297
3721 if (s) 3298 if (s)
3722 { 3299 {
3723 process_xterm_seq (arg, (char *)s, eh); 3300 process_xterm_seq (arg, s, eh);
3724 free (s); 3301 free (s);
3725 } 3302 }
3726 } 3303 }
3727} 3304}
3728 3305
3729void 3306void
3730rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3307rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{ 3308{
3732 if (str[0] == '?' && !str[1]) 3309 if (str[0] == '?' && !str[1])
3733 { 3310 {
3734 unsigned short r, g, b; 3311 rgba c;
3735 pix_colors_focused[color].get (display, r, g, b); 3312 pix_colors_focused[color].get (c);
3313
3314#if XFT
3315 if (c.a != rgba::MAX_CC)
3316 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3317 else
3318#endif
3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3319 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3737 } 3320 }
3738 else 3321 else
3739 set_window_color (color, str); 3322 set_window_color (color, str);
3740} 3323}
3741 3324
3742/* 3325/*
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3327 */
3745void 3328void
3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3747{ 3330{
3748 int changed = 0;
3749 int color; 3331 int color;
3750 char *buf, *name; 3332 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3334 int saveop = op;
3753 dDisp; 3335
3336 dLocal (Display *, dpy);
3754 3337
3755 assert (str != NULL); 3338 assert (str != NULL);
3339
3340 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3341 return;
3342
3756 switch (op) 3343 switch (op)
3757 { 3344 {
3758 case XTerm_name: 3345 case XTerm_name:
3759 set_title (str); 3346 set_title (str);
3760 /* FALLTHROUGH */ 3347 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3361 unsigned long bytes_after;
3775 unsigned char *value = 0; 3362 unsigned char *value = 0;
3776 const char *str = ""; 3363 const char *str = "";
3777 3364
3778 if (prop 3365 if (prop
3779 && XGetWindowProperty (disp, parent[0], 3366 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3370 && actual_type != None
3784 && actual_format == 8) 3371 && actual_format == 8)
3785 str = (const char *)(value); 3372 str = (const char *)(value);
3786 3373
3787 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3374 tt_printf ("\033]%d;%s%c", op, str, resp);
3788 3375
3789 XFree (value); 3376 XFree (value);
3790 } 3377 }
3791 else 3378 else
3792 { 3379 {
3793 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3794 3381
3795 if (eq) 3382 if (eq)
3796 { 3383 {
3797 *eq = 0; 3384 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3799 } 3386 }
3800 else 3387 else
3801 XDeleteProperty (disp, parent[0], 3388 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3389 display->atom (str));
3803 } 3390 }
3804 break; 3391 break;
3805 3392
3806 case XTerm_Color: 3393 case XTerm_Color:
… …
3808 { 3395 {
3809 if ((name = strchr (buf, ';')) == NULL) 3396 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3397 break;
3811 3398
3812 *name++ = '\0'; 3399 *name++ = '\0';
3813 color = atoi (buf); 3400 color = atoi (buf) + minCOLOR;
3814 3401
3815 if (color < 0 || color >= TOTAL_COLORS) 3402 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3403 break;
3817 3404
3818 if ((buf = strchr (name, ';')) != NULL) 3405 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3406 *buf++ = '\0';
3820 3407
3821 if (name[0] == '?' && !name[1]) 3408 process_color_seq (op, color, name, resp);
3409 }
3410 break;
3411 case Rxvt_restoreFG:
3412 case XTerm_Color00:
3413 process_color_seq (op, Color_fg, str, resp);
3414 break;
3415 case Rxvt_restoreBG:
3416 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp);
3418 break;
3419#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor:
3421 process_color_seq (op, Color_cursor, str, resp);
3422 break;
3423#endif
3424 case XTerm_Color_pointer_fg:
3425 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break;
3427 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp);
3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3439 case URxvt_Color_BD:
3440 process_color_seq (op, Color_BD, str, resp);
3441 break;
3442 case URxvt_Color_UL:
3443 process_color_seq (op, Color_UL, str, resp);
3444 break;
3445 case URxvt_Color_IT:
3446 process_color_seq (op, Color_IT, str, resp);
3447 break;
3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3452#if ENABLE_TRANSPARENCY
3453 case URxvt_Color_tint:
3454 process_color_seq (op, Color_tint, str, resp);
3455 {
3456 bool changed = false;
3457
3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462
3463 if (changed)
3464 update_background ();
3465 }
3466
3467 break;
3468#endif
3469
3470#if BG_IMAGE_FROM_FILE
3471 case Rxvt_Pixmap:
3472 if (!strcmp (str, "?"))
3473 {
3474 char str[256];
3475
3476 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 }
3481 else
3482 {
3483 int changed = 0;
3484
3485 if (*str != ';')
3822 { 3486 {
3823 unsigned short r, g, b; 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3488 {
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3489 changed++;
3490 str = strchr (str, ';');
3491 if (str == NULL)
3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3826 } 3496 }
3827 else 3497 else
3828 set_window_color (color + minCOLOR, name); 3498 {
3499 str++;
3500 if (bgPixmap.set_geometry (str, true))
3501 changed++;
3502 }
3503
3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3512 update_background ();
3513 }
3829 } 3514 }
3830 break; 3515 break;
3831 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3833 break;
3834 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3836 break;
3837#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3840 break;
3841#endif 3516#endif
3842 case XTerm_Color_pointer_fg:
3843 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3844 break;
3845 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3847 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE
3849 case XTerm_Color_BD:
3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3851 break;
3852 case XTerm_Color_UL:
3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3854 break;
3855 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3857 break;
3858 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break;
3861#endif
3862#if TRANSPARENT && TINTING
3863 case URxvt_Color_tint:
3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3865 check_our_parents ();
3866 if (am_transparent)
3867 want_full_refresh = want_refresh = 1;
3868 break;
3869#endif
3870
3871 case XTerm_Pixmap:
3872 if (*str != ';')
3873 {
3874#if XPM_BACKGROUND
3875 scale_pixmap (""); /* reset to default scaling */
3876 set_bgPixmap (str); /* change pixmap */
3877#endif
3878 scr_touch (true);
3879 }
3880 while ((str = strchr (str, ';')) != NULL)
3881 {
3882 str++;
3883#if XPM_BACKGROUND
3884 changed += scale_pixmap (str);
3885#endif
3886 }
3887
3888 if (changed)
3889 {
3890#ifdef XPM_BACKGROUND
3891 resize_pixmap ();
3892#endif
3893 scr_touch (true);
3894 }
3895 break;
3896
3897 case XTerm_restoreFG:
3898 set_window_color (Color_fg, str);
3899 break;
3900 case XTerm_restoreBG:
3901 set_window_color (Color_bg, str);
3902 break;
3903 3517
3904 case XTerm_logfile: 3518 case XTerm_logfile:
3905 // TODO, when secure mode? 3519 // TODO, when secure mode?
3906 break; 3520 break;
3907 3521
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0 3522#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3523 case Rxvt_dumpscreen: /* no error notices */
3916 { 3524 {
3917 int fd; 3525 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3526 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 { 3527 {
3920 scr_dump (fd); 3528 scr_dump (fd);
… …
3931 case URxvt_italicFont: 3539 case URxvt_italicFont:
3932 case URxvt_boldItalicFont: 3540 case URxvt_boldItalicFont:
3933#endif 3541#endif
3934 if (query) 3542 if (query)
3935 tt_printf ("\33]%d;%-.250s%c", saveop, 3543 tt_printf ("\33]%d;%-.250s%c", saveop,
3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3544 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3937 ? fontset[op - URxvt_font]->fontdesc : "", 3545 ? fontset[op - URxvt_font]->fontdesc : "",
3938 resp); 3546 resp);
3939 else 3547 else
3940 { 3548 {
3941 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3549 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3944 allocated.push_back ((void *)res); 3552 allocated.push_back ((void *)res);
3945 set_fonts (); 3553 set_fonts ();
3946 } 3554 }
3947 break; 3555 break;
3948 3556
3949#if ENABLE_FRILLS 3557 case URxvt_version:
3558 if (query)
3559 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3560 op,
3561 rs[Rs_name], VERSION[0], VERSION[2],
3562 resp);
3563 break;
3564
3565#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3566 case URxvt_locale:
3951 if (query) 3567 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3568 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3569 else
3954 { 3570 {
3955 set_locale (str); 3571 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8); 3572 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3573 init_xlocale ();
3958 } 3574 }
3959 break; 3575 break;
3960 3576
3961 case URxvt_view_up: 3577 case URxvt_view_up:
3962 case URxvt_view_down: 3578 case URxvt_view_down:
3579 {
3963 int lines = atoi (str); 3580 int lines = atoi (str);
3964 3581
3965 if (lines) 3582 if (lines)
3966 scr_page (op == URxvt_view_up ? UP : DN, lines); 3583 scr_page (op == URxvt_view_up ? UP : DN, lines);
3967 else 3584 else
3968 {
3969 scr_erase_savelines (); 3585 scr_erase_savelines ();
3970 } 3586 }
3971 3587
3588 break;
3589#endif
3590
3591#if ENABLE_PERL
3592 case URxvt_perl:
3593 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3972 break; 3594 break;
3973#endif 3595#endif
3974 } 3596 }
3975} 3597}
3976/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
… …
3999 { 3621 {
4000 if (mode == 'r') 3622 if (mode == 'r')
4001 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4002 else 3624 else
4003 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4004 PrivMode (state, bit); 3626
3627 set_privmode (bit, state);
4005 } 3628 }
4006 3629
4007 return state; 3630 return state;
4008} 3631}
4009 3632
4010/* we're not using priv _yet_ */ 3633/* we're not using priv _yet_ */
4011void 3634void
4012rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3635rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4013{ 3636{
4014 unsigned int i, j; 3637 unsigned int i, j;
4015 int state; 3638 int state;
4016 3639
4017 static const struct 3640 static const struct
4018 { 3641 {
4019 const int argval; 3642 const int argval;
4020 const unsigned long bit; 3643 const unsigned long bit;
4021 }
4022
4023 argtopriv[] = { 3644 } argtopriv[] = {
4024 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
4025 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
4026 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
4027 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
4028 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
4029 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
4030 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
4031 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
4032 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
4033#ifdef menuBar_esc 3654 // 18 end FF to printer after print screen
4034 { menuBar_esc, PrivMode_menuBar }, 3655 // 19 Print screen prints full screen/scroll region
4035#endif
4036 // 18, 19 printing-related
4037 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4038#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
4039 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
4040#endif 3659#endif
4041 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
4042 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
4043 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
4044 // 45 margin bell NYI 3664 // 45 margin bell NYI
4045 // 46 start logging 3665 // 46 start logging
4046 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
4047 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4048#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
4049 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
4050#endif 3670#endif
4051 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3672 { 1002, PrivMode_MouseBtnEvent },
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3673 { 1003, PrivMode_MouseAnyEvent },
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4056 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
4057 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
4060 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
4061 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
4062 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4063 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3689 { 2004, PrivMode_BracketPaste },
4064 }; 3690 };
4065 3691
4066 if (nargs == 0) 3692 if (nargs == 0)
4067 return; 3693 return;
4068 3694
… …
4087 /* extra handling for values with state unkept */ 3713 /* extra handling for values with state unkept */
4088 switch (arg[i]) 3714 switch (arg[i])
4089 { 3715 {
4090#if ENABLE_STYLES 3716#if ENABLE_STYLES
4091 case 1021: 3717 case 1021:
4092 if (mode) 3718 set_option (Opt_intensityStyles, mode);
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096 3719
4097 scr_touch (true); 3720 scr_touch (true);
4098 break; 3721 break;
4099#endif 3722#endif
4100 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
4101 case 1049:
4102 if (OPTION (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
4103 if (mode == 0) 3725 if (mode == 0)
4104 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
4105 else if (mode == 1) 3727 else if (mode == 1)
4106 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
4107 break; 3729 break;
… …
4115 case 2: /* VT52 mode */ 3737 case 2: /* VT52 mode */
4116 /* oddball mode. should be set regardless of set/reset 3738 /* oddball mode. should be set regardless of set/reset
4117 * parameter. Return from VT52 mode with an ESC < from 3739 * parameter. Return from VT52 mode with an ESC < from
4118 * within VT52 mode 3740 * within VT52 mode
4119 */ 3741 */
4120 PrivMode (1, PrivMode_vt52); 3742 set_privmode (PrivMode_vt52, 1);
4121 break; 3743 break;
4122 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
4123 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
4124 set_widthheight (((state ? 132 : 80) * fwidth), height); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4125 break; 3747 break;
4126 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
4127 if (!state) 3749 set_option (Opt_jumpScroll, !state);
4128 SET_OPTION (Opt_jumpScroll);
4129 else
4130 CLR_OPTION (Opt_jumpScroll);
4131 break; 3750 break;
4132 case 5: /* reverse video */ 3751 case 5: /* reverse video */
4133 scr_rvideo_mode (state); 3752 scr_rvideo_mode (state);
4134 break; 3753 break;
4135 case 6: /* relative/absolute origins */ 3754 case 6: /* relative/absolute origins */
… …
4139 scr_autowrap (state); 3758 scr_autowrap (state);
4140 break; 3759 break;
4141 /* case 8: - auto repeat, can't do on a per window basis */ 3760 /* case 8: - auto repeat, can't do on a per window basis */
4142 case 9: /* X10 mouse reporting */ 3761 case 9: /* X10 mouse reporting */
4143 if (state) /* orthogonal */ 3762 if (state) /* orthogonal */
4144 priv_modes &= ~PrivMode_MouseX11; 3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4145 break; 3764 break;
4146#ifdef menuBar_esc
4147 case menuBar_esc:
4148#ifdef MENUBAR
4149 map_menuBar (state);
4150#endif
4151 break;
4152#endif
4153#ifdef scrollBar_esc 3765#ifdef scrollBar_esc
4154 case scrollBar_esc: 3766 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3767 if (scrollBar.map (state))
4156 { 3768 {
4157 resize_all_windows (0, 0, 0); 3769 resize_all_windows (0, 0, 0);
4158 scr_touch (true); 3770 scr_touch (true);
4159 } 3771 }
4160 break; 3772 break;
… …
4169 break; 3781 break;
4170 /* case 66: - application key pad */ 3782 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3783 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3784 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3785 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3786 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3787 break;
4176#if 0
4177 case 1001: 3788 case 1002:
4178 break; /* X11 mouse highlighting */ 3789 case 1003:
4179#endif 3790 if (state)
3791 {
3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 mouse_row = mouse_col = 0;
3795 vt_emask_mouse = PointerMotionMask;
3796 }
3797 else
3798 vt_emask_mouse = NoEventMask;
3799
3800 vt_select_input ();
3801 break;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3802 case 1010: /* scroll to bottom on TTY output inhibit */
4181 if (!state) 3803 set_option (Opt_scrollTtyOutput, !state);
4182 SET_OPTION (Opt_scrollTtyOutput);
4183 else
4184 CLR_OPTION (Opt_scrollTtyOutput);
4185 break; 3804 break;
4186 case 1011: /* scroll to bottom on key press */ 3805 case 1011: /* scroll to bottom on key press */
4187 if (state) 3806 set_option (Opt_scrollTtyKeypress, state);
4188 SET_OPTION (Opt_scrollTtyKeypress);
4189 else
4190 CLR_OPTION (Opt_scrollTtyKeypress);
4191 break; 3807 break;
4192 case 1047: /* secondary screen w/ clearing last */ 3808 case 1047: /* secondary screen w/ clearing last */
4193 if (OPTION (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY) 3810 if (!state)
4195 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812
4196 scr_change_screen (state); 3813 scr_change_screen (state);
4197 break; 3814 break;
4198 case 1049: /* secondary screen w/ clearing first */ 3815 case 1049: /* secondary screen w/ clearing first */
3816 if (option (Opt_secondaryScreen))
3817 if (state)
3818 scr_cursor (SAVE);
3819
4199 scr_change_screen (state); 3820 scr_change_screen (state);
3821
4200 if (OPTION (Opt_secondaryScreen)) 3822 if (option (Opt_secondaryScreen))
4201 if (current_screen != PRIMARY) 3823 if (state)
4202 scr_erase_screen (2); 3824 scr_erase_screen (2);
3825 else
3826 scr_cursor (RESTORE);
4203 break; 3827 break;
4204 default: 3828 default:
4205 break; 3829 break;
4206 } 3830 }
4207 } 3831 }
… …
4333 scr_color (Color_bg, Color_bg); 3957 scr_color (Color_bg, Color_bg);
4334 break; 3958 break;
4335 3959
4336 //case 50: // not variable spacing 3960 //case 50: // not variable spacing
4337 3961
4338#ifndef NO_BRIGHTCOLOR 3962#if !ENABLE_MINIMAL
4339 case 90: 3963 case 90:
4340 case 91: /* set bright fg color */ 3964 case 91: /* set bright fg color */
4341 case 92: 3965 case 92:
4342 case 93: 3966 case 93:
4343 case 94: 3967 case 94:
… …
4367rxvt_term::process_graphics () 3991rxvt_term::process_graphics ()
4368{ 3992{
4369 unicode_t ch, cmd = cmd_getc (); 3993 unicode_t ch, cmd = cmd_getc ();
4370 3994
4371 if (cmd == 'Q') 3995 if (cmd == 'Q')
3996 {
4372 { /* query graphics */ 3997 /* query graphics */
4373 tt_printf ("\033G0\012"); /* no graphics */ 3998 tt_printf ("\033G0\012"); /* no graphics */
4374 return; 3999 return;
4375 } 4000 }
4376 /* swallow other graphics sequences until terminating ':' */ 4001 /* swallow other graphics sequences until terminating ':' */
4377 do 4002 do
… …
4388 */ 4013 */
4389void 4014void
4390rxvt_term::tt_printf (const char *fmt,...) 4015rxvt_term::tt_printf (const char *fmt,...)
4391{ 4016{
4392 va_list arg_ptr; 4017 va_list arg_ptr;
4393 unsigned char buf[256]; 4018 char buf[256];
4394 4019
4395 va_start (arg_ptr, fmt); 4020 va_start (arg_ptr, fmt);
4396 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4021 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4397 va_end (arg_ptr); 4022 va_end (arg_ptr);
4398 tt_write (buf, strlen (buf)); 4023 tt_write (buf, strlen (buf));
… …
4400 4025
4401/* ---------------------------------------------------------------------- */ 4026/* ---------------------------------------------------------------------- */
4402/* Write data to the pty as typed by the user, pasted with the mouse, 4027/* Write data to the pty as typed by the user, pasted with the mouse,
4403 * or generated by us in response to a query ESC sequence. 4028 * or generated by us in response to a query ESC sequence.
4404 */ 4029 */
4405const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4030static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4406 4031
4407void 4032void
4408rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4033rxvt_term::tt_write (const char *data, unsigned int len)
4409{ 4034{
4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4036 return;
4037
4038 if (pty->pty < 0)
4039 return;
4040
4410 if (v_buflen == 0) 4041 if (v_buflen == 0)
4411 { 4042 {
4412 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4043 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4413 4044
4414 if ((unsigned int)written == len) 4045 if ((unsigned int)written == len)
4415 return; 4046 return;
4416 4047
4417 data += written; 4048 data += written;
4418 len -= written; 4049 len -= written;
4419 } 4050 }
4420 4051
4421 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 4053
4423 memcpy (v_buffer + v_buflen, data, len); 4054 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4055 v_buflen += len;
4425 4056
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4057 pty_ev.set (ev::READ | ev::WRITE);
4427} 4058}
4428 4059
4429void rxvt_term::pty_write () 4060void rxvt_term::pty_write ()
4430{ 4061{
4431 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4062 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4432 4063
4433 if (written > 0) 4064 if (written > 0)
4434 { 4065 {
4435 v_buflen -= written; 4066 v_buflen -= written;
4436 4067
4437 if (v_buflen == 0) 4068 if (v_buflen == 0)
4438 { 4069 {
4439 free (v_buffer); 4070 free (v_buffer);
4440 v_buffer = 0; 4071 v_buffer = 0;
4441 v_buflen = 0;
4442 4072
4443 pty_ev.set (EVENT_READ); 4073 pty_ev.set (ev::READ);
4444 return; 4074 return;
4445 } 4075 }
4446 4076
4447 memmove (v_buffer, v_buffer + written, v_buflen); 4077 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 4078 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4079 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 4080 pty_ev.set (ev::READ);
4451} 4081}
4452 4082
4453/*----------------------- end-of-file (C source) -----------------------*/ 4083/*----------------------- end-of-file (C source) -----------------------*/
4454 4084

Diff Legend

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