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

Diff Legend

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