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

Diff Legend

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