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.319 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

… …
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
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
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 593 {
498 commit_iso14755 (); 594 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
500# if ISO_14755 596# if ISO_14755
501 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);
502# endif 606# endif
503 return; 607 return;
504 } 608 }
505 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
506 { 610 {
… …
511# endif 615# endif
512 return; 616 return;
513 } 617 }
514 else 618 else
515 { 619 {
516# if ENABLE_OVERLAY 620# if ISO_14755
517 scr_overlay_off (); 621 scr_overlay_off ();
518# endif 622# endif
519 iso14755buf = 0; 623 iso14755buf = 0;
520 } 624 }
521 } 625 }
626 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
525 { 630 {
526 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 632# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 635# endif
531 } 636 }
532#endif 637#endif
533 638
534#ifdef PRINTPIPE 639#ifdef PRINTPIPE
535 if (keysym == XK_Print) 640 if (keysym == XK_Print)
536 { 641 {
537 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
538 return; 643 return;
539 } 644 }
540#endif 645#endif
541 646
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 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)
544 { 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
545 newlen = 1; 689 newlen = 0;
546 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:
547 { 773 {
548#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
549 case XK_BackSpace: 775 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 777 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0; 778 newlen = 0;
832 break;
833 } 779 }
834 780 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
838 785
839 /* 786 /*
840 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
841 */ 788 */
842#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
877 return; 824 return;
878 825
879 if (len <= 0) 826 if (len <= 0)
880 return; /* not mapped */ 827 return; /* not mapped */
881 828
882 if (OPTION (Opt_scrollTtyKeypress)) 829 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 830 if (view_start)
884 { 831 {
885 view_start = 0; 832 view_start = 0;
886 want_refresh = 1; 833 want_refresh = 1;
887 } 834 }
… …
926#if ENABLE_FRILLS || ISO_14755 873#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 874 // ISO 14755 support
928 if (iso14755buf) 875 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 876 if (iso14755buf & ISO_14755_52)
930 { 877 {
931# if ENABLE_OVERLAY 878# if ISO_14755
932 scr_overlay_off (); 879 scr_overlay_off ();
933# endif 880# endif
934# if ISO_14755 881# if ISO_14755
935 // iso14755 part 5.2 handling: release time 882 // iso14755 part 5.2 handling: release time
936 // first: controls 883 // first: controls
… …
942 commit_iso14755 (); 889 commit_iso14755 ();
943 890
944 return; 891 return;
945 } 892 }
946 893
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 895 if (i[0] == keysym)
949 { 896 {
950 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 898 commit_iso14755 ();
952 899
… …
959 906
960 return; 907 return;
961 } 908 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 910 {
964# if ENABLE_OVERLAY 911# if ISO_14755
965 scr_overlay_off (); 912 scr_overlay_off ();
966# endif 913# endif
967 if (iso14755buf & ISO_14755_51) 914 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 915 commit_iso14755 ();
969#if ISO_14755 916#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 917 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 918 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 919 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 920
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 921 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 922 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 974void
1028rxvt_term::flush () 975rxvt_term::flush ()
1029{ 976{
1030 flush_ev.stop (); 977 flush_ev.stop ();
1031 978
1032#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 980 if (bg_flags & BG_NEEDS_REFRESH)
1034 { 981 {
1035 want_full_refresh = 0; 982 bg_flags &= ~BG_NEEDS_REFRESH;
1036 scr_clear ();
1037 scr_touch (false); 983 scr_touch (false);
1038 } 984 }
1039#endif 985#endif
1040 986
1041 if (want_refresh) 987 if (want_refresh)
… …
1077 } 1023 }
1078 while (row < end_row); 1024 while (row < end_row);
1079 } 1025 }
1080 1026
1081 scr_refresh (); 1027 scr_refresh ();
1082 scrollbar_show (1); 1028 scrollBar.show (1);
1083#ifdef USE_XIM 1029#ifdef USE_XIM
1084 IMSendSpot (); 1030 IMSendSpot ();
1085#endif 1031#endif
1086 } 1032 }
1087 1033
1088 display->flush (); 1034 display->flush ();
1089} 1035}
1090 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1091void 1038void
1092rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1040{
1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1043
1044 display->flush ();
1045}
1046
1047void
1048rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1049{
1094 make_current (); 1050 make_current ();
1095 1051
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1052 refresh_count = 0;
1109 flush (); 1053 flush ();
1110} 1054}
1111 1055
1112#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1113void 1057void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1059{
1116 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1061 want_refresh = 1;
1118 1062 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1063}
1121#endif 1064#endif
1122 1065
1123#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1124void 1067void
1125rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1069{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1071 {
1129 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1130 want_refresh = 1; 1073 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1132 } 1075 }
1076 else
1077 w.stop ();
1133} 1078}
1134#endif 1079#endif
1135 1080
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1082void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1084{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1087 {
1143 want_refresh = 1; 1088 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1145 } 1090 }
1091 else
1092 w.stop ();
1146} 1093}
1147#endif 1094#endif
1148 1095
1149#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1150void 1097void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1099{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1101 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1103 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1158 } 1105 }
1106 else
1107 w.stop ();
1159} 1108}
1160#endif 1109#endif
1161 1110
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1112void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1114{
1166 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1116 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1117 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1175 } 1125 }
1176} 1126}
1177#endif 1127#endif
1178 1128
1179#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1180static struct event_handler 1130static struct event_handler
1181{ 1131{
1182 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1183 1133
1184 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1185 { 1135 {
1186 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1190 1143
1191 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1193 1146
1194 w.stop (); 1147 w.stop ();
1195 } 1148 }
1196 1149
… …
1232 } 1185 }
1233 else 1186 else
1234 { 1187 {
1235 pty_ev.stop (); 1188 pty_ev.stop ();
1236 1189
1237 if (!OPTION (Opt_hold)) 1190 if (!option (Opt_hold))
1238 destroy (); 1191 destroy ();
1239 } 1192 }
1240 1193
1241 return false; 1194 return false;
1242} 1195}
1243 1196
1244void 1197void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1199{
1247 make_current (); 1200 make_current ();
1248 1201
1249 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1205 cmd_parse ();
1253 break;
1254 1206
1255 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1256 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1257} 1211}
1258 1212
1259void 1213void
1260rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1261{ 1215{
… …
1263 recolour_cursor (); 1217 recolour_cursor ();
1264 1218
1265#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1220 hidden_pointer = 0;
1267 1221
1268 if (OPTION (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1270#endif 1224#endif
1271} 1225}
1272 1226
1273#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1274void 1228void
1275rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1276{ 1230{
1277 if (!OPTION (Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1278 return; 1232 return;
1279 1233
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1235 XFlush (dpy);
1282 1236
1283 hidden_pointer = 1; 1237 hidden_pointer = 1;
1284} 1238}
1285 1239
1286void 1240void
1287rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1242{
1289 make_current (); 1243 make_current ();
1290 1244
1291 pointer_blank (); 1245 pointer_blank ();
1292} 1246}
… …
1295void 1249void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1251{
1298 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1299 int x, y; 1253 int x, y;
1254 int code = 32;
1300 1255
1301 x = ev.x; 1256 x = Pixel2Col (ev.x) + 1;
1302 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1304 1268
1305 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1306 button_number = 3; 1270 button_number = 3;
1307 else 1271 else
1308 { 1272 {
1309 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1275 if (button_number >= 3)
1312 button_number += (64 - 3); 1276 button_number += 64 - 3;
1313 } 1277 }
1314 1278
1315 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1316 { 1280 {
1317 /* 1281 /*
… …
1349 fputc ('A', stderr); 1313 fputc ('A', stderr);
1350 if (key_state & 32) 1314 if (key_state & 32)
1351 fputc ('2', stderr); 1315 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1317 button_number,
1354 x + 1, 1318 x,
1355 y + 1); 1319 y);
1356#endif 1320#endif
1357 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1358 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1336 code + button_number + key_state,
1360 (32 + x + 1), 1337 32 + x,
1361 (32 + y + 1)); 1338 32 + y);
1362} 1339}
1363 1340
1364/*{{{ process an X event */ 1341/*{{{ process an X event */
1365void 1342void
1366rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1403 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1404 focus_out ();
1428 } 1405 }
1429#endif 1406#endif
1430 } 1407 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1408 break;
1436 1409
1437 /* 1410 /*
1438 * XXX: this is not the _current_ arrangement 1411 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1412 * Here's my conclusion:
… …
1458 break; 1431 break;
1459 } 1432 }
1460 break; 1433 break;
1461 1434
1462 case FocusIn: 1435 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1439 focus_in ();
1465 break; 1440 break;
1466 1441
1467 case FocusOut: 1442 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1443 if (ev.xfocus.detail != NotifyInferior
1444 && ev.xfocus.detail != NotifyPointer
1445 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1446 focus_out ();
1470 break; 1447 break;
1471 1448
1472 case ConfigureNotify: 1449 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1474 { 1451 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1453 ;
1477 1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1473
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1475 {
1480 seen_resize = 1; 1476 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 1478 }
1479 else
1480 {
1481#ifdef HAVE_BG_PIXMAP
1482 if (moved)
1483 {
1484 if (mapped)
1485 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif
1490 }
1483 1491
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT
1487 if (OPTION (Opt_transparent))
1488 check_our_parents ();
1489#endif
1490 } 1493 }
1491 break; 1494 break;
1492 1495
1493 case PropertyNotify: 1496 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1496 && ev.xproperty.state == PropertyNewValue)
1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1498
1499 break; 1498 break;
1500 1499
1501 case SelectionClear: 1500 case SelectionClear:
1502 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1503 break;
1504
1505 case SelectionNotify:
1506 if (selection_wait == Sel_normal)
1507 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1508 break; 1502 break;
1509 1503
1510 case SelectionRequest: 1504 case SelectionRequest:
1511 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1512 break; 1506 break;
1513 1507
1514 case MapNotify: 1508 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a
1511 * non-reparenting window manager. In those cases we never get first
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1514 * reparenting.
1515 * We should not render background immediately, as there could be several
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1517 * by scheduling background redraw as soon as we can, but giving a short
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025);
1524#endif
1515 mapped = 1; 1525 mapped = 1;
1516#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1527 text_blink_ev.start ();
1518#endif 1528#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1530 break;
1521 1531
1522 case UnmapNotify: 1532 case UnmapNotify:
… …
1524#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1525 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1526#endif 1536#endif
1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1538 break;
1529
1530#ifdef TRANSPARENT
1531 case ReparentNotify:
1532 rootwin_cb (ev);
1533 break;
1534#endif /* TRANSPARENT */
1535 1539
1536 case GraphicsExpose: 1540 case GraphicsExpose:
1537 case Expose: 1541 case Expose:
1538 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1539 { 1543 {
1540 do 1544 do
1545 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1548 }
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1544 1550
1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1546 1552
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1548 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1549 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1557 }
1550 1558
1551 want_refresh = 1; 1559 want_refresh = 1;
1552 } 1560 }
1553 else 1561 else
1554 { 1562 {
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1558 ; 1566 ;
1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1560 ; 1568 ;
1561 1569
1562 if (isScrollbarWindow (ev.xany.window)) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1563 { 1571 {
1564 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1565 scrollbar_show (0); 1573 scrollBar.show (0);
1566 } 1574 }
1567
1568#ifdef TRANSPARENT
1569 if (am_transparent && ev.xany.window == parent[0])
1570 XClearWindow (dpy, ev.xany.window);
1571#endif
1572 } 1575 }
1573 break; 1576 break;
1574 1577
1575 case MotionNotify: 1578 case MotionNotify:
1576#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1577 if (hidden_pointer) 1580 if (hidden_pointer)
1578 pointer_unblank (); 1581 pointer_unblank ();
1579#endif 1582#endif
1583 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1584 || priv_modes & PrivMode_MouseAnyEvent)
1585 mouse_report (ev.xbutton);
1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1581 break; 1587 break;
1582 1588
1583 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1584 { 1590 {
… …
1618 int dist; 1624 int dist;
1619 1625
1620 /* don't clobber the current delay if we are 1626 /* don't clobber the current delay if we are
1621 * already in the middle of scrolling. 1627 * already in the middle of scrolling.
1622 */ 1628 */
1623 if (!sel_scroll_ev.active) 1629 if (!sel_scroll_ev.is_active ())
1624 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1630 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1625 1631
1626 /* save the event params so we can highlight 1632 /* save the event params so we can highlight
1627 * the selection in the pending-scroll loop 1633 * the selection in the pending-scroll loop
1628 */ 1634 */
1629 selection_save_x = ev.xbutton.x; 1635 selection_save_x = ev.xbutton.x;
… …
1651 else 1657 else
1652 { 1658 {
1653 /* we are within the text window, so we 1659 /* we are within the text window, so we
1654 * shouldn't be scrolling 1660 * shouldn't be scrolling
1655 */ 1661 */
1656 if (sel_scroll_ev.active)
1657 sel_scroll_ev.stop(); 1662 sel_scroll_ev.stop();
1658 } 1663 }
1659#endif 1664#endif
1660#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1661 } 1666 }
1662#endif 1667#endif
1663 } 1668 }
1664 } 1669 }
1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1671 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1669 ; 1674 ;
1670 1675
… …
1672 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1680 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1677 scrollbar_size ()); 1682 scrollBar.size ());
1678 want_refresh = 1; 1683 want_refresh = 1;
1679 refresh_limit = 0;
1680 scrollbar_show (1); 1684 scrollBar.show (1);
1681 } 1685 }
1682 break; 1686 break;
1683 } 1687 }
1684 1688
1685#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 { 1691 {
1688 if (hidden_cursor) 1692 if (hidden_cursor)
1689 { 1693 {
1690 hidden_cursor = 0; 1694 hidden_cursor = 0;
1691 want_refresh = 1; 1695 want_refresh = 1;
1692 } 1696 }
1693 1697
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.again ();
1695 } 1699 }
1696#endif 1700#endif
1697 1701
1698#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1704 {
1701 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1706 1710
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1712 pointer_blank ();
1709 } 1713 }
1710#endif 1714#endif
1715
1716 refresh_check ();
1711} 1717}
1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1712 1734
1713void 1735void
1714rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1715{ 1737{
1716 if (!focus) 1738 if (!focus)
1717 { 1739 {
1718 focus = 1; 1740 focus = 1;
1719 want_refresh = 1; 1741 want_refresh = 1;
1720 1742
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM 1743#if USE_XIM
1724 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1725 { 1745 {
1726 IMSetPosition (); 1746 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1747 XSetICFocus (Input_Context);
1728 } 1748 }
1729#endif 1749#endif
1730#if CURSOR_BLINK 1750#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1751 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1752 cursor_blink_ev.again ();
1733#endif 1753#endif
1734#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1736 { 1756 {
1737 pix_colors = pix_colors_focused; 1757 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1758 scr_recolour ();
1739 } 1759 }
1740#endif 1760#endif
1761#if ENABLE_FRILLS
1762 if (option (Opt_urgentOnBell))
1763 set_urgency (0);
1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741 } 1767 }
1742} 1768}
1743 1769
1744void 1770void
1745rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1747 if (focus) 1773 if (focus)
1748 { 1774 {
1749 focus = 0; 1775 focus = 0;
1750 want_refresh = 1; 1776 want_refresh = 1;
1751 1777
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1753 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1754#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1783 if (iso14755buf)
1756 { 1784 {
1757 iso14755buf = 0; 1785 iso14755buf = 0;
1758# if ENABLE_OVERLAY 1786# if ISO_14755
1759 scr_overlay_off (); 1787 scr_overlay_off ();
1760# endif 1788# endif
1761 } 1789 }
1762#endif 1790#endif
1763#if USE_XIM 1791#if USE_XIM
1764 if (Input_Context != NULL) 1792 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1793 XUnsetICFocus (Input_Context);
1766#endif 1794#endif
1767#if CURSOR_BLINK 1795#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1796 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1797 cursor_blink_ev.stop ();
1798
1770 hidden_cursor = 0; 1799 hidden_cursor = 0;
1771#endif 1800#endif
1772#if OFF_FOCUS_FADING 1801#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1802 if (rs[Rs_fade])
1774 { 1803 {
1775 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1805 scr_recolour ();
1777 } 1806 }
1778#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1810 }
1780} 1811}
1781 1812
1782void 1813void
1783rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1821 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1822 }
1792#endif 1823#endif
1793} 1824}
1794 1825
1795#if TRANSPARENT || ENABLE_PERL 1826#if ENABLE_TRANSPARENCY || ENABLE_PERL
1796void 1827void
1797rxvt_term::rootwin_cb (XEvent &ev) 1828rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1829{
1799 make_current (); 1830 make_current ();
1800 1831
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1834 return;
1804 1835
1805# if TRANSPARENT 1836# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1837 switch (ev.type)
1807 { 1838 {
1808 case PropertyNotify: 1839 case PropertyNotify:
1809 /* 1840 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1841 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1812 */ 1843 */
1813 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 return; 1846 {
1847 bg_set_root_pixmap ();
1848 update_background ();
1849 }
1816 1850
1817 /* FALLTHROUGH */
1818 case ReparentNotify:
1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1820 want_refresh = want_full_refresh = 1;
1821 break; 1851 break;
1822 } 1852 }
1823# endif 1853# endif
1854
1855 refresh_check ();
1824} 1856}
1825#endif 1857#endif
1826 1858
1827void 1859void
1828rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1863 { 1895 {
1864 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1865 MEvent.clicks++; 1897 MEvent.clicks++;
1866 1898
1867 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1868 { 1900 {
1869 /* only report double clicks */ 1901 /* only report double clicks */
… …
1883 mouse_report (ev); 1915 mouse_report (ev);
1884 } 1916 }
1885#else 1917#else
1886 MEvent.button = ev.button; 1918 MEvent.button = ev.button;
1887 mouse_report (ev); 1919 mouse_report (ev);
1888#endif /* MOUSE_REPORT_DOUBLECLICK */ 1920#endif /* MOUSE_REPORT_DOUBLECLICK */
1889 1921
1890 } 1922 }
1891 else 1923 else
1892 { 1924 {
1893 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
… …
1941 } 1973 }
1942 1974
1943 /* 1975 /*
1944 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1945 */ 1977 */
1946 if (isScrollbarWindow (ev.window)) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1947 { 1979 {
1948 scrollBar.setIdle (); 1980 page_dirn direction = NO_DIR;
1981
1982 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */
1986
1987 scrollBar.state = STATE_IDLE;
1949 /* 1988 /*
1950 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1951 * move up if mouse is above slider 1990 * move up if mouse is above slider
1952 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1953 * 1992 *
… …
1962 /* 2001 /*
1963 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1964 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1965 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1966 */ 2005 */
1967 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
1968 && scrollbarnext_upButton (ev.y))
1969 || (scrollBar.style == R_SB_RXVT
1970 && scrollbarrxvt_upButton (ev.y)))
1971 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
1972 else if ((scrollBar.style == R_SB_NEXT 2008 else if (direction == DN)
1973 && scrollbarnext_dnButton (ev.y))
1974 || (scrollBar.style == R_SB_RXVT
1975 && scrollbarrxvt_dnButton (ev.y)))
1976 tt_printf ("\033[B"); 2009 tt_printf ("\033[B");
1977 else 2010 else
1978 switch (ev.button) 2011 switch (ev.button)
1979 { 2012 {
1980 case Button2: 2013 case Button2:
… …
1987 tt_printf ("\033[5~"); 2020 tt_printf ("\033[5~");
1988 break; 2021 break;
1989 } 2022 }
1990 } 2023 }
1991 else 2024 else
1992#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
1993
1994 {
1995 char upordown = 0;
1996
1997 if (scrollBar.style == R_SB_NEXT)
1998 { 2026 {
1999 if (scrollbarnext_upButton (ev.y)) 2027 if (direction != NO_DIR)
2000 upordown = -1; /* up */
2001 else if (scrollbarnext_dnButton (ev.y))
2002 upordown = 1; /* down */
2003 }
2004 else if (scrollBar.style == R_SB_RXVT)
2005 {
2006 if (scrollbarrxvt_upButton (ev.y))
2007 upordown = -1; /* up */
2008 else if (scrollbarrxvt_dnButton (ev.y))
2009 upordown = 1; /* down */
2010 }
2011 if (upordown)
2012 { 2028 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2030 if (!cont_scroll_ev.is_active ())
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 2032#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
2017 { 2034 {
2018 if (upordown < 0) 2035 if (direction == UP)
2019 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
2020 else 2037 else
2021 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
2022 } 2039 }
2023 } 2040 }
2024 else 2041 else
2025 switch (ev.button) 2042 switch (ev.button)
2026 { 2043 {
2027 case Button2: 2044 case Button2:
2028 switch (scrollbar_align) 2045 switch (scrollBar.align)
2029 { 2046 {
2030 case R_SB_ALIGN_TOP: 2047 case R_SB_ALIGN_TOP:
2031 csrO = 0; 2048 csrO = 0;
2032 break; 2049 break;
2033 case R_SB_ALIGN_CENTRE: 2050 case R_SB_ALIGN_CENTRE:
… …
2039 } 2056 }
2040 2057
2041 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2042 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2043 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2045 2062
2046 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2047 break; 2064 break;
2048 2065
2049 case Button1: 2066 case Button1:
2050 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2051 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
2052 /* FALLTHROUGH */ 2069 /* FALLTHROUGH */
2053 2070
2054 case Button3: 2071 case Button3:
2055 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
… …
2065 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2066# else 2083# else
2067 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2068# endif 2085# endif
2069 else 2086 else
2070 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2071 } 2088 }
2072 else 2089 else
2073 { 2090 {
2074 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2075 (nrow 2092 (nrow
2076 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2077 / scrollbar_size ())); 2094 / scrollBar.size ()));
2078 } 2095 }
2079 2096
2080 break; 2097 break;
2081 } 2098 }
2082 } 2099 }
… …
2092 2109
2093 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2094 if (!bypass_keystate) 2111 if (!bypass_keystate)
2095 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2096 2113
2097 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2098 { 2115 {
2099 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2100 scrollbar_show (0); 2117 scrollBar.show (0);
2101 } 2118 }
2102 2119
2103#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2106#endif 2122#endif
2107 2123
2108 if (ev.window == vt) 2124 if (ev.window == vt)
2109 { 2125 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2134 mouse_report (ev); 2150 mouse_report (ev);
2135 } 2151 }
2136#else /* MOUSE_REPORT_DOUBLECLICK */ 2152#else /* MOUSE_REPORT_DOUBLECLICK */
2137 MEvent.button = AnyButton; 2153 MEvent.button = AnyButton;
2138 mouse_report (ev); 2154 mouse_report (ev);
2139#endif /* MOUSE_REPORT_DOUBLECLICK */ 2155#endif /* MOUSE_REPORT_DOUBLECLICK */
2140 return; 2156 return;
2141 } 2157 }
2142 2158
2143 /* 2159 /*
2144 * dumb hack to compensate for the failure of click-and-drag 2160 * dumb hack to compensate for the failure of click-and-drag
… …
2156 selection_make (ev.time); 2172 selection_make (ev.time);
2157 break; 2173 break;
2158 2174
2159 case Button2: 2175 case Button2:
2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2178 break;
2163 2179
2164#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2165 case Button4: 2181 case Button4:
2166 case Button5: 2182 case Button5:
… …
2170 2186
2171 v = ev.button == Button4 ? UP : DN; 2187 v = ev.button == Button4 ? UP : DN;
2172 2188
2173 if (ev.state & ShiftMask) 2189 if (ev.state & ShiftMask)
2174 i = 1; 2190 i = 1;
2175 else if (OPTION (Opt_mouseWheelScrollPage)) 2191 else if (option (Opt_mouseWheelScrollPage))
2176 i = nrow - 1; 2192 i = nrow - 1;
2177 else 2193 else
2178 i = 5; 2194 i = 5;
2179 2195
2180# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
… …
2182 { 2198 {
2183 mouse_slip_wheel_speed += v ? -1 : 1; 2199 mouse_slip_wheel_speed += v ? -1 : 1;
2184 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2185 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2186 2202
2187 if (slip_wheel_ev.at < NOW) 2203 if (!slip_wheel_ev.is_active ())
2188 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2189
2190 slip_wheel_ev.start ();
2191 } 2205 }
2192 else 2206 else
2207# endif
2193 { 2208 {
2194# endif
2195 scr_page (v, i); 2209 scr_page (v, i);
2196 scrollbar_show (1); 2210 scrollBar.show (1);
2197# ifdef MOUSE_SLIP_WHEELING
2198 } 2211 }
2199# endif
2200 } 2212 }
2201 break; 2213 break;
2202#endif 2214#endif
2203 } 2215 }
2204 } 2216 }
2205} 2217}
2206 2218
2207#ifdef TRANSPARENT
2208#if TINTING
2209/* taken from aterm-0.4.2 */
2210
2211typedef uint32_t RUINT32T;
2212
2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2214{
2215 int sh_r, sh_g, sh_b;
2216 RUINT32T mask_r, mask_g, mask_b;
2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220 int i;
2221
2222 Visual *visual = term->visual;
2223
2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2225
2226 /* for convenience */
2227 mask_r = visual->red_mask;
2228 mask_g = visual->green_mask;
2229 mask_b = visual->blue_mask;
2230
2231 /* boring lookup table pre-initialization */
2232 switch (srcImage->bits_per_pixel) {
2233 case 15:
2234 if ((mask_r != 0x7c00) ||
2235 (mask_g != 0x03e0) ||
2236 (mask_b != 0x001f))
2237 return;
2238 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2239 lookup_r = lookup;
2240 lookup_g = lookup+32;
2241 lookup_b = lookup+32+32;
2242 sh_r = 10;
2243 sh_g = 5;
2244 sh_b = 0;
2245 break;
2246 case 16:
2247 if ((mask_r != 0xf800) ||
2248 (mask_g != 0x07e0) ||
2249 (mask_b != 0x001f))
2250 return;
2251 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2252 lookup_r = lookup;
2253 lookup_g = lookup+32;
2254 lookup_b = lookup+32+64;
2255 sh_r = 11;
2256 sh_g = 5;
2257 sh_b = 0;
2258 break;
2259 case 24:
2260 if ((mask_r != 0xff0000) ||
2261 (mask_g != 0x00ff00) ||
2262 (mask_b != 0x0000ff))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2265 lookup_r = lookup;
2266 lookup_g = lookup+256;
2267 lookup_b = lookup+256+256;
2268 sh_r = 16;
2269 sh_g = 8;
2270 sh_b = 0;
2271 break;
2272 case 32:
2273 if ((mask_r != 0xff0000) ||
2274 (mask_g != 0x00ff00) ||
2275 (mask_b != 0x0000ff))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2278 lookup_r = lookup;
2279 lookup_g = lookup+256;
2280 lookup_b = lookup+256+256;
2281 sh_r = 16;
2282 sh_g = 8;
2283 sh_b = 0;
2284 break;
2285 default:
2286 return; /* we do not support this color depth */
2287 }
2288
2289 /* prepare limits for color transformation (each channel is handled separately) */
2290 if (shade < 0) {
2291 shade = -shade;
2292 if (shade < 0) shade = 0;
2293 if (shade > 100) shade = 100;
2294
2295 lower_lim_r = 65535-rm;
2296 lower_lim_g = 65535-gm;
2297 lower_lim_b = 65535-bm;
2298
2299 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2304 } else {
2305 if (shade < 0) shade = 0;
2306 if (shade > 100) shade = 100;
2307
2308 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2309
2310 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2311 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2312 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2313 }
2314
2315 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2316 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2317 {
2318 unsigned int tmp;
2319
2320 tmp = lower_lim_r;
2321 lower_lim_r = lower_lim_b;
2322 lower_lim_b = tmp;
2323
2324 tmp = upper_lim_r;
2325 upper_lim_r = upper_lim_b;
2326 upper_lim_b = tmp;
2327 }
2328
2329 /* fill our lookup tables */
2330 for (i = 0; i <= mask_r>>sh_r; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335 lookup_r[i] = (tmp/65535)<<sh_r;
2336 }
2337 for (i = 0; i <= mask_g>>sh_g; i++)
2338 {
2339 RUINT32T tmp;
2340 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342 lookup_g[i] = (tmp/65535)<<sh_g;
2343 }
2344 for (i = 0; i <= mask_b>>sh_b; i++)
2345 {
2346 RUINT32T tmp;
2347 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349 lookup_b[i] = (tmp/65535)<<sh_b;
2350 }
2351
2352 /* apply table to input image (replacing colors by newly calculated ones) */
2353 switch (srcImage->bits_per_pixel)
2354 {
2355 case 15:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0x7c00)>>10] |
2367 lookup_g[(*p & 0x03e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 16:
2375 {
2376 unsigned short *p1, *pf, *p, *pl;
2377 p1 = (unsigned short *) srcImage->data;
2378 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width;
2383 for (; p < pl; p++)
2384 {
2385 *p = lookup_r[(*p & 0xf800)>>11] |
2386 lookup_g[(*p & 0x07e0)>> 5] |
2387 lookup_b[(*p & 0x001f)];
2388 }
2389 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 24:
2394 {
2395 unsigned char *p1, *pf, *p, *pl;
2396 p1 = (unsigned char *) srcImage->data;
2397 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width * 3;
2402 for (; p < pl; p += 3)
2403 {
2404 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406 p[2] = lookup_r[(p[2] & 0x0000ff)];
2407 }
2408 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 32:
2413 {
2414 RUINT32T *p1, *pf, *p, *pl;
2415 p1 = (RUINT32T *) srcImage->data;
2416 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xff0000)>>16] |
2425 lookup_g[(*p & 0x00ff00)>> 8] |
2426 lookup_b[(*p & 0x0000ff)] |
2427 (*p & ~0xffffff);
2428 }
2429 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 }
2434
2435 free (lookup);
2436}
2437#endif
2438
2439/*
2440 * Check our parents are still who we think they are.
2441 * Do transparency updates if required
2442 */
2443int
2444rxvt_term::check_our_parents ()
2445{
2446 int i, pchanged, aformat, have_pixmap, rootdepth;
2447 unsigned long nitems, bytes_after;
2448 Atom atype;
2449 unsigned char *prop = NULL;
2450 Window root, oldp, *list;
2451 Pixmap rootpixmap = None;
2452 XWindowAttributes wattr, wrootattr;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (dpy, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint)
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (dpy, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
2544 allowedxerror = -1;
2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (dpy, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (dpy, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575 rgba c;
2576 pix_colors_focused [Color_tint].get (c);
2577
2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2585 nx, ny, image->width, image->height);
2586 XFreeGC (dpy, gc);
2587 XDestroyImage (image);
2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589 XClearWindow (dpy, parent[0]);
2590
2591 if (!am_transparent || !am_pixmap_trans)
2592 pchanged = 1;
2593
2594 am_transparent = am_pixmap_trans = 1;
2595 }
2596 }
2597
2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
2601 {
2602 unsigned int n;
2603 /*
2604 * InheritPixmap transparency
2605 */
2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 {
2608 oldp = parent[i];
2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 for (; n < (unsigned int)i; n++)
2628 {
2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2639 {
2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2642 am_transparent = 0;
2643 /* XXX: also turn off Opt_transparent? */
2644 }
2645 else
2646 {
2647 for (n = 0; n < (unsigned int)i; n++)
2648 {
2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2650 XClearWindow (dpy, parent[n]);
2651 }
2652
2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2654 am_transparent = 1;
2655 }
2656
2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2658 parent[i] = None;
2659 }
2660
2661 if (scrollBar.win)
2662 {
2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664 scrollBar.setIdle ();
2665 scrollbar_show (0);
2666 }
2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2673 }
2674
2675 return pchanged;
2676}
2677#endif
2678
2679/*}}} */ 2219/*}}} */
2680 2220
2681bool 2221void
2682rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2683{ 2223{
2684 bool flag = false;
2685 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2686 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2687 2226
2688 for (;;) 2227 for (;;)
2689 { 2228 {
2690 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2691 { 2230 {
2692 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2693 ch = next_char (); 2232 ch = next_char ();
2694 2233
2695 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2696 break; 2235 break;
2697 } 2236 }
2698 2237
2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2700 { 2239 {
2701 if (!seen_input) 2240 if (expect_false (!seen_input))
2702 { 2241 {
2703 seen_input = 1; 2242 seen_input = 1;
2704 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2705 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2706 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2719 wchar_t *str = buf; 2258 wchar_t *str = buf;
2720 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2721 2260
2722 for (;;) 2261 for (;;)
2723 { 2262 {
2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2725 break; 2264 break;
2726 2265
2727 *str++ = ch; 2266 *str++ = ch;
2728 2267
2729 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2730 { 2269 {
2731 if (ch == C0_LF) 2270 if (ch == C0_LF)
2732 nlines++; 2271 nlines++;
2733 2272
2734 refresh_count++; 2273 refresh_count++;
2735 2274
2736 if (!OPTION (Opt_jumpScroll) 2275 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2738 { 2276 {
2739 refreshnow = true;
2740 refresh_count = 0; 2277 refresh_count = 0;
2278
2279 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2280 {
2281 refreshnow = true;
2741 ch = NOCHAR; 2282 ch = NOCHAR;
2742 break; 2283 break;
2284 }
2743 } 2285 }
2744 2286
2745 // scr_add_lines only works for nlines <= nrow - 1. 2287 // scr_add_lines only works for nlines <= nrow - 1.
2746 if (nlines >= nrow - 1) 2288 if (nlines >= nrow - 1)
2747 { 2289 {
… …
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2317 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2776 scr_add_lines (buf, str - buf, nlines); 2318 scr_add_lines (buf, str - buf, nlines);
2777 2319
2778 /* 2320 /*
2779 * If there have been a lot of new lines, then update the screen 2321 * If there have been a lot of new lines, then update the screen
2780 * What the heck I'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2781 * the number of pages between refreshes is refresh_limit, which 2323 * if skipScroll is enabled.
2782 * is incremented here because we must be doing flat-out scrolling.
2783 */ 2324 */
2784 if (refreshnow) 2325 if (refreshnow)
2785 { 2326 {
2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787 refresh_limit++;
2788 else
2789 {
2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2792 scr_refresh (); 2327 scr_refresh ();
2793 want_refresh = 1; 2328 want_refresh = 1;
2794 }
2795 } 2329 }
2796
2797 } 2330 }
2798 else 2331 else
2799 { 2332 {
2800 try 2333 try
2801 { 2334 {
… …
2809 } 2342 }
2810 2343
2811 ch = NOCHAR; 2344 ch = NOCHAR;
2812 } 2345 }
2813 } 2346 }
2814
2815 return flag;
2816} 2347}
2817 2348
2818// read the next character 2349// read the next character
2819wchar_t 2350wchar_t
2820rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2821{ 2352{
2822 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2823 { 2354 {
2824 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2826 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2827 2358
2828 wchar_t wc; 2359 wchar_t wc;
2829 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2830 2361
… …
2834 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2835 break; 2366 break;
2836 } 2367 }
2837 2368
2838 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2840 2374
2841 // assume wchar == unicode 2375 // assume wchar == unicode
2842 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2843 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2844 } 2378 }
… …
2888/*----------------------------------------------------------------------*/ 2422/*----------------------------------------------------------------------*/
2889#ifdef PRINTPIPE 2423#ifdef PRINTPIPE
2890FILE * 2424FILE *
2891rxvt_term::popen_printer () 2425rxvt_term::popen_printer ()
2892{ 2426{
2893 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2894 2428
2895 if (stream == NULL) 2429 if (stream == NULL)
2896 rxvt_warn ("can't open printer pipe, not printing.\n"); 2430 rxvt_warn ("can't open printer pipe, not printing.\n");
2897 2431
2898 return stream; 2432 return stream;
… …
2909 * simulate attached vt100 printer 2443 * simulate attached vt100 printer
2910 */ 2444 */
2911void 2445void
2912rxvt_term::process_print_pipe () 2446rxvt_term::process_print_pipe ()
2913{ 2447{
2914 int done; 2448 FILE *fd = popen_printer ();
2915 FILE *fd;
2916 2449
2917 if ((fd = popen_printer ()) == NULL) 2450 if (!fd)
2918 return; 2451 return;
2919 2452
2920 /* 2453 /*
2921 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2922 * is received. 2455 * is received.
2923 */ 2456 */
2924 for (done = 0; !done;) 2457 for (int done = 0; !done; )
2925 { 2458 {
2926 unsigned char buf[8]; 2459 unsigned char buf[8];
2927 unicode_t ch; 2460 unicode_t ch;
2928 unsigned int i, len; 2461 unsigned int i, len;
2929 2462
… …
2948 { 2481 {
2949 if ((buf[len++] = cmd_getc ()) == 'i') 2482 if ((buf[len++] = cmd_getc ()) == 'i')
2950 break; /* done = 1 */ 2483 break; /* done = 1 */
2951 } 2484 }
2952 } 2485 }
2953 2486
2954 for (i = 0; i < len; i++) 2487 for (i = 0; i < len; i++)
2955 if (putc (buf[i], fd) == EOF) 2488 if (putc (buf[i], fd) == EOF)
2956 { 2489 {
2957 done = 1; 2490 done = 1;
2958 break; 2491 break;
… …
2960 } 2493 }
2961 } 2494 }
2962 2495
2963 pclose_printer (fd); 2496 pclose_printer (fd);
2964} 2497}
2965#endif /* PRINTPIPE */ 2498#endif /* PRINTPIPE */
2966/*}}} */ 2499/*}}} */
2967 2500
2968/* *INDENT-OFF* */ 2501/* *INDENT-OFF* */
2969enum { 2502enum {
2970 C1_40 = 0x40, 2503 C1_40 = 0x40,
… …
3020 process_dcs_seq (); 2553 process_dcs_seq ();
3021 break; 2554 break;
3022 case 0x9b: /* CSI */ 2555 case 0x9b: /* CSI */
3023 process_csi_seq (); 2556 process_csi_seq ();
3024 break; 2557 break;
3025 case 0x9d: /* CSI */ 2558 case 0x9d: /* OSC */
3026 process_osc_seq (); 2559 process_osc_seq ();
3027 break; 2560 break;
3028#endif 2561#endif
3029 } 2562 }
3030} 2563}
… …
3074 break; 2607 break;
3075 case 'Z': /* identify the terminal type */ 2608 case 'Z': /* identify the terminal type */
3076 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3077 break; 2610 break;
3078 case '<': /* turn off VT52 mode */ 2611 case '<': /* turn off VT52 mode */
3079 PrivMode (0, PrivMode_vt52); 2612 set_privmode (PrivMode_vt52, 0);
3080 break; 2613 break;
3081 case 'F': /* use special graphics character set */ 2614 case 'F': /* use special graphics character set */
3082 case 'G': /* use regular character set */ 2615 case 'G': /* use regular character set */
3083 /* unimplemented */ 2616 /* unimplemented */
3084 break; 2617 break;
… …
3138 scr_forwardindex (); 2671 scr_forwardindex ();
3139 break; 2672 break;
3140#endif 2673#endif
3141 case '=': 2674 case '=':
3142 case '>': 2675 case '>':
3143 PrivMode ((ch == '='), PrivMode_aplKP); 2676 set_privmode (PrivMode_aplKP, ch == '=');
3144 break; 2677 break;
3145 2678
3146 case C1_40: 2679 case C1_40:
3147 cmd_getc (); 2680 cmd_getc ();
3148 break; 2681 break;
… …
3152 2685
3153 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
3154 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
3155 { 2688 {
3156 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
3157 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3158 } 2691 }
3159 break; 2692 break;
3160 2693
3161 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
3162 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
3187 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3188 case C1_SCI: /* ESC Z */ 2721 case C1_SCI: /* ESC Z */
3189 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3190 break; /* steal obsolete ESC [ c */ 2723 break; /* steal obsolete ESC [ c */
3191 2724
3192 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3193 case C1_CSI: /* ESC [ */ 2726 case C1_CSI: /* ESC [ */
3194 process_csi_seq (); 2727 process_csi_seq ();
3195 break; 2728 break;
3196 2729
3197 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2730 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3198 case C1_OSC: /* ESC ] */ 2731 case C1_OSC: /* ESC ] */
3199 process_osc_seq (); 2732 process_osc_seq ();
3200 break; 2733 break;
3201 2734
3202 /* 8.3.106: RESET TO INITIAL STATE */ 2735 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3203 case 'c': 2736 case 'c':
3204 mbstate.reset (); 2737 mbstate.reset ();
3205 scr_poweron (); 2738 scr_poweron ();
3206 scrollbar_show (1); 2739 scrollBar.show (1);
3207 break; 2740 break;
3208 2741
3209 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3210 case 'n': 2743 case 'n':
3211 scr_charset_choose (2); 2744 scr_charset_choose (2);
… …
3231 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3232 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2765 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3233 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3234}; 2767};
3235 2768
3236#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3237 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3238 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3239#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
3240 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3241 2774
3242const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
3243 { 2776 {
3244 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3245 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2778 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3246 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2779 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3247 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3256rxvt_term::process_csi_seq () 2789rxvt_term::process_csi_seq ()
3257{ 2790{
3258 unicode_t ch, priv, i; 2791 unicode_t ch, priv, i;
3259 unsigned int nargs, p; 2792 unsigned int nargs, p;
3260 int n, ndef; 2793 int n, ndef;
3261 int arg[ESC_ARGS]; 2794 int arg[ESC_ARGS] = { };
3262 2795
3263 for (nargs = ESC_ARGS; nargs > 0;) 2796 nargs = 0;
3264 arg[--nargs] = 0;
3265 2797
3266 priv = 0; 2798 priv = 0;
3267 ch = cmd_getc (); 2799 ch = cmd_getc ();
3268 if (ch >= '<' && ch <= '?') 2800 if ((ch >= '<' && ch <= '?') || ch == '!')
2801 {
3269 { /* '<' '=' '>' '?' */ 2802 /* '<' '=' '>' '?' '!' */
3270 priv = ch; 2803 priv = ch;
3271 ch = cmd_getc (); 2804 ch = cmd_getc ();
3272 } 2805 }
3273 2806
3274 /* read any numerical arguments */ 2807 /* read any numerical arguments */
… …
3313 switch (priv) 2846 switch (priv)
3314 { 2847 {
3315 case '>': 2848 case '>':
3316 if (ch == CSI_DA) /* secondary device attributes */ 2849 if (ch == CSI_DA) /* secondary device attributes */
3317 { 2850 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2851 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2852 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 // 2853 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2854 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2855 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3323 // that we do not support xterm mouse reporting (should be 95 when we do). 2856 // versions.
3324 // 2857 //
3325 tt_printf ("\033[>%d;94;0c", 'U'); 2858 tt_printf ("\033[>%d;95;0c", 'U');
3326 } 2859 }
3327 break; 2860 break;
2861
3328 case '?': 2862 case '?':
3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3330 process_terminal_mode (ch, priv, nargs, arg); 2864 process_terminal_mode (ch, priv, nargs, arg);
3331 break; 2865 break;
2866
2867 case '!':
2868 if (ch == CSI_70)
2869 {
2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2871 scr_soft_reset ();
2872
2873 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3332 } 2878 }
2879 break;
2880 }
2881
3333 return; 2882 return;
3334 } 2883 }
3335 2884
3336 switch (ch) 2885 switch (ch)
3337 { 2886 {
… …
3457 break; 3006 break;
3458 case 6: /* CPR requested */ 3007 case 6: /* CPR requested */
3459 scr_report_position (); 3008 scr_report_position ();
3460 break; 3009 break;
3461 case 7: /* unofficial extension */ 3010 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure)) 3011 if (option (Opt_insecure))
3463 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3012 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464 break; 3013 break;
3465 case 8: /* unofficial extension */ 3014 case 8: /* unofficial extension */
3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3015 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3467 break; 3016 break;
… …
3631 break; 3180 break;
3632 case 20: /* report icon label */ 3181 case 20: /* report icon label */
3633 { 3182 {
3634 char *s; 3183 char *s;
3635 XGetIconName (dpy, parent[0], &s); 3184 XGetIconName (dpy, parent[0], &s);
3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3185 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3186 XFree (s);
3638 } 3187 }
3639 break; 3188 break;
3640 case 21: /* report window title */ 3189 case 21: /* report window title */
3641 { 3190 {
3642 char *s; 3191 char *s;
3643 XFetchName (dpy, parent[0], &s); 3192 XFetchName (dpy, parent[0], &s);
3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3193 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3194 XFree (s);
3646 } 3195 }
3647 break; 3196 break;
3648 } 3197 }
3649} 3198}
… …
3704 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3253 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3705 */ 3254 */
3706void 3255void
3707rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3708{ 3257{
3709 char *s;
3710 unicode_t eh;
3711
3712 /* 3258 /*
3713 * Not handled yet 3259 * Not handled yet
3714 */ 3260 */
3261
3262 unicode_t eh;
3715 s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3716 if (s) 3264 if (s)
3717 free (s); 3265 free (s);
3718 3266
3719 return; 3267 return;
3720} 3268}
… …
3724 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3272 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3725 */ 3273 */
3726void 3274void
3727rxvt_term::process_osc_seq () 3275rxvt_term::process_osc_seq ()
3728{ 3276{
3729 unicode_t ch, eh;
3730 int arg; 3277 int arg;
3731 3278
3732 ch = cmd_getc (); 3279 unicode_t ch = cmd_getc ();
3733 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3734 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
3735 3282
3736 if (ch == ';') 3283 if (ch == ';')
3737 { 3284 {
3285 unicode_t eh;
3738 char *s = get_to_st (eh); 3286 char *s = get_to_st (eh);
3739 3287
3740 if (s) 3288 if (s)
3741 { 3289 {
3742 process_xterm_seq (arg, s, eh); 3290 process_xterm_seq (arg, s, eh);
… …
3766 3314
3767/* 3315/*
3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3316 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3769 */ 3317 */
3770void 3318void
3771rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3319rxvt_term::process_xterm_seq (int op, char *str, char resp)
3772{ 3320{
3773 int color; 3321 int color;
3774 char *buf, *name; 3322 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1]; 3323 bool query = str[0] == '?' && !str[1];
3776 int saveop = op; 3324 int saveop = op;
3777 3325
3778 dLocal (Display *, dpy); 3326 dLocal (Display *, dpy);
3779 3327
3780 assert (str != NULL); 3328 assert (str != NULL);
3781 3329
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3330 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return; 3331 return;
3784 3332
3785 switch (op) 3333 switch (op)
3786 { 3334 {
… …
3817 3365
3818 XFree (value); 3366 XFree (value);
3819 } 3367 }
3820 else 3368 else
3821 { 3369 {
3822 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3370 char *eq = strchr (str, '=');
3823 3371
3824 if (eq) 3372 if (eq)
3825 { 3373 {
3826 *eq = 0; 3374 *eq = 0;
3827 set_utf8_property (display->atom (str), eq + 1); 3375 set_utf8_property (display->atom (str), eq + 1);
… …
3848 *buf++ = '\0'; 3396 *buf++ = '\0';
3849 3397
3850 process_color_seq (op, color, name, resp); 3398 process_color_seq (op, color, name, resp);
3851 } 3399 }
3852 break; 3400 break;
3401 case Rxvt_restoreFG:
3853 case XTerm_Color00: 3402 case XTerm_Color00:
3854 process_color_seq (op, Color_fg, str, resp); 3403 process_color_seq (op, Color_fg, str, resp);
3855 break; 3404 break;
3405 case Rxvt_restoreBG:
3856 case XTerm_Color01: 3406 case XTerm_Color01:
3857 process_color_seq (op, Color_bg, str, resp); 3407 process_color_seq (op, Color_bg, str, resp);
3858 break; 3408 break;
3859#ifndef NO_CURSORCOLOR 3409#ifndef NO_CURSORCOLOR
3860 case XTerm_Color_cursor: 3410 case XTerm_Color_cursor:
… …
3865 process_color_seq (op, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3866 break; 3416 break;
3867 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3868 process_color_seq (op, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3869 break; 3419 break;
3420#ifdef OPTION_HC
3421 case XTerm_Color_HC:
3422 process_color_seq (op, Color_HC, str, resp);
3423 break;
3424 case XTerm_Color_HTC:
3425 process_color_seq (op, Color_HTC, str, resp);
3426 break;
3427#endif
3870#ifndef NO_BOLD_UNDERLINE_REVERSE 3428#ifndef NO_BOLD_UNDERLINE_REVERSE
3871 case XTerm_Color_RV:
3872 process_color_seq (op, Color_RV, str, resp);
3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3877 break; 3431 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL: 3432 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp); 3433 process_color_seq (op, Color_UL, str, resp);
3881 break; 3434 break;
3882 case URxvt_Color_IT: 3435 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp); 3436 process_color_seq (op, Color_IT, str, resp);
3884 break; 3437 break;
3885#endif 3438#endif
3886#if TRANSPARENT && TINTING 3439 case URxvt_Color_border:
3440 process_color_seq (op, Color_border, str, resp);
3441 break;
3442#if ENABLE_TRANSPARENCY
3887 case URxvt_Color_tint: 3443 case URxvt_Color_tint:
3888 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3445 {
3446 bool changed = false;
3889 3447
3890 check_our_parents (); 3448 if (ISSET_PIXCOLOR (Color_tint))
3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3891 3450
3892 if (am_transparent) 3451 if (changed)
3893 want_full_refresh = want_refresh = 1; 3452 update_background ();
3453 }
3894 3454
3895 break; 3455 break;
3896#endif 3456#endif
3897 3457
3458#if BG_IMAGE_FROM_FILE
3898 case Rxvt_Pixmap: 3459 case Rxvt_Pixmap:
3899 { 3460 if (!strcmp (str, "?"))
3900 if (*str != ';')
3901 { 3461 {
3902#if XPM_BACKGROUND 3462 char str[256];
3903 scale_pixmap (""); /* reset to default scaling */ 3463
3904 set_bgPixmap (str); /* change pixmap */ 3464 sprintf (str, "[%dx%d+%d+%d]",
3905 scr_touch (true); 3465 min (h_scale, 32767), min (v_scale, 32767),
3906#endif 3466 min (h_align, 32767), min (v_align, 32767));
3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3907 } 3468 }
3908 3469 else
3470 {
3909 int changed = 0; 3471 int changed = 0;
3910 3472
3911 while ((str = strchr (str, ';')) != NULL) 3473 if (*str != ';')
3912 { 3474 {
3475 if (bg_set_file (str)) /* change pixmap */
3476 {
3477 changed++;
3478 str = strchr (str, ';');
3479 if (str == NULL)
3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3484 }
3485 else
3486 {
3913 str++; 3487 str++;
3914#if XPM_BACKGROUND 3488 if (bg_set_geometry (str, true))
3915 changed += scale_pixmap (str); 3489 changed++;
3916#endif
3917 } 3490 }
3918 3491
3919 if (changed) 3492 if (changed)
3920 { 3493 {
3921#ifdef XPM_BACKGROUND 3494 if (bg_window_position_sensitive ())
3922 resize_pixmap (); 3495 {
3923 scr_touch (true); 3496 int x, y;
3924#endif 3497 get_window_origin (x, y);
3498 bg_set_position (x, y);
3499 }
3500 update_background ();
3925 } 3501 }
3926 } 3502 }
3927 break; 3503 break;
3928 3504#endif
3929 case Rxvt_restoreFG:
3930 set_window_color (Color_fg, str);
3931 break;
3932 case Rxvt_restoreBG:
3933 set_window_color (Color_bg, str);
3934 break;
3935 3505
3936 case XTerm_logfile: 3506 case XTerm_logfile:
3937 // TODO, when secure mode? 3507 // TODO, when secure mode?
3938 break; 3508 break;
3939 3509
… …
3957 case URxvt_italicFont: 3527 case URxvt_italicFont:
3958 case URxvt_boldItalicFont: 3528 case URxvt_boldItalicFont:
3959#endif 3529#endif
3960 if (query) 3530 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop, 3531 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3532 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "", 3533 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp); 3534 resp);
3965 else 3535 else
3966 { 3536 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3537 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3981 break; 3551 break;
3982 3552
3983#if !ENABLE_MINIMAL 3553#if !ENABLE_MINIMAL
3984 case URxvt_locale: 3554 case URxvt_locale:
3985 if (query) 3555 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3556 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3987 else 3557 else
3988 { 3558 {
3989 set_locale (str); 3559 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8); 3560 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale (); 3561 init_xlocale ();
… …
4006 break; 3576 break;
4007#endif 3577#endif
4008 3578
4009#if ENABLE_PERL 3579#if ENABLE_PERL
4010 case URxvt_perl: 3580 case URxvt_perl:
4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3581 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4012 ; // no responses yet
4013 break; 3582 break;
4014#endif 3583#endif
4015 } 3584 }
4016} 3585}
4017/*----------------------------------------------------------------------*/ 3586/*----------------------------------------------------------------------*/
… …
4040 { 3609 {
4041 if (mode == 'r') 3610 if (mode == 'r')
4042 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4043 else 3612 else
4044 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3613 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4045 PrivMode (state, bit); 3614
3615 set_privmode (bit, state);
4046 } 3616 }
4047 3617
4048 return state; 3618 return state;
4049} 3619}
4050 3620
… …
4054{ 3624{
4055 unsigned int i, j; 3625 unsigned int i, j;
4056 int state; 3626 int state;
4057 3627
4058 static const struct 3628 static const struct
4059 { 3629 {
4060 const int argval; 3630 const int argval;
4061 const unsigned long bit; 3631 const unsigned long bit;
4062 }
4063
4064 argtopriv[] = { 3632 } argtopriv[] = {
4065 { 1, PrivMode_aplCUR }, 3633 { 1, PrivMode_aplCUR }, // DECCKM
4066 { 2, PrivMode_vt52 }, 3634 { 2, PrivMode_vt52 },
4067 { 3, PrivMode_132 }, 3635 { 3, PrivMode_132 }, // DECCOLM
4068 { 4, PrivMode_smoothScroll }, 3636 { 4, PrivMode_smoothScroll }, // DECSCLM
4069 { 5, PrivMode_rVideo }, 3637 { 5, PrivMode_rVideo }, // DECSCNM
4070 { 6, PrivMode_relOrigin }, 3638 { 6, PrivMode_relOrigin }, // DECOM
4071 { 7, PrivMode_Autowrap }, 3639 { 7, PrivMode_Autowrap }, // DECAWM
4072 // 8, bi-directional support mode 3640 // 8, auto-repeat keys // DECARM
4073 { 9, PrivMode_MouseX10 }, 3641 { 9, PrivMode_MouseX10 },
4074 // 18, 19 printing-related 3642 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region
4075 { 25, PrivMode_VisibleCursor }, 3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4076#ifdef scrollBar_esc 3645#ifdef scrollBar_esc
4077 { scrollBar_esc, PrivMode_scrollBar }, 3646 { scrollBar_esc, PrivMode_scrollBar },
4078#endif 3647#endif
4079 { 35, PrivMode_ShiftKeys }, // rxvt extension 3648 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK
4080 { 40, PrivMode_132OK }, 3650 { 40, PrivMode_132OK },
4081 // 41 xterm more fixes NYI 3651 // 41 xterm more fixes NYI
4082 // 45 margin bell NYI 3652 // 45 margin bell NYI
4083 // 46 start logging 3653 // 46 start logging
4084 { 47, PrivMode_Screen }, 3654 { 47, PrivMode_Screen },
4085 { 66, PrivMode_aplKP }, 3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4086#ifndef NO_BACKSPACE_KEY 3656#ifndef NO_BACKSPACE_KEY
4087 { 67, PrivMode_BackSpace }, 3657 { 67, PrivMode_BackSpace }, // DECBKM
4088#endif 3658#endif
4089 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
4090 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3660 { 1002, PrivMode_MouseBtnEvent },
4091 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3661 { 1003, PrivMode_MouseAnyEvent },
4092 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
4093 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4094 { 1011, PrivMode_Keypress }, // rxvt extension 3666 { 1011, PrivMode_Keypress }, // rxvt extension
3667#if ENABLE_FRILLS
3668 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3669#endif
4095 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
4096 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
4097 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
4098 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
4099 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
4100 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3675 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4101 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3677 { 2004, PrivMode_BracketPaste },
4102 }; 3678 };
4103 3679
4104 if (nargs == 0) 3680 if (nargs == 0)
4105 return; 3681 return;
4106 3682
… …
4113 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
4114 { 3690 {
4115 state = -1; 3691 state = -1;
4116 3692
4117 /* basic handling */ 3693 /* basic handling */
4118 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4119 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
4120 { 3696 {
4121 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
4122 break; 3698 break;
4123 } 3699 }
… …
4131 3707
4132 scr_touch (true); 3708 scr_touch (true);
4133 break; 3709 break;
4134#endif 3710#endif
4135 case 1048: /* alternative cursor save */ 3711 case 1048: /* alternative cursor save */
4136 case 1049:
4137 if (OPTION (Opt_secondaryScreen)) 3712 if (option (Opt_secondaryScreen))
4138 if (mode == 0) 3713 if (mode == 0)
4139 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
4140 else if (mode == 1) 3715 else if (mode == 1)
4141 scr_cursor (SAVE); 3716 scr_cursor (SAVE);
4142 break; 3717 break;
… …
4150 case 2: /* VT52 mode */ 3725 case 2: /* VT52 mode */
4151 /* oddball mode. should be set regardless of set/reset 3726 /* oddball mode. should be set regardless of set/reset
4152 * parameter. Return from VT52 mode with an ESC < from 3727 * parameter. Return from VT52 mode with an ESC < from
4153 * within VT52 mode 3728 * within VT52 mode
4154 */ 3729 */
4155 PrivMode (1, PrivMode_vt52); 3730 set_privmode (PrivMode_vt52, 1);
4156 break; 3731 break;
4157 case 3: /* 80/132 */ 3732 case 3: /* 80/132 */
4158 if (priv_modes & PrivMode_132OK) 3733 if (priv_modes & PrivMode_132OK)
4159 set_widthheight (((state ? 132 : 80) * fwidth), height); 3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4160 break; 3735 break;
4161 case 4: /* smooth scrolling */ 3736 case 4: /* smooth scrolling */
4162 set_option (Opt_jumpScroll, !state); 3737 set_option (Opt_jumpScroll, !state);
4163 break; 3738 break;
4164 case 5: /* reverse video */ 3739 case 5: /* reverse video */
… …
4171 scr_autowrap (state); 3746 scr_autowrap (state);
4172 break; 3747 break;
4173 /* case 8: - auto repeat, can't do on a per window basis */ 3748 /* case 8: - auto repeat, can't do on a per window basis */
4174 case 9: /* X10 mouse reporting */ 3749 case 9: /* X10 mouse reporting */
4175 if (state) /* orthogonal */ 3750 if (state) /* orthogonal */
4176 priv_modes &= ~PrivMode_MouseX11; 3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4177 break; 3752 break;
4178#ifdef scrollBar_esc 3753#ifdef scrollBar_esc
4179 case scrollBar_esc: 3754 case scrollBar_esc:
4180 if (scrollbar_mapping (state)) 3755 if (scrollBar.map (state))
4181 { 3756 {
4182 resize_all_windows (0, 0, 0); 3757 resize_all_windows (0, 0, 0);
4183 scr_touch (true); 3758 scr_touch (true);
4184 } 3759 }
4185 break; 3760 break;
… …
4194 break; 3769 break;
4195 /* case 66: - application key pad */ 3770 /* case 66: - application key pad */
4196 /* case 67: - backspace key */ 3771 /* case 67: - backspace key */
4197 case 1000: /* X11 mouse reporting */ 3772 case 1000: /* X11 mouse reporting */
4198 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
4199 priv_modes &= ~PrivMode_MouseX10; 3774 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4200 break; 3775 break;
4201#if 0
4202 case 1001: 3776 case 1002:
4203 break; /* X11 mouse highlighting */ 3777 case 1003:
4204#endif 3778 if (state)
3779 {
3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3781 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3782 mouse_row = mouse_col = 0;
3783 vt_emask_mouse = PointerMotionMask;
3784 }
3785 else
3786 vt_emask_mouse = NoEventMask;
3787
3788 vt_select_input ();
3789 break;
4205 case 1010: /* scroll to bottom on TTY output inhibit */ 3790 case 1010: /* scroll to bottom on TTY output inhibit */
4206 set_option (Opt_scrollTtyOutput, !state); 3791 set_option (Opt_scrollTtyOutput, !state);
4207 break; 3792 break;
4208 case 1011: /* scroll to bottom on key press */ 3793 case 1011: /* scroll to bottom on key press */
4209 set_option (Opt_scrollTtyKeypress, state); 3794 set_option (Opt_scrollTtyKeypress, state);
4210 break; 3795 break;
4211 case 1047: /* secondary screen w/ clearing last */ 3796 case 1047: /* secondary screen w/ clearing last */
4212 if (OPTION (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3798 if (!state)
4214 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800
4215 scr_change_screen (state); 3801 scr_change_screen (state);
4216 break; 3802 break;
4217 case 1049: /* secondary screen w/ clearing first */ 3803 case 1049: /* secondary screen w/ clearing first */
3804 if (option (Opt_secondaryScreen))
3805 if (state)
3806 scr_cursor (SAVE);
3807
4218 scr_change_screen (state); 3808 scr_change_screen (state);
3809
4219 if (OPTION (Opt_secondaryScreen)) 3810 if (option (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY) 3811 if (state)
4221 scr_erase_screen (2); 3812 scr_erase_screen (2);
3813 else
3814 scr_cursor (RESTORE);
4222 break; 3815 break;
4223 default: 3816 default:
4224 break; 3817 break;
4225 } 3818 }
4226 } 3819 }
… …
4386rxvt_term::process_graphics () 3979rxvt_term::process_graphics ()
4387{ 3980{
4388 unicode_t ch, cmd = cmd_getc (); 3981 unicode_t ch, cmd = cmd_getc ();
4389 3982
4390 if (cmd == 'Q') 3983 if (cmd == 'Q')
3984 {
4391 { /* query graphics */ 3985 /* query graphics */
4392 tt_printf ("\033G0\012"); /* no graphics */ 3986 tt_printf ("\033G0\012"); /* no graphics */
4393 return; 3987 return;
4394 } 3988 }
4395 /* swallow other graphics sequences until terminating ':' */ 3989 /* swallow other graphics sequences until terminating ':' */
4396 do 3990 do
… …
4419 4013
4420/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
4421/* Write data to the pty as typed by the user, pasted with the mouse, 4015/* Write data to the pty as typed by the user, pasted with the mouse,
4422 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
4423 */ 4017 */
4424const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4425 4019
4426void 4020void
4427rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
4428{ 4022{
4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4441 4035
4442 data += written; 4036 data += written;
4443 len -= written; 4037 len -= written;
4444 } 4038 }
4445 4039
4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4447 4041
4448 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
4449 v_buflen += len; 4043 v_buflen += len;
4450 4044
4451 pty_ev.set (EVENT_READ | EVENT_WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);
4452} 4046}
4453 4047
4454void rxvt_term::pty_write () 4048void rxvt_term::pty_write ()
4455{ 4049{
4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4050 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4461 4055
4462 if (v_buflen == 0) 4056 if (v_buflen == 0)
4463 { 4057 {
4464 free (v_buffer); 4058 free (v_buffer);
4465 v_buffer = 0; 4059 v_buffer = 0;
4466 v_buflen = 0;
4467 4060
4468 pty_ev.set (EVENT_READ); 4061 pty_ev.set (ev::READ);
4469 return; 4062 return;
4470 } 4063 }
4471 4064
4472 memmove (v_buffer, v_buffer + written, v_buflen); 4065 memmove (v_buffer, v_buffer + written, v_buflen);
4473 } 4066 }
4474 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4067 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4475 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4476} 4069}
4477 4070
4478/*----------------------- end-of-file (C source) -----------------------*/ 4071/*----------------------- end-of-file (C source) -----------------------*/
4479 4072

Diff Legend

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