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

Diff Legend

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