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.313 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 2 13:52:30 2010 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 switch (translate_keypad (keysym, kp))
544 { 655 {
656#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace)
659 {
660 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
661 ^ !!ctrl) ? '\b' : '\177';
662 kbuf[1] = '\0';
663 }
664 else
665 strcpy (kbuf, rs[Rs_backspace_key]);
666 break;
667#endif
668#ifndef NO_DELETE_KEY
669 case XK_Delete:
670 strcpy (kbuf, rs[Rs_delete_key]);
671 break;
672#endif
673 case XK_Tab:
674 if (shft)
675 strcpy (kbuf, "\033[Z");
676 else
677 {
678#ifdef CTRL_TAB_MAKES_META
679 if (ctrl)
680 meta = 1;
681#endif
682#ifdef MOD4_TAB_MAKES_META
683 if (ev.state & Mod4Mask)
684 meta = 1;
685#endif
545 newlen = 1; 686 newlen = 0;
546 switch (keysym) 687 }
688 break;
689
690 case XK_Up: /* "\033[A" */
691 case XK_Down: /* "\033[B" */
692 case XK_Right: /* "\033[C" */
693 case XK_Left: /* "\033[D" */
694 strcpy (kbuf, "\033[Z");
695 kbuf[2] = "DACB"[keysym - XK_Left];
696 /* do Shift first */
697 if (shft)
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 else if (ctrl)
700 {
701 kbuf[1] = 'O';
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 }
704 else if (priv_modes & PrivMode_aplCUR)
705 kbuf[1] = 'O';
706 break;
707
708 case XK_KP_Enter:
709 /* allow shift to override */
710 if (kp)
711 {
712 strcpy (kbuf, "\033OM");
713 break;
714 }
715
716 /* FALLTHROUGH */
717
718 case XK_Return:
719 if (priv_modes & PrivMode_LFNL)
720 {
721 kbuf[0] = '\015';
722 kbuf[1] = '\012';
723 kbuf[2] = '\0';
724 }
725 else
726 {
727 kbuf[0] = '\015';
728 kbuf[1] = '\0';
729 }
730 break;
731
732 case XK_KP_F1: /* "\033OP" */
733 case XK_KP_F2: /* "\033OQ" */
734 case XK_KP_F3: /* "\033OR" */
735 case XK_KP_F4: /* "\033OS" */
736 strcpy (kbuf, "\033OP");
737 kbuf[2] += (keysym - XK_KP_F1);
738 break;
739
740 case XK_KP_Multiply: /* "\033Oj" : "*" */
741 case XK_KP_Add: /* "\033Ok" : "+" */
742 case XK_KP_Separator: /* "\033Ol" : "," */
743 case XK_KP_Subtract: /* "\033Om" : "-" */
744 case XK_KP_Decimal: /* "\033On" : "." */
745 case XK_KP_Divide: /* "\033Oo" : "/" */
746 case XK_KP_0: /* "\033Op" : "0" */
747 case XK_KP_1: /* "\033Oq" : "1" */
748 case XK_KP_2: /* "\033Or" : "2" */
749 case XK_KP_3: /* "\033Os" : "3" */
750 case XK_KP_4: /* "\033Ot" : "4" */
751 case XK_KP_5: /* "\033Ou" : "5" */
752 case XK_KP_6: /* "\033Ov" : "6" */
753 case XK_KP_7: /* "\033Ow" : "7" */
754 case XK_KP_8: /* "\033Ox" : "8" */
755 case XK_KP_9: /* "\033Oy" : "9" */
756 /* allow shift to override */
757 if (kp)
758 {
759 strcpy (kbuf, "\033Oj");
760 kbuf[2] += (keysym - XK_KP_Multiply);
761 }
762 else
763 {
764 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
765 kbuf[1] = '\0';
766 }
767 break;
768
769 default:
547 { 770 {
548#ifndef NO_BACKSPACE_KEY 771 int param = map_function_key (keysym);
549 case XK_BackSpace: 772 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 773 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 774 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; 775 newlen = 0;
832 break;
833 } 776 }
834 777 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 778 }
779
780 if (newlen)
781 len = strlen (kbuf);
838 782
839 /* 783 /*
840 * Pass meta for all function keys, if 'meta' option set 784 * Pass meta for all function keys, if 'meta' option set
841 */ 785 */
842#ifdef META8_OPTION 786#ifdef META8_OPTION
… …
877 return; 821 return;
878 822
879 if (len <= 0) 823 if (len <= 0)
880 return; /* not mapped */ 824 return; /* not mapped */
881 825
882 if (OPTION (Opt_scrollTtyKeypress)) 826 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 827 if (view_start)
884 { 828 {
885 view_start = 0; 829 view_start = 0;
886 want_refresh = 1; 830 want_refresh = 1;
887 } 831 }
… …
926#if ENABLE_FRILLS || ISO_14755 870#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 871 // ISO 14755 support
928 if (iso14755buf) 872 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 873 if (iso14755buf & ISO_14755_52)
930 { 874 {
931# if ENABLE_OVERLAY 875# if ISO_14755
932 scr_overlay_off (); 876 scr_overlay_off ();
933# endif 877# endif
934# if ISO_14755 878# if ISO_14755
935 // iso14755 part 5.2 handling: release time 879 // iso14755 part 5.2 handling: release time
936 // first: controls 880 // first: controls
… …
959 903
960 return; 904 return;
961 } 905 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 906 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 907 {
964# if ENABLE_OVERLAY 908# if ISO_14755
965 scr_overlay_off (); 909 scr_overlay_off ();
966# endif 910# endif
967 if (iso14755buf & ISO_14755_51) 911 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 912 commit_iso14755 ();
969#if ISO_14755 913#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 914 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 915 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 916 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 917
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 918 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 919 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 971void
1028rxvt_term::flush () 972rxvt_term::flush ()
1029{ 973{
1030 flush_ev.stop (); 974 flush_ev.stop ();
1031 975
1032#ifdef TRANSPARENT 976#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 977 if (bgPixmap.check_clearChanged ())
1034 { 978 {
1035 want_full_refresh = 0; 979// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 980 scr_touch (false);
1038 } 981 }
1039#endif 982#endif
1040 983
1041 if (want_refresh) 984 if (want_refresh)
… …
1077 } 1020 }
1078 while (row < end_row); 1021 while (row < end_row);
1079 } 1022 }
1080 1023
1081 scr_refresh (); 1024 scr_refresh ();
1082 scrollbar_show (1); 1025 scrollBar.show (1);
1083#ifdef USE_XIM 1026#ifdef USE_XIM
1084 IMSendSpot (); 1027 IMSendSpot ();
1085#endif 1028#endif
1086 } 1029 }
1087 1030
1088 display->flush (); 1031 display->flush ();
1089} 1032}
1090 1033
1034/* checks whether a refresh is requested and starts the refresh timer */
1091void 1035void
1092rxvt_term::check_cb (check_watcher &w) 1036rxvt_term::refresh_check ()
1037{
1038 if (want_refresh && !flush_ev.is_active ())
1039 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1040
1041 display->flush ();
1042}
1043
1044void
1045rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1046{
1094 make_current (); 1047 make_current ();
1095 1048
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; 1049 refresh_count = 0;
1109 flush (); 1050 flush ();
1110} 1051}
1111 1052
1112#ifdef CURSOR_BLINK 1053#ifdef CURSOR_BLINK
1113void 1054void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1056{
1116 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1058 want_refresh = 1;
1118 1059 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1060}
1121#endif 1061#endif
1122 1062
1123#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1124void 1064void
1125rxvt_term::text_blink_cb (time_watcher &w) 1065rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1066{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1068 {
1129 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1130 want_refresh = 1; 1070 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1071 refresh_check ();
1132 } 1072 }
1073 else
1074 w.stop ();
1133} 1075}
1134#endif 1076#endif
1135 1077
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1079void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1081{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1084 {
1143 want_refresh = 1; 1085 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1145 } 1087 }
1088 else
1089 w.stop ();
1146} 1090}
1147#endif 1091#endif
1148 1092
1149#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1150void 1094void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1096{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1098 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1100 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 refresh_check ();
1158 } 1102 }
1103 else
1104 w.stop ();
1159} 1105}
1160#endif 1106#endif
1161 1107
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1109void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1111{
1166 if (mouse_slip_wheel_speed == 0 1112 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 { 1113 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1114 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1119 {
1120 mouse_slip_wheel_speed = 0;
1121 w.stop ();
1175 } 1122 }
1176} 1123}
1177#endif 1124#endif
1178 1125
1179#if LINUX_YIELD_HACK 1126#if LINUX_YIELD_HACK
1180static struct event_handler 1127static struct event_handler
1181{ 1128{
1182 check_watcher yield_ev; 1129 ev::prepare yield_ev;
1183 1130
1184 void yield_cb (check_watcher &w) 1131 void yield_cb (ev::prepare &w, int revents)
1185 { 1132 {
1186 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1134 // 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 1135 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1190 1140
1191 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1193 1143
1194 w.stop (); 1144 w.stop ();
1195 } 1145 }
1196 1146
… …
1232 } 1182 }
1233 else 1183 else
1234 { 1184 {
1235 pty_ev.stop (); 1185 pty_ev.stop ();
1236 1186
1237 if (!OPTION (Opt_hold)) 1187 if (!option (Opt_hold))
1238 destroy (); 1188 destroy ();
1239 } 1189 }
1240 1190
1241 return false; 1191 return false;
1242} 1192}
1243 1193
1244void 1194void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1195rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1196{
1247 make_current (); 1197 make_current ();
1248 1198
1249 if (revents & EVENT_READ) 1199 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1202 cmd_parse ();
1253 break;
1254 1203
1255 if (revents & EVENT_WRITE) 1204 if (revents & ev::WRITE)
1256 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1257} 1208}
1258 1209
1259void 1210void
1260rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1261{ 1212{
… …
1263 recolour_cursor (); 1214 recolour_cursor ();
1264 1215
1265#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1217 hidden_pointer = 0;
1267 1218
1268 if (OPTION (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1270#endif 1221#endif
1271} 1222}
1272 1223
1273#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1274void 1225void
1275rxvt_term::pointer_blank () 1226rxvt_term::pointer_blank ()
1276{ 1227{
1277 if (!OPTION (Opt_pointerBlank)) 1228 if (!option (Opt_pointerBlank))
1278 return; 1229 return;
1279 1230
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1231 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1232 XFlush (dpy);
1282 1233
1283 hidden_pointer = 1; 1234 hidden_pointer = 1;
1284} 1235}
1285 1236
1286void 1237void
1287rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1239{
1289 make_current (); 1240 make_current ();
1290 1241
1291 pointer_blank (); 1242 pointer_blank ();
1292} 1243}
… …
1295void 1246void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1248{
1298 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1299 int x, y; 1250 int x, y;
1251 int code = 32;
1300 1252
1301 x = ev.x; 1253 x = Pixel2Col (ev.x);
1302 y = ev.y; 1254 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1304 1263
1305 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1306 button_number = 3; 1265 button_number = 3;
1307 else 1266 else
1308 { 1267 {
… …
1354 x + 1, 1313 x + 1,
1355 y + 1); 1314 y + 1);
1356#endif 1315#endif
1357 1316
1358 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1360 (32 + x + 1), 1319 (32 + x + 1),
1361 (32 + y + 1)); 1320 (32 + y + 1));
1362} 1321}
1363 1322
1364/*{{{ process an X event */ 1323/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1386 focus_out ();
1428 } 1387 }
1429#endif 1388#endif
1430 } 1389 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1390 break;
1436 1391
1437 /* 1392 /*
1438 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1458 break; 1413 break;
1459 } 1414 }
1460 break; 1415 break;
1461 1416
1462 case FocusIn: 1417 case FocusIn:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1421 focus_in ();
1464 break; 1422 break;
1465 1423
1466 case FocusOut: 1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1428 focus_out ();
1468 break; 1429 break;
1469 1430
1470 case ConfigureNotify: 1431 case ConfigureNotify:
1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height);*/
1471 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1472 { 1436 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1438 ;
1475 1439
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1441 {
1478 seen_resize = 1; 1442 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1444 }
1445 else
1446 {
1447#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped)
1451 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1455#endif
1456 }
1481 1457
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1459 }
1489 break; 1460 break;
1490 1461
1491 case PropertyNotify: 1462 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1495 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496 1467
1497 break; 1468 break;
1498 1469
1499 case SelectionClear: 1470 case SelectionClear:
1500 selection_clear (); 1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break; 1472 break;
1502 1473
1503 case SelectionNotify: 1474 case SelectionNotify:
1504 if (selection_wait == Sel_normal) 1475 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1508 case SelectionRequest: 1479 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1480 selection_send (ev.xselectionrequest);
1510 break; 1481 break;
1511 1482
1512 case MapNotify: 1483 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a
1486 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does
1489 * reparenting.
1490 * We should not render background immidiately, as there could be several
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1492 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025);
1499#endif
1513 mapped = 1; 1500 mapped = 1;
1514#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start ();
1516#endif 1503#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1505 break;
1519 1506
1520 case UnmapNotify: 1507 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1510 text_blink_ev.stop ();
1524#endif 1511#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1513 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1514
1534 case GraphicsExpose: 1515 case GraphicsExpose:
1535 case Expose: 1516 case Expose:
1536 if (ev.xany.window == vt) 1517 if (ev.xany.window == vt)
1537 { 1518 {
1538 do 1519 do
1520 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1523 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1525
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1527
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1532 }
1548 1533
1549 want_refresh = 1; 1534 want_refresh = 1;
1550 } 1535 }
1551 else 1536 else
1552 { 1537 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1541 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1543 ;
1559 1544
1560 if (isScrollbarWindow (ev.xany.window)) 1545 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1546 {
1562 scrollBar.setIdle (); 1547 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1548 scrollBar.show (0);
1564 } 1549 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1550 }
1571 break; 1551 break;
1572 1552
1573 case MotionNotify: 1553 case MotionNotify:
1574#ifdef POINTER_BLANK 1554#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1555 if (hidden_pointer)
1576 pointer_unblank (); 1556 pointer_unblank ();
1577#endif 1557#endif
1558 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1559 || priv_modes & PrivMode_MouseAnyEvent)
1560 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1562 break;
1580 1563
1581 if (ev.xany.window == vt) 1564 if (ev.xany.window == vt)
1582 { 1565 {
… …
1616 int dist; 1599 int dist;
1617 1600
1618 /* don't clobber the current delay if we are 1601 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1602 * already in the middle of scrolling.
1620 */ 1603 */
1621 if (!sel_scroll_ev.active) 1604 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1605 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1606
1624 /* save the event params so we can highlight 1607 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1608 * the selection in the pending-scroll loop
1626 */ 1609 */
1627 selection_save_x = ev.xbutton.x; 1610 selection_save_x = ev.xbutton.x;
… …
1649 else 1632 else
1650 { 1633 {
1651 /* we are within the text window, so we 1634 /* we are within the text window, so we
1652 * shouldn't be scrolling 1635 * shouldn't be scrolling
1653 */ 1636 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1637 sel_scroll_ev.stop();
1656 } 1638 }
1657#endif 1639#endif
1658#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1659 } 1641 }
1660#endif 1642#endif
1661 } 1643 }
1662 } 1644 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1646 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1667 ; 1649 ;
1668 1650
… …
1670 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1655 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1657 scrollBar.size ());
1676 want_refresh = 1; 1658 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1659 scrollBar.show (1);
1679 } 1660 }
1680 break; 1661 break;
1681 } 1662 }
1682 1663
1683#if defined(CURSOR_BLINK) 1664#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1665 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1666 {
1686 if (hidden_cursor) 1667 if (hidden_cursor)
1687 { 1668 {
1688 hidden_cursor = 0; 1669 hidden_cursor = 0;
1689 want_refresh = 1; 1670 want_refresh = 1;
1690 } 1671 }
1691 1672
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1673 cursor_blink_ev.again ();
1693 } 1674 }
1694#endif 1675#endif
1695 1676
1696#if defined(POINTER_BLANK) 1677#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1678 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1679 {
1699 if (ev.type == MotionNotify 1680 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1681 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1682 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1683 if (hidden_pointer)
… …
1704 1685
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1686 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1687 pointer_blank ();
1707 } 1688 }
1708#endif 1689#endif
1690
1691 refresh_check ();
1709} 1692}
1693
1694#if ENABLE_FRILLS
1695void
1696rxvt_term::set_urgency (bool enable)
1697{
1698 if (enable == urgency_hint)
1699 return;
1700
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1702 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h);
1705 urgency_hint = enable;
1706 }
1707}
1708#endif
1710 1709
1711void 1710void
1712rxvt_term::focus_in () 1711rxvt_term::focus_in ()
1713{ 1712{
1714 if (!focus) 1713 if (!focus)
1715 { 1714 {
1716 focus = 1; 1715 focus = 1;
1717 want_refresh = 1; 1716 want_refresh = 1;
1718 1717
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1718#if USE_XIM
1722 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1723 { 1720 {
1724 IMSetPosition (); 1721 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1722 XSetICFocus (Input_Context);
1726 } 1723 }
1727#endif 1724#endif
1728#if CURSOR_BLINK 1725#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1726 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1727 cursor_blink_ev.again ();
1731#endif 1728#endif
1732#if OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1734 { 1731 {
1735 pix_colors = pix_colors_focused; 1732 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1733 scr_recolour ();
1737 } 1734 }
1738#endif 1735#endif
1736#if ENABLE_FRILLS
1737 if (option (Opt_urgentOnBell))
1738 set_urgency (0);
1739#endif
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739 } 1742 }
1740} 1743}
1741 1744
1742void 1745void
1743rxvt_term::focus_out () 1746rxvt_term::focus_out ()
… …
1745 if (focus) 1748 if (focus)
1746 { 1749 {
1747 focus = 0; 1750 focus = 0;
1748 want_refresh = 1; 1751 want_refresh = 1;
1749 1752
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1753#if ENABLE_FRILLS
1751 1754 if (option (Opt_urgentOnBell))
1755 set_urgency (0);
1756#endif
1752#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1758 if (iso14755buf)
1754 { 1759 {
1755 iso14755buf = 0; 1760 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1761# if ISO_14755
1757 scr_overlay_off (); 1762 scr_overlay_off ();
1758# endif 1763# endif
1759 } 1764 }
1760#endif 1765#endif
1761#if USE_XIM 1766#if USE_XIM
1762 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1764#endif 1769#endif
1765#if CURSOR_BLINK 1770#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1771 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1773
1768 hidden_cursor = 0; 1774 hidden_cursor = 0;
1769#endif 1775#endif
1770#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
1772 { 1778 {
1773 pix_colors = pix_colors_unfocused; 1779 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1780 scr_recolour ();
1775 } 1781 }
1776#endif 1782#endif
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1777 } 1785 }
1778} 1786}
1779 1787
1780void 1788void
1781rxvt_term::update_fade_color (unsigned int idx) 1789rxvt_term::update_fade_color (unsigned int idx)
… …
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1796 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1797 }
1790#endif 1798#endif
1791} 1799}
1792 1800
1793#if TRANSPARENT 1801#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1802void
1795rxvt_term::rootwin_cb (XEvent &ev) 1803rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1804{
1797 make_current (); 1805 make_current ();
1798 1806
1807 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1808 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1809 return;
1810
1811# if ENABLE_TRANSPARENCY
1799 switch (ev.type) 1812 switch (ev.type)
1800 { 1813 {
1801 case PropertyNotify: 1814 case PropertyNotify:
1802 /* 1815 /*
1803 * if user used some Esetroot compatible prog to set the root bg, 1816 * if user used some Esetroot compatible prog to set the root bg,
1804 * use the property to determine the pixmap. We use it later on. 1817 * use the property to determine the pixmap. We use it later on.
1805 */ 1818 */
1806 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1807 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1808 return; 1821 {
1822 bgPixmap.set_root_pixmap ();
1823 update_background ();
1824 }
1809 1825
1810 /* FALLTHROUGH */
1811 case ReparentNotify:
1812 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1813 want_refresh = want_full_refresh = 1;
1814 break; 1826 break;
1815 } 1827 }
1828# endif
1829
1830 refresh_check ();
1816} 1831}
1817#endif 1832#endif
1818 1833
1819void 1834void
1820rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
… …
1875 mouse_report (ev); 1890 mouse_report (ev);
1876 } 1891 }
1877#else 1892#else
1878 MEvent.button = ev.button; 1893 MEvent.button = ev.button;
1879 mouse_report (ev); 1894 mouse_report (ev);
1880#endif /* MOUSE_REPORT_DOUBLECLICK */ 1895#endif /* MOUSE_REPORT_DOUBLECLICK */
1881 1896
1882 } 1897 }
1883 else 1898 else
1884 { 1899 {
1885 if (ev.button != MEvent.button) 1900 if (ev.button != MEvent.button)
… …
1933 } 1948 }
1934 1949
1935 /* 1950 /*
1936 * Scrollbar window processing of button press 1951 * Scrollbar window processing of button press
1937 */ 1952 */
1938 if (isScrollbarWindow (ev.window)) 1953 if (scrollBar.state && ev.window == scrollBar.win)
1939 { 1954 {
1940 scrollBar.setIdle (); 1955 page_dirn direction = NO_DIR;
1956
1957 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */
1961
1962 scrollBar.state = STATE_IDLE;
1941 /* 1963 /*
1942 * Rxvt-style scrollbar: 1964 * Rxvt-style scrollbar:
1943 * move up if mouse is above slider 1965 * move up if mouse is above slider
1944 * move dn if mouse is below slider 1966 * move dn if mouse is below slider
1945 * 1967 *
… …
1954 /* 1976 /*
1955 * Mouse report disabled scrollbar: 1977 * Mouse report disabled scrollbar:
1956 * arrow buttons - send up/down 1978 * arrow buttons - send up/down
1957 * click on scrollbar - send pageup/down 1979 * click on scrollbar - send pageup/down
1958 */ 1980 */
1959 if ((scrollBar.style == R_SB_NEXT 1981 if (direction == UP)
1960 && scrollbarnext_upButton (ev.y))
1961 || (scrollBar.style == R_SB_RXVT
1962 && scrollbarrxvt_upButton (ev.y)))
1963 tt_printf ("\033[A"); 1982 tt_printf ("\033[A");
1964 else if ((scrollBar.style == R_SB_NEXT 1983 else if (direction == DN)
1965 && scrollbarnext_dnButton (ev.y))
1966 || (scrollBar.style == R_SB_RXVT
1967 && scrollbarrxvt_dnButton (ev.y)))
1968 tt_printf ("\033[B"); 1984 tt_printf ("\033[B");
1969 else 1985 else
1970 switch (ev.button) 1986 switch (ev.button)
1971 { 1987 {
1972 case Button2: 1988 case Button2:
… …
1979 tt_printf ("\033[5~"); 1995 tt_printf ("\033[5~");
1980 break; 1996 break;
1981 } 1997 }
1982 } 1998 }
1983 else 1999 else
1984#endif /* NO_SCROLLBAR_REPORT */ 2000#endif /* NO_SCROLLBAR_REPORT */
1985
1986 {
1987 char upordown = 0;
1988
1989 if (scrollBar.style == R_SB_NEXT)
1990 { 2001 {
1991 if (scrollbarnext_upButton (ev.y)) 2002 if (direction != NO_DIR)
1992 upordown = -1; /* up */
1993 else if (scrollbarnext_dnButton (ev.y))
1994 upordown = 1; /* down */
1995 }
1996 else if (scrollBar.style == R_SB_RXVT)
1997 {
1998 if (scrollbarrxvt_upButton (ev.y))
1999 upordown = -1; /* up */
2000 else if (scrollbarrxvt_dnButton (ev.y))
2001 upordown = 1; /* down */
2002 }
2003 if (upordown)
2004 { 2003 {
2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2005 if (!cont_scroll_ev.is_active ())
2006 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 2007#endif
2008 if (scr_page (upordown < 0 ? UP : DN, 1)) 2008 if (scr_page (direction, 1))
2009 { 2009 {
2010 if (upordown < 0) 2010 if (direction == UP)
2011 scrollBar.setUp (); 2011 scrollBar.state = STATE_UP;
2012 else 2012 else
2013 scrollBar.setDn (); 2013 scrollBar.state = STATE_DOWN;
2014 } 2014 }
2015 } 2015 }
2016 else 2016 else
2017 switch (ev.button) 2017 switch (ev.button)
2018 { 2018 {
2019 case Button2: 2019 case Button2:
2020 switch (scrollbar_align) 2020 switch (scrollBar.align)
2021 { 2021 {
2022 case R_SB_ALIGN_TOP: 2022 case R_SB_ALIGN_TOP:
2023 csrO = 0; 2023 csrO = 0;
2024 break; 2024 break;
2025 case R_SB_ALIGN_CENTRE: 2025 case R_SB_ALIGN_CENTRE:
… …
2031 } 2031 }
2032 2032
2033 if (scrollBar.style == R_SB_XTERM 2033 if (scrollBar.style == R_SB_XTERM
2034 || scrollbar_above_slider (ev.y) 2034 || scrollbar_above_slider (ev.y)
2035 || scrollbar_below_slider (ev.y)) 2035 || scrollbar_below_slider (ev.y))
2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2037 2037
2038 scrollBar.setMotion (); 2038 scrollBar.state = STATE_MOTION;
2039 break; 2039 break;
2040 2040
2041 case Button1: 2041 case Button1:
2042 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2042 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2043 csrO = ev.y - scrollBar.top; 2043 csrO = ev.y - scrollBar.top;
2044 /* FALLTHROUGH */ 2044 /* FALLTHROUGH */
2045 2045
2046 case Button3: 2046 case Button3:
2047 if (scrollBar.style != R_SB_XTERM) 2047 if (scrollBar.style != R_SB_XTERM)
… …
2057 scr_page (DN, nrow - 1); 2057 scr_page (DN, nrow - 1);
2058# else 2058# else
2059 scr_page (DN, nrow / 4); 2059 scr_page (DN, nrow / 4);
2060# endif 2060# endif
2061 else 2061 else
2062 scrollBar.setMotion (); 2062 scrollBar.state = STATE_MOTION;
2063 } 2063 }
2064 else 2064 else
2065 { 2065 {
2066 scr_page ((ev.button == Button1 ? DN : UP), 2066 scr_page ((ev.button == Button1 ? DN : UP),
2067 (nrow 2067 (nrow
2068 * scrollbar_position (ev.y) 2068 * scrollbar_position (ev.y)
2069 / scrollbar_size ())); 2069 / scrollBar.size ()));
2070 } 2070 }
2071 2071
2072 break; 2072 break;
2073 } 2073 }
2074 } 2074 }
… …
2084 2084
2085 csrO = 0; /* reset csr Offset */ 2085 csrO = 0; /* reset csr Offset */
2086 if (!bypass_keystate) 2086 if (!bypass_keystate)
2087 reportmode = !! (priv_modes & PrivMode_mouse_report); 2087 reportmode = !! (priv_modes & PrivMode_mouse_report);
2088 2088
2089 if (scrollbar_isUpDn ()) 2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2090 { 2090 {
2091 scrollBar.setIdle (); 2091 scrollBar.state = STATE_IDLE;
2092 scrollbar_show (0); 2092 scrollBar.show (0);
2093 } 2093 }
2094 2094
2095#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2096 if (sel_scroll_ev.active)
2097 sel_scroll_ev.stop(); 2096 sel_scroll_ev.stop();
2098#endif 2097#endif
2099 2098
2100 if (ev.window == vt) 2099 if (ev.window == vt)
2101 { 2100 {
2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2101 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2126 mouse_report (ev); 2125 mouse_report (ev);
2127 } 2126 }
2128#else /* MOUSE_REPORT_DOUBLECLICK */ 2127#else /* MOUSE_REPORT_DOUBLECLICK */
2129 MEvent.button = AnyButton; 2128 MEvent.button = AnyButton;
2130 mouse_report (ev); 2129 mouse_report (ev);
2131#endif /* MOUSE_REPORT_DOUBLECLICK */ 2130#endif /* MOUSE_REPORT_DOUBLECLICK */
2132 return; 2131 return;
2133 } 2132 }
2134 2133
2135 /* 2134 /*
2136 * dumb hack to compensate for the failure of click-and-drag 2135 * dumb hack to compensate for the failure of click-and-drag
… …
2148 selection_make (ev.time); 2147 selection_make (ev.time);
2149 break; 2148 break;
2150 2149
2151 case Button2: 2150 case Button2:
2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2153 break;
2155 2154
2156#ifdef MOUSE_WHEEL 2155#ifdef MOUSE_WHEEL
2157 case Button4: 2156 case Button4:
2158 case Button5: 2157 case Button5:
… …
2162 2161
2163 v = ev.button == Button4 ? UP : DN; 2162 v = ev.button == Button4 ? UP : DN;
2164 2163
2165 if (ev.state & ShiftMask) 2164 if (ev.state & ShiftMask)
2166 i = 1; 2165 i = 1;
2167 else if (OPTION (Opt_mouseWheelScrollPage)) 2166 else if (option (Opt_mouseWheelScrollPage))
2168 i = nrow - 1; 2167 i = nrow - 1;
2169 else 2168 else
2170 i = 5; 2169 i = 5;
2171 2170
2172# ifdef MOUSE_SLIP_WHEELING 2171# ifdef MOUSE_SLIP_WHEELING
… …
2174 { 2173 {
2175 mouse_slip_wheel_speed += v ? -1 : 1; 2174 mouse_slip_wheel_speed += v ? -1 : 1;
2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2175 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2176 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2178 2177
2179 if (slip_wheel_ev.at < NOW) 2178 if (!slip_wheel_ev.is_active ())
2180 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2181
2182 slip_wheel_ev.start ();
2183 } 2180 }
2184 else 2181 else
2182# endif
2185 { 2183 {
2186# endif
2187 scr_page (v, i); 2184 scr_page (v, i);
2188 scrollbar_show (1); 2185 scrollBar.show (1);
2189# ifdef MOUSE_SLIP_WHEELING
2190 } 2186 }
2191# endif
2192 } 2187 }
2193 break; 2188 break;
2194#endif 2189#endif
2195 } 2190 }
2196 } 2191 }
2197} 2192}
2198 2193
2199#ifdef TRANSPARENT
2200#if TINTING
2201/* taken from aterm-0.4.2 */
2202
2203typedef uint32_t RUINT32T;
2204
2205void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2206{
2207 int sh_r, sh_g, sh_b;
2208 RUINT32T mask_r, mask_g, mask_b;
2209 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2210 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2211 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2212 int i;
2213
2214 Visual *visual = term->visual;
2215
2216 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2217
2218 /* for convenience */
2219 mask_r = visual->red_mask;
2220 mask_g = visual->green_mask;
2221 mask_b = visual->blue_mask;
2222
2223 /* boring lookup table pre-initialization */
2224 switch (srcImage->bits_per_pixel) {
2225 case 15:
2226 if ((mask_r != 0x7c00) ||
2227 (mask_g != 0x03e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+32;
2234 sh_r = 10;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 16:
2239 if ((mask_r != 0xf800) ||
2240 (mask_g != 0x07e0) ||
2241 (mask_b != 0x001f))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2244 lookup_r = lookup;
2245 lookup_g = lookup+32;
2246 lookup_b = lookup+32+64;
2247 sh_r = 11;
2248 sh_g = 5;
2249 sh_b = 0;
2250 break;
2251 case 24:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 case 32:
2265 if ((mask_r != 0xff0000) ||
2266 (mask_g != 0x00ff00) ||
2267 (mask_b != 0x0000ff))
2268 return;
2269 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2270 lookup_r = lookup;
2271 lookup_g = lookup+256;
2272 lookup_b = lookup+256+256;
2273 sh_r = 16;
2274 sh_g = 8;
2275 sh_b = 0;
2276 break;
2277 default:
2278 return; /* we do not support this color depth */
2279 }
2280
2281 /* prepare limits for color transformation (each channel is handled separately) */
2282 if (shade < 0) {
2283 shade = -shade;
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = 65535-rm;
2288 lower_lim_g = 65535-gm;
2289 lower_lim_b = 65535-bm;
2290
2291 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2292 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2293 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2294
2295 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2296 } else {
2297 if (shade < 0) shade = 0;
2298 if (shade > 100) shade = 100;
2299
2300 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2301
2302 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2303 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2304 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2305 }
2306
2307 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2308 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2309 {
2310 unsigned int tmp;
2311
2312 tmp = lower_lim_r;
2313 lower_lim_r = lower_lim_b;
2314 lower_lim_b = tmp;
2315
2316 tmp = upper_lim_r;
2317 upper_lim_r = upper_lim_b;
2318 upper_lim_b = tmp;
2319 }
2320
2321 /* fill our lookup tables */
2322 for (i = 0; i <= mask_r>>sh_r; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2326 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2327 lookup_r[i] = (tmp/65535)<<sh_r;
2328 }
2329 for (i = 0; i <= mask_g>>sh_g; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2333 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2334 lookup_g[i] = (tmp/65535)<<sh_g;
2335 }
2336 for (i = 0; i <= mask_b>>sh_b; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2340 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2341 lookup_b[i] = (tmp/65535)<<sh_b;
2342 }
2343
2344 /* apply table to input image (replacing colors by newly calculated ones) */
2345 switch (srcImage->bits_per_pixel)
2346 {
2347 case 15:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0x7c00)>>10] |
2359 lookup_g[(*p & 0x03e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 16:
2367 {
2368 unsigned short *p1, *pf, *p, *pl;
2369 p1 = (unsigned short *) srcImage->data;
2370 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width;
2375 for (; p < pl; p++)
2376 {
2377 *p = lookup_r[(*p & 0xf800)>>11] |
2378 lookup_g[(*p & 0x07e0)>> 5] |
2379 lookup_b[(*p & 0x001f)];
2380 }
2381 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 24:
2386 {
2387 unsigned char *p1, *pf, *p, *pl;
2388 p1 = (unsigned char *) srcImage->data;
2389 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390 while (p1 < pf)
2391 {
2392 p = p1;
2393 pl = p1 + srcImage->width * 3;
2394 for (; p < pl; p += 3)
2395 {
2396 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2397 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2398 p[2] = lookup_r[(p[2] & 0x0000ff)];
2399 }
2400 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2401 }
2402 break;
2403 }
2404 case 32:
2405 {
2406 RUINT32T *p1, *pf, *p, *pl;
2407 p1 = (RUINT32T *) srcImage->data;
2408 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2409
2410 while (p1 < pf)
2411 {
2412 p = p1;
2413 pl = p1 + srcImage->width;
2414 for (; p < pl; p++)
2415 {
2416 *p = lookup_r[(*p & 0xff0000)>>16] |
2417 lookup_g[(*p & 0x00ff00)>> 8] |
2418 lookup_b[(*p & 0x0000ff)] |
2419 (*p & ~0xffffff);
2420 }
2421 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 }
2426
2427 free (lookup);
2428}
2429#endif
2430
2431/*
2432 * Check our parents are still who we think they are.
2433 * Do transparency updates if required
2434 */
2435int
2436rxvt_term::check_our_parents ()
2437{
2438 int i, pchanged, aformat, have_pixmap, rootdepth;
2439 unsigned long nitems, bytes_after;
2440 Atom atype;
2441 unsigned char *prop = NULL;
2442 Window root, oldp, *list;
2443 Pixmap rootpixmap = None;
2444 XWindowAttributes wattr, wrootattr;
2445
2446 pchanged = 0;
2447
2448 if (!OPTION (Opt_transparent))
2449 return pchanged; /* Don't try any more */
2450
2451 XGetWindowAttributes (dpy, display->root, &wrootattr);
2452 rootdepth = wrootattr.depth;
2453
2454 XGetWindowAttributes (dpy, parent[0], &wattr);
2455
2456 if (rootdepth != wattr.depth)
2457 {
2458 if (am_transparent)
2459 {
2460 pchanged = 1;
2461 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2462 am_transparent = am_pixmap_trans = 0;
2463 }
2464
2465 return pchanged; /* Don't try any more */
2466 }
2467
2468 /* Get all X ops out of the queue so that our information is up-to-date. */
2469 XSync (dpy, False);
2470
2471 /*
2472 * Make the frame window set by the window manager have
2473 * the root background. Some window managers put multiple nested frame
2474 * windows for each client, so we have to take care about that.
2475 */
2476 i = (xa[XA_XROOTPMAP_ID]
2477 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2478 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2479 &nitems, &bytes_after, &prop) == Success);
2480
2481 if (!i || prop == NULL)
2482 i = (xa[XA_ESETROOT_PMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL
2488#if TINTING
2489 || !ISSET_PIXCOLOR (Color_tint)
2490#endif
2491 )
2492 have_pixmap = 0;
2493 else
2494 {
2495 have_pixmap = 1;
2496 rootpixmap = *(Pixmap *)prop;
2497 XFree (prop);
2498 }
2499
2500 if (have_pixmap)
2501 {
2502 /*
2503 * Copy display->root pixmap transparency
2504 */
2505 int sx, sy, nx, ny;
2506 unsigned int nw, nh;
2507 Window cr;
2508 XImage *image;
2509 GC gc;
2510 XGCValues gcvalue;
2511
2512 XTranslateCoordinates (dpy, parent[0], display->root,
2513 0, 0, &sx, &sy, &cr);
2514 nw = (unsigned int)szHint.width;
2515 nh = (unsigned int)szHint.height;
2516 nx = ny = 0;
2517
2518 if (sx < 0)
2519 {
2520 nw += sx;
2521 nx = -sx;
2522 sx = 0;
2523 }
2524
2525 if (sy < 0)
2526 {
2527 nh += sy;
2528 ny = -sy;
2529 sy = 0;
2530 }
2531
2532 min_it (nw, (unsigned int) (wrootattr.width - sx));
2533 min_it (nh, (unsigned int) (wrootattr.height - sy));
2534
2535 XSync (dpy, False);
2536 allowedxerror = -1;
2537 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2538
2539 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2540 /* XXX: may need a delay here? */
2541 allowedxerror = 0;
2542
2543 if (image == NULL)
2544 {
2545 if (am_transparent && am_pixmap_trans)
2546 {
2547 pchanged = 1;
2548 if (pixmap != None)
2549 {
2550 XFreePixmap (dpy, pixmap);
2551 pixmap = None;
2552 }
2553 }
2554
2555 am_pixmap_trans = 0;
2556 }
2557 else
2558 {
2559 if (pixmap != None)
2560 XFreePixmap (dpy, pixmap);
2561
2562#if TINTING
2563 if (ISSET_PIXCOLOR (Color_tint))
2564 {
2565 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2566
2567 rgba c;
2568 pix_colors_focused [Color_tint].get (c);
2569
2570 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2571 }
2572#endif
2573
2574 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2575 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2576 XPutImage (dpy, pixmap, gc, image, 0, 0,
2577 nx, ny, image->width, image->height);
2578 XFreeGC (dpy, gc);
2579 XDestroyImage (image);
2580 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2581 XClearWindow (dpy, parent[0]);
2582
2583 if (!am_transparent || !am_pixmap_trans)
2584 pchanged = 1;
2585
2586 am_transparent = am_pixmap_trans = 1;
2587 }
2588 }
2589
2590 if (am_pixmap_trans)
2591 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2592 else
2593 {
2594 unsigned int n;
2595 /*
2596 * InheritPixmap transparency
2597 */
2598 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2599 {
2600 oldp = parent[i];
2601 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2602 XFree (list);
2603
2604 if (parent[i] == display->root)
2605 {
2606 if (oldp != None)
2607 pchanged = 1;
2608
2609 break;
2610 }
2611
2612 if (oldp != parent[i])
2613 pchanged = 1;
2614 }
2615
2616 n = 0;
2617
2618 if (pchanged)
2619 for (; n < (unsigned int)i; n++)
2620 {
2621 XGetWindowAttributes (dpy, parent[n], &wattr);
2622
2623 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2624 {
2625 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2626 break;
2627 }
2628 }
2629
2630 if (n > (sizeof (parent) / sizeof (parent[0])))
2631 {
2632 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2633 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2634 am_transparent = 0;
2635 /* XXX: also turn off Opt_transparent? */
2636 }
2637 else
2638 {
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2642 XClearWindow (dpy, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670
2671/*}}} */ 2194/*}}} */
2672 2195
2673bool 2196void
2674rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2675{ 2198{
2676 bool flag = false;
2677 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2678 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2679 2201
2680 for (;;) 2202 for (;;)
2681 { 2203 {
2682 if (ch == NOCHAR) 2204 if (expect_false (ch == NOCHAR))
2683 { 2205 {
2684 seq_begin = cmdbuf_ptr; 2206 seq_begin = cmdbuf_ptr;
2685 ch = next_char (); 2207 ch = next_char ();
2686 2208
2687 if (ch == NOCHAR) 2209 if (ch == NOCHAR)
2688 break; 2210 break;
2689 } 2211 }
2690 2212
2691 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2692 { 2214 {
2693 if (!seen_input) 2215 if (expect_false (!seen_input))
2694 { 2216 {
2695 seen_input = 1; 2217 seen_input = 1;
2696 // many badly-written programs (e.g. jed) contain a race condition: 2218 // many badly-written programs (e.g. jed) contain a race condition:
2697 // they first read the screensize and then install a SIGWINCH handler. 2219 // they first read the screensize and then install a SIGWINCH handler.
2698 // some window managers resize the window early, and these programs 2220 // some window managers resize the window early, and these programs
… …
2711 wchar_t *str = buf; 2233 wchar_t *str = buf;
2712 wchar_t *eol = str + min (ncol, UBUFSIZ); 2234 wchar_t *eol = str + min (ncol, UBUFSIZ);
2713 2235
2714 for (;;) 2236 for (;;)
2715 { 2237 {
2716 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2717 break; 2239 break;
2718 2240
2719 *str++ = ch; 2241 *str++ = ch;
2720 2242
2721 if (ch == C0_LF || str >= eol) 2243 if (expect_false (ch == C0_LF || str >= eol))
2722 { 2244 {
2723 if (ch == C0_LF) 2245 if (ch == C0_LF)
2724 nlines++; 2246 nlines++;
2725 2247
2726 refresh_count++; 2248 refresh_count++;
2727 2249
2728 if (!OPTION (Opt_jumpScroll) 2250 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2251 {
2731 refreshnow = true;
2732 refresh_count = 0; 2252 refresh_count = 0;
2253
2254 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2255 {
2256 refreshnow = true;
2733 ch = NOCHAR; 2257 ch = NOCHAR;
2734 break; 2258 break;
2259 }
2735 } 2260 }
2736 2261
2737 // scr_add_lines only works for nlines <= nrow - 1. 2262 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2263 if (nlines >= nrow - 1)
2739 { 2264 {
… …
2767 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2292 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2768 scr_add_lines (buf, str - buf, nlines); 2293 scr_add_lines (buf, str - buf, nlines);
2769 2294
2770 /* 2295 /*
2771 * If there have been a lot of new lines, then update the screen 2296 * If there have been a lot of new lines, then update the screen
2772 * What the heck I'll cheat and only refresh less than every page-full. 2297 * What the heck we'll cheat and only refresh less than every page-full.
2773 * the number of pages between refreshes is refresh_limit, which 2298 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2299 */
2776 if (refreshnow) 2300 if (refreshnow)
2777 { 2301 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true;
2783 //TODO: due to popular request, implement "skipscroll" option here
2784 scr_refresh (); 2302 scr_refresh ();
2785 want_refresh = 1; 2303 want_refresh = 1;
2786 }
2787 } 2304 }
2788
2789 } 2305 }
2790 else 2306 else
2791 { 2307 {
2792 try 2308 try
2793 { 2309 {
… …
2801 } 2317 }
2802 2318
2803 ch = NOCHAR; 2319 ch = NOCHAR;
2804 } 2320 }
2805 } 2321 }
2806
2807 return flag;
2808} 2322}
2809 2323
2810// read the next character 2324// read the next character
2811wchar_t 2325wchar_t
2812rxvt_term::next_char () NOTHROW 2326rxvt_term::next_char () NOTHROW
2813{ 2327{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2329 {
2816 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2817 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2818 return *cmdbuf_ptr++; 2332 return *cmdbuf_ptr++;
2819 2333
2820 wchar_t wc; 2334 wchar_t wc;
2821 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2336
… …
2826 cmdbuf_ptr = cmdbuf_endp; 2340 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2341 break;
2828 } 2342 }
2829 2343
2830 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2345 {
2346 mbstate.reset (); // reset now undefined conversion state
2831 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 }
2832 2349
2833 // assume wchar == unicode 2350 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2352 return wc & UNICODE_MASK;
2836 } 2353 }
… …
2880/*----------------------------------------------------------------------*/ 2397/*----------------------------------------------------------------------*/
2881#ifdef PRINTPIPE 2398#ifdef PRINTPIPE
2882FILE * 2399FILE *
2883rxvt_term::popen_printer () 2400rxvt_term::popen_printer ()
2884{ 2401{
2885 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2886 2403
2887 if (stream == NULL) 2404 if (stream == NULL)
2888 rxvt_warn ("can't open printer pipe, not printing.\n"); 2405 rxvt_warn ("can't open printer pipe, not printing.\n");
2889 2406
2890 return stream; 2407 return stream;
… …
2901 * simulate attached vt100 printer 2418 * simulate attached vt100 printer
2902 */ 2419 */
2903void 2420void
2904rxvt_term::process_print_pipe () 2421rxvt_term::process_print_pipe ()
2905{ 2422{
2906 int done; 2423 FILE *fd = popen_printer ();
2907 FILE *fd;
2908 2424
2909 if ((fd = popen_printer ()) == NULL) 2425 if (!fd)
2910 return; 2426 return;
2911 2427
2912 /* 2428 /*
2913 * Send all input to the printer until either ESC[4i or ESC[?4i 2429 * Send all input to the printer until either ESC[4i or ESC[?4i
2914 * is received. 2430 * is received.
2915 */ 2431 */
2916 for (done = 0; !done;) 2432 for (int done = 0; !done; )
2917 { 2433 {
2918 unsigned char buf[8]; 2434 unsigned char buf[8];
2919 unicode_t ch; 2435 unicode_t ch;
2920 unsigned int i, len; 2436 unsigned int i, len;
2921 2437
… …
2940 { 2456 {
2941 if ((buf[len++] = cmd_getc ()) == 'i') 2457 if ((buf[len++] = cmd_getc ()) == 'i')
2942 break; /* done = 1 */ 2458 break; /* done = 1 */
2943 } 2459 }
2944 } 2460 }
2945 2461
2946 for (i = 0; i < len; i++) 2462 for (i = 0; i < len; i++)
2947 if (putc (buf[i], fd) == EOF) 2463 if (putc (buf[i], fd) == EOF)
2948 { 2464 {
2949 done = 1; 2465 done = 1;
2950 break; 2466 break;
… …
2952 } 2468 }
2953 } 2469 }
2954 2470
2955 pclose_printer (fd); 2471 pclose_printer (fd);
2956} 2472}
2957#endif /* PRINTPIPE */ 2473#endif /* PRINTPIPE */
2958/*}}} */ 2474/*}}} */
2959 2475
2960/* *INDENT-OFF* */ 2476/* *INDENT-OFF* */
2961enum { 2477enum {
2962 C1_40 = 0x40, 2478 C1_40 = 0x40,
… …
3012 process_dcs_seq (); 2528 process_dcs_seq ();
3013 break; 2529 break;
3014 case 0x9b: /* CSI */ 2530 case 0x9b: /* CSI */
3015 process_csi_seq (); 2531 process_csi_seq ();
3016 break; 2532 break;
3017 case 0x9d: /* CSI */ 2533 case 0x9d: /* OSC */
3018 process_osc_seq (); 2534 process_osc_seq ();
3019 break; 2535 break;
3020#endif 2536#endif
3021 } 2537 }
3022} 2538}
… …
3066 break; 2582 break;
3067 case 'Z': /* identify the terminal type */ 2583 case 'Z': /* identify the terminal type */
3068 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3069 break; 2585 break;
3070 case '<': /* turn off VT52 mode */ 2586 case '<': /* turn off VT52 mode */
3071 PrivMode (0, PrivMode_vt52); 2587 set_privmode (PrivMode_vt52, 0);
3072 break; 2588 break;
3073 case 'F': /* use special graphics character set */ 2589 case 'F': /* use special graphics character set */
3074 case 'G': /* use regular character set */ 2590 case 'G': /* use regular character set */
3075 /* unimplemented */ 2591 /* unimplemented */
3076 break; 2592 break;
… …
3130 scr_forwardindex (); 2646 scr_forwardindex ();
3131 break; 2647 break;
3132#endif 2648#endif
3133 case '=': 2649 case '=':
3134 case '>': 2650 case '>':
3135 PrivMode ((ch == '='), PrivMode_aplKP); 2651 set_privmode (PrivMode_aplKP, ch == '=');
3136 break; 2652 break;
3137 2653
3138 case C1_40: 2654 case C1_40:
3139 cmd_getc (); 2655 cmd_getc ();
3140 break; 2656 break;
… …
3179 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3180 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
3181 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3182 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
3183 2699
3184 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3185 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
3186 process_csi_seq (); 2702 process_csi_seq ();
3187 break; 2703 break;
3188 2704
3189 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3190 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
3191 process_osc_seq (); 2707 process_osc_seq ();
3192 break; 2708 break;
3193 2709
3194 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3195 case 'c': 2711 case 'c':
3196 mbstate.reset (); 2712 mbstate.reset ();
3197 scr_poweron (); 2713 scr_poweron ();
3198 scrollbar_show (1); 2714 scrollBar.show (1);
3199 break; 2715 break;
3200 2716
3201 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3202 case 'n': 2718 case 'n':
3203 scr_charset_choose (2); 2719 scr_charset_choose (2);
… …
3248rxvt_term::process_csi_seq () 2764rxvt_term::process_csi_seq ()
3249{ 2765{
3250 unicode_t ch, priv, i; 2766 unicode_t ch, priv, i;
3251 unsigned int nargs, p; 2767 unsigned int nargs, p;
3252 int n, ndef; 2768 int n, ndef;
3253 int arg[ESC_ARGS]; 2769 int arg[ESC_ARGS] = { };
3254 2770
3255 for (nargs = ESC_ARGS; nargs > 0;) 2771 nargs = 0;
3256 arg[--nargs] = 0;
3257 2772
3258 priv = 0; 2773 priv = 0;
3259 ch = cmd_getc (); 2774 ch = cmd_getc ();
3260 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2776 {
3261 { /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
3262 priv = ch; 2778 priv = ch;
3263 ch = cmd_getc (); 2779 ch = cmd_getc ();
3264 } 2780 }
3265 2781
3266 /* read any numerical arguments */ 2782 /* read any numerical arguments */
… …
3305 switch (priv) 2821 switch (priv)
3306 { 2822 {
3307 case '>': 2823 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 2824 if (ch == CSI_DA) /* secondary device attributes */
3309 { 2825 {
3310 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2826 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3311 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2827 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3312 // 2828 //
3313 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2829 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3314 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2830 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3315 // that we do not support xterm mouse reporting (should be 95 when we do). 2831 // versions.
3316 // 2832 //
3317 tt_printf ("\033[>%d;94;0c", 'U'); 2833 tt_printf ("\033[>%d;95;0c", 'U');
3318 } 2834 }
3319 break; 2835 break;
2836
3320 case '?': 2837 case '?':
3321 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3322 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
3323 break; 2840 break;
2841
2842 case '!':
2843 if (ch == CSI_70)
2844 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset ();
2847
2848 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2850
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3324 } 2853 }
2854 break;
2855 }
2856
3325 return; 2857 return;
3326 } 2858 }
3327 2859
3328 switch (ch) 2860 switch (ch)
3329 { 2861 {
… …
3449 break; 2981 break;
3450 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3451 scr_report_position (); 2983 scr_report_position ();
3452 break; 2984 break;
3453 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3454 if (OPTION (Opt_insecure)) 2986 if (option (Opt_insecure))
3455 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3456 break; 2988 break;
3457 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3458 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3459 break; 2991 break;
… …
3623 break; 3155 break;
3624 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3625 { 3157 {
3626 char *s; 3158 char *s;
3627 XGetIconName (dpy, parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3628 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3161 XFree (s);
3630 } 3162 }
3631 break; 3163 break;
3632 case 21: /* report window title */ 3164 case 21: /* report window title */
3633 { 3165 {
3634 char *s; 3166 char *s;
3635 XFetchName (dpy, parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3636 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3169 XFree (s);
3638 } 3170 }
3639 break; 3171 break;
3640 } 3172 }
3641} 3173}
… …
3668 seen_esc = true; 3200 seen_esc = true;
3669 continue; 3201 continue;
3670 } 3202 }
3671 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3672 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3673 else if (ch < 0x20) 3207 else if (ch < 0x20)
3674 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3675 3209
3676 seen_esc = false; 3210 seen_esc = false;
3677 3211
3678 if (n >= STRING_MAX - 1) 3212 if (n >= STRING_MAX - 1)
3679 // stop at some sane length 3213 // stop at some sane length
3680 return NULL; 3214 return NULL;
3681 3215
3682 if (ch == C0_SYN)
3683 string[n++] = cmd_get8 ();
3684 else
3685 string[n++] = ch; 3216 string[n++] = ch;
3686 } 3217 }
3687 3218
3688 string[n++] = '\0'; 3219 string[n++] = '\0';
3689 3220
3690 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3759 3290
3760/* 3291/*
3761 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3762 */ 3293 */
3763void 3294void
3764rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3765{ 3296{
3766 int color; 3297 int color;
3767 char *buf, *name; 3298 char *buf, *name;
3768 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3769 int saveop = op; 3300 int saveop = op;
3770 3301
3771 dLocal (Display *, dpy); 3302 dLocal (Display *, dpy);
3772 3303
3773 assert (str != NULL); 3304 assert (str != NULL);
3774 3305
3775 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3776 return; 3307 return;
3777 3308
3778 switch (op) 3309 switch (op)
3779 { 3310 {
… …
3810 3341
3811 XFree (value); 3342 XFree (value);
3812 } 3343 }
3813 else 3344 else
3814 { 3345 {
3815 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3816 3347
3817 if (eq) 3348 if (eq)
3818 { 3349 {
3819 *eq = 0; 3350 *eq = 0;
3820 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
… …
3841 *buf++ = '\0'; 3372 *buf++ = '\0';
3842 3373
3843 process_color_seq (op, color, name, resp); 3374 process_color_seq (op, color, name, resp);
3844 } 3375 }
3845 break; 3376 break;
3377 case Rxvt_restoreFG:
3846 case XTerm_Color00: 3378 case XTerm_Color00:
3847 process_color_seq (op, Color_fg, str, resp); 3379 process_color_seq (op, Color_fg, str, resp);
3848 break; 3380 break;
3381 case Rxvt_restoreBG:
3849 case XTerm_Color01: 3382 case XTerm_Color01:
3850 process_color_seq (op, Color_bg, str, resp); 3383 process_color_seq (op, Color_bg, str, resp);
3851 break; 3384 break;
3852#ifndef NO_CURSORCOLOR 3385#ifndef NO_CURSORCOLOR
3853 case XTerm_Color_cursor: 3386 case XTerm_Color_cursor:
… …
3874 break; 3407 break;
3875 case URxvt_Color_IT: 3408 case URxvt_Color_IT:
3876 process_color_seq (op, Color_IT, str, resp); 3409 process_color_seq (op, Color_IT, str, resp);
3877 break; 3410 break;
3878#endif 3411#endif
3879#if TRANSPARENT && TINTING 3412 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp);
3414 break;
3415#if ENABLE_TRANSPARENCY
3880 case URxvt_Color_tint: 3416 case URxvt_Color_tint:
3881 process_color_seq (op, Color_tint, str, resp); 3417 process_color_seq (op, Color_tint, str, resp);
3418 {
3419 bool changed = false;
3882 3420
3883 check_our_parents (); 3421 if (ISSET_PIXCOLOR (Color_tint))
3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3423 else
3424 changed = bgPixmap.unset_tint ();
3884 3425
3885 if (am_transparent) 3426 if (changed)
3886 want_full_refresh = want_refresh = 1; 3427 update_background ();
3428 }
3887 3429
3888 break; 3430 break;
3889#endif 3431#endif
3890 3432
3433#if BG_IMAGE_FROM_FILE
3891 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3892 { 3435 if (!strcmp (str, "?"))
3893 if (*str != ';')
3894 { 3436 {
3895#if XPM_BACKGROUND 3437 char str[256];
3896 scale_pixmap (""); /* reset to default scaling */ 3438
3897 set_bgPixmap (str); /* change pixmap */ 3439 sprintf (str, "[%dx%d+%d+%d]",
3898 scr_touch (true); 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3899#endif 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3900 } 3443 }
3901 3444 else
3445 {
3902 int changed = 0; 3446 int changed = 0;
3903 3447
3904 while ((str = strchr (str, ';')) != NULL) 3448 if (*str != ';')
3905 { 3449 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */
3453 changed++;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 }
3458
3459 while (str)
3460 {
3906 str++; 3461 str++;
3907#if XPM_BACKGROUND 3462 if (bgPixmap.set_geometry (str))
3908 changed += scale_pixmap (str); 3463 changed++;
3909#endif 3464 str = strchr (str, ';');
3910 } 3465 }
3911 3466
3912 if (changed) 3467 if (changed)
3913 { 3468 update_background ();
3914#ifdef XPM_BACKGROUND
3915 resize_pixmap ();
3916 scr_touch (true);
3917#endif
3918 } 3469 }
3919 }
3920 break; 3470 break;
3921 3471#endif
3922 case Rxvt_restoreFG:
3923 set_window_color (Color_fg, str);
3924 break;
3925 case Rxvt_restoreBG:
3926 set_window_color (Color_bg, str);
3927 break;
3928 3472
3929 case XTerm_logfile: 3473 case XTerm_logfile:
3930 // TODO, when secure mode? 3474 // TODO, when secure mode?
3931 break; 3475 break;
3932 3476
… …
3950 case URxvt_italicFont: 3494 case URxvt_italicFont:
3951 case URxvt_boldItalicFont: 3495 case URxvt_boldItalicFont:
3952#endif 3496#endif
3953 if (query) 3497 if (query)
3954 tt_printf ("\33]%d;%-.250s%c", saveop, 3498 tt_printf ("\33]%d;%-.250s%c", saveop,
3955 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3499 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3956 ? fontset[op - URxvt_font]->fontdesc : "", 3500 ? fontset[op - URxvt_font]->fontdesc : "",
3957 resp); 3501 resp);
3958 else 3502 else
3959 { 3503 {
3960 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3504 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3974 break; 3518 break;
3975 3519
3976#if !ENABLE_MINIMAL 3520#if !ENABLE_MINIMAL
3977 case URxvt_locale: 3521 case URxvt_locale:
3978 if (query) 3522 if (query)
3979 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3523 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3980 else 3524 else
3981 { 3525 {
3982 set_locale (str); 3526 set_locale (str);
3983 pty->set_utf8_mode (enc_utf8); 3527 pty->set_utf8_mode (enc_utf8);
3984 init_xlocale (); 3528 init_xlocale ();
… …
3999 break; 3543 break;
4000#endif 3544#endif
4001 3545
4002#if ENABLE_PERL 3546#if ENABLE_PERL
4003 case URxvt_perl: 3547 case URxvt_perl:
4004 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3548 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4005 ; // no responses yet
4006 break; 3549 break;
4007#endif 3550#endif
4008 } 3551 }
4009} 3552}
4010/*----------------------------------------------------------------------*/ 3553/*----------------------------------------------------------------------*/
… …
4033 { 3576 {
4034 if (mode == 'r') 3577 if (mode == 'r')
4035 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4036 else 3579 else
4037 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3580 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4038 PrivMode (state, bit); 3581 set_privmode (bit, state);
4039 } 3582 }
4040 3583
4041 return state; 3584 return state;
4042} 3585}
4043 3586
… …
4047{ 3590{
4048 unsigned int i, j; 3591 unsigned int i, j;
4049 int state; 3592 int state;
4050 3593
4051 static const struct 3594 static const struct
4052 { 3595 {
4053 const int argval; 3596 const int argval;
4054 const unsigned long bit; 3597 const unsigned long bit;
4055 }
4056
4057 argtopriv[] = { 3598 } argtopriv[] = {
4058 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR }, // DECCKM
4059 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
4060 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 }, // DECCOLM
4061 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll }, // DECSCLM
4062 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo }, // DECSCNM
4063 { 6, PrivMode_relOrigin }, 3604 { 6, PrivMode_relOrigin }, // DECOM
4064 { 7, PrivMode_Autowrap }, 3605 { 7, PrivMode_Autowrap }, // DECAWM
4065 // 8, bi-directional support mode 3606 // 8, auto-repeat keys // DECARM
4066 { 9, PrivMode_MouseX10 }, 3607 { 9, PrivMode_MouseX10 },
4067 // 18, 19 printing-related 3608 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region
4068 { 25, PrivMode_VisibleCursor }, 3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4069#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
4070 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
4071#endif 3613#endif
4072 { 35, PrivMode_ShiftKeys }, // rxvt extension 3614 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK
4073 { 40, PrivMode_132OK }, 3616 { 40, PrivMode_132OK },
4074 // 41 xterm more fixes NYI 3617 // 41 xterm more fixes NYI
4075 // 45 margin bell NYI 3618 // 45 margin bell NYI
4076 // 46 start logging 3619 // 46 start logging
4077 { 47, PrivMode_Screen }, 3620 { 47, PrivMode_Screen },
4078 { 66, PrivMode_aplKP }, 3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4079#ifndef NO_BACKSPACE_KEY 3622#ifndef NO_BACKSPACE_KEY
4080 { 67, PrivMode_BackSpace }, 3623 { 67, PrivMode_BackSpace }, // DECBKM
4081#endif 3624#endif
4082 { 1000, PrivMode_MouseX11 }, 3625 { 1000, PrivMode_MouseX11 },
4083 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3626 { 1002, PrivMode_MouseBtnEvent },
4084 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3627 { 1003, PrivMode_MouseAnyEvent },
4085 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4086 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4087 { 1011, PrivMode_Keypress }, // rxvt extension 3629 { 1011, PrivMode_Keypress }, // rxvt extension
4088 // 1035 enable modifiers for alt, numlock NYI 3630 // 1035 enable modifiers for alt, numlock NYI
4089 // 1036 send ESC for meta keys NYI 3631 // 1036 send ESC for meta keys NYI
4090 // 1037 send DEL for keypad delete NYI 3632 // 1037 send DEL for keypad delete NYI
4091 { 1047, PrivMode_Screen }, 3633 { 1047, PrivMode_Screen },
4092 // 1048 save and restore cursor 3634 // 1048 save and restore cursor
4093 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4094 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste },
4095 }; 3638 };
4096 3639
4097 if (nargs == 0) 3640 if (nargs == 0)
4098 return; 3641 return;
4099 3642
… …
4124 3667
4125 scr_touch (true); 3668 scr_touch (true);
4126 break; 3669 break;
4127#endif 3670#endif
4128 case 1048: /* alternative cursor save */ 3671 case 1048: /* alternative cursor save */
4129 case 1049:
4130 if (OPTION (Opt_secondaryScreen)) 3672 if (option (Opt_secondaryScreen))
4131 if (mode == 0) 3673 if (mode == 0)
4132 scr_cursor (RESTORE); 3674 scr_cursor (RESTORE);
4133 else if (mode == 1) 3675 else if (mode == 1)
4134 scr_cursor (SAVE); 3676 scr_cursor (SAVE);
4135 break; 3677 break;
… …
4143 case 2: /* VT52 mode */ 3685 case 2: /* VT52 mode */
4144 /* oddball mode. should be set regardless of set/reset 3686 /* oddball mode. should be set regardless of set/reset
4145 * parameter. Return from VT52 mode with an ESC < from 3687 * parameter. Return from VT52 mode with an ESC < from
4146 * within VT52 mode 3688 * within VT52 mode
4147 */ 3689 */
4148 PrivMode (1, PrivMode_vt52); 3690 set_privmode (PrivMode_vt52, 1);
4149 break; 3691 break;
4150 case 3: /* 80/132 */ 3692 case 3: /* 80/132 */
4151 if (priv_modes & PrivMode_132OK) 3693 if (priv_modes & PrivMode_132OK)
4152 set_widthheight (((state ? 132 : 80) * fwidth), height); 3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4153 break; 3695 break;
4154 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
4155 set_option (Opt_jumpScroll, !state); 3697 set_option (Opt_jumpScroll, !state);
4156 break; 3698 break;
4157 case 5: /* reverse video */ 3699 case 5: /* reverse video */
… …
4164 scr_autowrap (state); 3706 scr_autowrap (state);
4165 break; 3707 break;
4166 /* case 8: - auto repeat, can't do on a per window basis */ 3708 /* case 8: - auto repeat, can't do on a per window basis */
4167 case 9: /* X10 mouse reporting */ 3709 case 9: /* X10 mouse reporting */
4168 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX11; 3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3712 break;
4171#ifdef scrollBar_esc 3713#ifdef scrollBar_esc
4172 case scrollBar_esc: 3714 case scrollBar_esc:
4173 if (scrollbar_mapping (state)) 3715 if (scrollBar.map (state))
4174 { 3716 {
4175 resize_all_windows (0, 0, 0); 3717 resize_all_windows (0, 0, 0);
4176 scr_touch (true); 3718 scr_touch (true);
4177 } 3719 }
4178 break; 3720 break;
… …
4187 break; 3729 break;
4188 /* case 66: - application key pad */ 3730 /* case 66: - application key pad */
4189 /* case 67: - backspace key */ 3731 /* case 67: - backspace key */
4190 case 1000: /* X11 mouse reporting */ 3732 case 1000: /* X11 mouse reporting */
4191 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4192 priv_modes &= ~PrivMode_MouseX10; 3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4193 break; 3735 break;
4194#if 0
4195 case 1001: 3736 case 1002:
4196 break; /* X11 mouse highlighting */ 3737 case 1003:
4197#endif 3738 if (state)
3739 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3742 vt_emask_mouse = PointerMotionMask;
3743 }
3744 else
3745 vt_emask_mouse = NoEventMask;
3746
3747 vt_select_input ();
3748 break;
4198 case 1010: /* scroll to bottom on TTY output inhibit */ 3749 case 1010: /* scroll to bottom on TTY output inhibit */
4199 set_option (Opt_scrollTtyOutput, !state); 3750 set_option (Opt_scrollTtyOutput, !state);
4200 break; 3751 break;
4201 case 1011: /* scroll to bottom on key press */ 3752 case 1011: /* scroll to bottom on key press */
4202 set_option (Opt_scrollTtyKeypress, state); 3753 set_option (Opt_scrollTtyKeypress, state);
4203 break; 3754 break;
4204 case 1047: /* secondary screen w/ clearing last */ 3755 case 1047: /* secondary screen w/ clearing last */
4205 if (OPTION (Opt_secondaryScreen)) 3756 if (option (Opt_secondaryScreen))
4206 if (current_screen != PRIMARY) 3757 if (!state)
4207 scr_erase_screen (2); 3758 scr_erase_screen (2);
3759
4208 scr_change_screen (state); 3760 scr_change_screen (state);
4209 break; 3761 break;
4210 case 1049: /* secondary screen w/ clearing first */ 3762 case 1049: /* secondary screen w/ clearing first */
3763 if (option (Opt_secondaryScreen))
3764 if (state)
3765 scr_cursor (SAVE);
3766
4211 scr_change_screen (state); 3767 scr_change_screen (state);
3768
4212 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3770 if (state)
4214 scr_erase_screen (2); 3771 scr_erase_screen (2);
3772 else
3773 scr_cursor (RESTORE);
4215 break; 3774 break;
4216 default: 3775 default:
4217 break; 3776 break;
4218 } 3777 }
4219 } 3778 }
… …
4379rxvt_term::process_graphics () 3938rxvt_term::process_graphics ()
4380{ 3939{
4381 unicode_t ch, cmd = cmd_getc (); 3940 unicode_t ch, cmd = cmd_getc ();
4382 3941
4383 if (cmd == 'Q') 3942 if (cmd == 'Q')
3943 {
4384 { /* query graphics */ 3944 /* query graphics */
4385 tt_printf ("\033G0\012"); /* no graphics */ 3945 tt_printf ("\033G0\012"); /* no graphics */
4386 return; 3946 return;
4387 } 3947 }
4388 /* swallow other graphics sequences until terminating ':' */ 3948 /* swallow other graphics sequences until terminating ':' */
4389 do 3949 do
… …
4439 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4440 4000
4441 memcpy (v_buffer + v_buflen, data, len); 4001 memcpy (v_buffer + v_buflen, data, len);
4442 v_buflen += len; 4002 v_buflen += len;
4443 4003
4444 pty_ev.set (EVENT_READ | EVENT_WRITE); 4004 pty_ev.set (ev::READ | ev::WRITE);
4445} 4005}
4446 4006
4447void rxvt_term::pty_write () 4007void rxvt_term::pty_write ()
4448{ 4008{
4449 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4009 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4454 4014
4455 if (v_buflen == 0) 4015 if (v_buflen == 0)
4456 { 4016 {
4457 free (v_buffer); 4017 free (v_buffer);
4458 v_buffer = 0; 4018 v_buffer = 0;
4459 v_buflen = 0;
4460 4019
4461 pty_ev.set (EVENT_READ); 4020 pty_ev.set (ev::READ);
4462 return; 4021 return;
4463 } 4022 }
4464 4023
4465 memmove (v_buffer, v_buffer + written, v_buflen); 4024 memmove (v_buffer, v_buffer + written, v_buflen);
4466 } 4025 }
4467 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4026 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4468 pty_ev.set (EVENT_READ); 4027 pty_ev.set (ev::READ);
4469} 4028}
4470 4029
4471/*----------------------- end-of-file (C source) -----------------------*/ 4030/*----------------------- end-of-file (C source) -----------------------*/
4472 4031

Diff Legend

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