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.314 by root, Thu Jul 6 23:48:11 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 || ENABLE_PERL 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
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1807 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1808 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return; 1809 return;
1802 1810
1803# if TRANSPARENT 1811# if ENABLE_TRANSPARENCY
1804 switch (ev.type) 1812 switch (ev.type)
1805 { 1813 {
1806 case PropertyNotify: 1814 case PropertyNotify:
1807 /* 1815 /*
1808 * 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,
1809 * 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.
1810 */ 1818 */
1811 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1812 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1813 return; 1821 {
1822 bgPixmap.set_root_pixmap ();
1823 update_background ();
1824 }
1814 1825
1815 /* FALLTHROUGH */
1816 case ReparentNotify:
1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1818 want_refresh = want_full_refresh = 1;
1819 break; 1826 break;
1820 } 1827 }
1821# endif 1828# endif
1829
1830 refresh_check ();
1822} 1831}
1823#endif 1832#endif
1824 1833
1825void 1834void
1826rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
… …
1881 mouse_report (ev); 1890 mouse_report (ev);
1882 } 1891 }
1883#else 1892#else
1884 MEvent.button = ev.button; 1893 MEvent.button = ev.button;
1885 mouse_report (ev); 1894 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1895#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1896
1888 } 1897 }
1889 else 1898 else
1890 { 1899 {
1891 if (ev.button != MEvent.button) 1900 if (ev.button != MEvent.button)
… …
1939 } 1948 }
1940 1949
1941 /* 1950 /*
1942 * Scrollbar window processing of button press 1951 * Scrollbar window processing of button press
1943 */ 1952 */
1944 if (isScrollbarWindow (ev.window)) 1953 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 1954 {
1946 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;
1947 /* 1963 /*
1948 * Rxvt-style scrollbar: 1964 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 1965 * move up if mouse is above slider
1950 * move dn if mouse is below slider 1966 * move dn if mouse is below slider
1951 * 1967 *
… …
1960 /* 1976 /*
1961 * Mouse report disabled scrollbar: 1977 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 1978 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 1979 * click on scrollbar - send pageup/down
1964 */ 1980 */
1965 if ((scrollBar.style == R_SB_NEXT 1981 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 1982 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 1983 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 1984 tt_printf ("\033[B");
1975 else 1985 else
1976 switch (ev.button) 1986 switch (ev.button)
1977 { 1987 {
1978 case Button2: 1988 case Button2:
… …
1985 tt_printf ("\033[5~"); 1995 tt_printf ("\033[5~");
1986 break; 1996 break;
1987 } 1997 }
1988 } 1998 }
1989 else 1999 else
1990#endif /* NO_SCROLLBAR_REPORT */ 2000#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 2001 {
1997 if (scrollbarnext_upButton (ev.y)) 2002 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 2003 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2004#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2005 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2007#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2008 if (scr_page (direction, 1))
2015 { 2009 {
2016 if (upordown < 0) 2010 if (direction == UP)
2017 scrollBar.setUp (); 2011 scrollBar.state = STATE_UP;
2018 else 2012 else
2019 scrollBar.setDn (); 2013 scrollBar.state = STATE_DOWN;
2020 } 2014 }
2021 } 2015 }
2022 else 2016 else
2023 switch (ev.button) 2017 switch (ev.button)
2024 { 2018 {
2025 case Button2: 2019 case Button2:
2026 switch (scrollbar_align) 2020 switch (scrollBar.align)
2027 { 2021 {
2028 case R_SB_ALIGN_TOP: 2022 case R_SB_ALIGN_TOP:
2029 csrO = 0; 2023 csrO = 0;
2030 break; 2024 break;
2031 case R_SB_ALIGN_CENTRE: 2025 case R_SB_ALIGN_CENTRE:
… …
2037 } 2031 }
2038 2032
2039 if (scrollBar.style == R_SB_XTERM 2033 if (scrollBar.style == R_SB_XTERM
2040 || scrollbar_above_slider (ev.y) 2034 || scrollbar_above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2035 || scrollbar_below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2043 2037
2044 scrollBar.setMotion (); 2038 scrollBar.state = STATE_MOTION;
2045 break; 2039 break;
2046 2040
2047 case Button1: 2041 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2042 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2043 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2044 /* FALLTHROUGH */
2051 2045
2052 case Button3: 2046 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2047 if (scrollBar.style != R_SB_XTERM)
… …
2063 scr_page (DN, nrow - 1); 2057 scr_page (DN, nrow - 1);
2064# else 2058# else
2065 scr_page (DN, nrow / 4); 2059 scr_page (DN, nrow / 4);
2066# endif 2060# endif
2067 else 2061 else
2068 scrollBar.setMotion (); 2062 scrollBar.state = STATE_MOTION;
2069 } 2063 }
2070 else 2064 else
2071 { 2065 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2066 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2067 (nrow
2074 * scrollbar_position (ev.y) 2068 * scrollbar_position (ev.y)
2075 / scrollbar_size ())); 2069 / scrollBar.size ()));
2076 } 2070 }
2077 2071
2078 break; 2072 break;
2079 } 2073 }
2080 } 2074 }
… …
2090 2084
2091 csrO = 0; /* reset csr Offset */ 2085 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2086 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2087 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2088
2095 if (scrollbar_isUpDn ()) 2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2096 { 2090 {
2097 scrollBar.setIdle (); 2091 scrollBar.state = STATE_IDLE;
2098 scrollbar_show (0); 2092 scrollBar.show (0);
2099 } 2093 }
2100 2094
2101#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2096 sel_scroll_ev.stop();
2104#endif 2097#endif
2105 2098
2106 if (ev.window == vt) 2099 if (ev.window == vt)
2107 { 2100 {
2108 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)))
… …
2132 mouse_report (ev); 2125 mouse_report (ev);
2133 } 2126 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2127#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2128 MEvent.button = AnyButton;
2136 mouse_report (ev); 2129 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2130#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2131 return;
2139 } 2132 }
2140 2133
2141 /* 2134 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2135 * dumb hack to compensate for the failure of click-and-drag
… …
2154 selection_make (ev.time); 2147 selection_make (ev.time);
2155 break; 2148 break;
2156 2149
2157 case Button2: 2150 case Button2:
2158 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?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2153 break;
2161 2154
2162#ifdef MOUSE_WHEEL 2155#ifdef MOUSE_WHEEL
2163 case Button4: 2156 case Button4:
2164 case Button5: 2157 case Button5:
… …
2168 2161
2169 v = ev.button == Button4 ? UP : DN; 2162 v = ev.button == Button4 ? UP : DN;
2170 2163
2171 if (ev.state & ShiftMask) 2164 if (ev.state & ShiftMask)
2172 i = 1; 2165 i = 1;
2173 else if (OPTION (Opt_mouseWheelScrollPage)) 2166 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2167 i = nrow - 1;
2175 else 2168 else
2176 i = 5; 2169 i = 5;
2177 2170
2178# ifdef MOUSE_SLIP_WHEELING 2171# ifdef MOUSE_SLIP_WHEELING
… …
2180 { 2173 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2174 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2175 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2176 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2177
2185 if (slip_wheel_ev.at < NOW) 2178 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2180 }
2190 else 2181 else
2182# endif
2191 { 2183 {
2192# endif
2193 scr_page (v, i); 2184 scr_page (v, i);
2194 scrollbar_show (1); 2185 scrollBar.show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2186 }
2197# endif
2198 } 2187 }
2199 break; 2188 break;
2200#endif 2189#endif
2201 } 2190 }
2202 } 2191 }
2203} 2192}
2204 2193
2205#ifdef TRANSPARENT
2206#if TINTING
2207/* taken from aterm-0.4.2 */
2208
2209typedef uint32_t RUINT32T;
2210
2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2212{
2213 int sh_r, sh_g, sh_b;
2214 RUINT32T mask_r, mask_g, mask_b;
2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2218 int i;
2219
2220 Visual *visual = term->visual;
2221
2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2223
2224 /* for convenience */
2225 mask_r = visual->red_mask;
2226 mask_g = visual->green_mask;
2227 mask_b = visual->blue_mask;
2228
2229 /* boring lookup table pre-initialization */
2230 switch (srcImage->bits_per_pixel) {
2231 case 15:
2232 if ((mask_r != 0x7c00) ||
2233 (mask_g != 0x03e0) ||
2234 (mask_b != 0x001f))
2235 return;
2236 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2237 lookup_r = lookup;
2238 lookup_g = lookup+32;
2239 lookup_b = lookup+32+32;
2240 sh_r = 10;
2241 sh_g = 5;
2242 sh_b = 0;
2243 break;
2244 case 16:
2245 if ((mask_r != 0xf800) ||
2246 (mask_g != 0x07e0) ||
2247 (mask_b != 0x001f))
2248 return;
2249 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2250 lookup_r = lookup;
2251 lookup_g = lookup+32;
2252 lookup_b = lookup+32+64;
2253 sh_r = 11;
2254 sh_g = 5;
2255 sh_b = 0;
2256 break;
2257 case 24:
2258 if ((mask_r != 0xff0000) ||
2259 (mask_g != 0x00ff00) ||
2260 (mask_b != 0x0000ff))
2261 return;
2262 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2263 lookup_r = lookup;
2264 lookup_g = lookup+256;
2265 lookup_b = lookup+256+256;
2266 sh_r = 16;
2267 sh_g = 8;
2268 sh_b = 0;
2269 break;
2270 case 32:
2271 if ((mask_r != 0xff0000) ||
2272 (mask_g != 0x00ff00) ||
2273 (mask_b != 0x0000ff))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2276 lookup_r = lookup;
2277 lookup_g = lookup+256;
2278 lookup_b = lookup+256+256;
2279 sh_r = 16;
2280 sh_g = 8;
2281 sh_b = 0;
2282 break;
2283 default:
2284 return; /* we do not support this color depth */
2285 }
2286
2287 /* prepare limits for color transformation (each channel is handled separately) */
2288 if (shade < 0) {
2289 shade = -shade;
2290 if (shade < 0) shade = 0;
2291 if (shade > 100) shade = 100;
2292
2293 lower_lim_r = 65535-rm;
2294 lower_lim_g = 65535-gm;
2295 lower_lim_b = 65535-bm;
2296
2297 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2298 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2299 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2300
2301 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2302 } else {
2303 if (shade < 0) shade = 0;
2304 if (shade > 100) shade = 100;
2305
2306 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2307
2308 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2309 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2310 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2311 }
2312
2313 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2314 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2315 {
2316 unsigned int tmp;
2317
2318 tmp = lower_lim_r;
2319 lower_lim_r = lower_lim_b;
2320 lower_lim_b = tmp;
2321
2322 tmp = upper_lim_r;
2323 upper_lim_r = upper_lim_b;
2324 upper_lim_b = tmp;
2325 }
2326
2327 /* fill our lookup tables */
2328 for (i = 0; i <= mask_r>>sh_r; i++)
2329 {
2330 RUINT32T tmp;
2331 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2332 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2333 lookup_r[i] = (tmp/65535)<<sh_r;
2334 }
2335 for (i = 0; i <= mask_g>>sh_g; i++)
2336 {
2337 RUINT32T tmp;
2338 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2339 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2340 lookup_g[i] = (tmp/65535)<<sh_g;
2341 }
2342 for (i = 0; i <= mask_b>>sh_b; i++)
2343 {
2344 RUINT32T tmp;
2345 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2346 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2347 lookup_b[i] = (tmp/65535)<<sh_b;
2348 }
2349
2350 /* apply table to input image (replacing colors by newly calculated ones) */
2351 switch (srcImage->bits_per_pixel)
2352 {
2353 case 15:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0x7c00)>>10] |
2365 lookup_g[(*p & 0x03e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 16:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0xf800)>>11] |
2384 lookup_g[(*p & 0x07e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 24:
2392 {
2393 unsigned char *p1, *pf, *p, *pl;
2394 p1 = (unsigned char *) srcImage->data;
2395 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width * 3;
2400 for (; p < pl; p += 3)
2401 {
2402 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2403 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2404 p[2] = lookup_r[(p[2] & 0x0000ff)];
2405 }
2406 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 32:
2411 {
2412 RUINT32T *p1, *pf, *p, *pl;
2413 p1 = (RUINT32T *) srcImage->data;
2414 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xff0000)>>16] |
2423 lookup_g[(*p & 0x00ff00)>> 8] |
2424 lookup_b[(*p & 0x0000ff)] |
2425 (*p & ~0xffffff);
2426 }
2427 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 }
2432
2433 free (lookup);
2434}
2435#endif
2436
2437/*
2438 * Check our parents are still who we think they are.
2439 * Do transparency updates if required
2440 */
2441int
2442rxvt_term::check_our_parents ()
2443{
2444 int i, pchanged, aformat, have_pixmap, rootdepth;
2445 unsigned long nitems, bytes_after;
2446 Atom atype;
2447 unsigned char *prop = NULL;
2448 Window root, oldp, *list;
2449 Pixmap rootpixmap = None;
2450 XWindowAttributes wattr, wrootattr;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (dpy, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !ISSET_PIXCOLOR (Color_tint)
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (dpy, False);
2542 allowedxerror = -1;
2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (dpy, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (dpy, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2572
2573 rgba c;
2574 pix_colors_focused [Color_tint].get (c);
2575
2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2583 nx, ny, image->width, image->height);
2584 XFreeGC (dpy, gc);
2585 XDestroyImage (image);
2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2587 XClearWindow (dpy, parent[0]);
2588
2589 if (!am_transparent || !am_pixmap_trans)
2590 pchanged = 1;
2591
2592 am_transparent = am_pixmap_trans = 1;
2593 }
2594 }
2595
2596 if (am_pixmap_trans)
2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2598 else
2599 {
2600 unsigned int n;
2601 /*
2602 * InheritPixmap transparency
2603 */
2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 {
2606 oldp = parent[i];
2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2608 XFree (list);
2609
2610 if (parent[i] == display->root)
2611 {
2612 if (oldp != None)
2613 pchanged = 1;
2614
2615 break;
2616 }
2617
2618 if (oldp != parent[i])
2619 pchanged = 1;
2620 }
2621
2622 n = 0;
2623
2624 if (pchanged)
2625 for (; n < (unsigned int)i; n++)
2626 {
2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2630 {
2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2632 break;
2633 }
2634 }
2635
2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2637 {
2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2640 am_transparent = 0;
2641 /* XXX: also turn off Opt_transparent? */
2642 }
2643 else
2644 {
2645 for (n = 0; n < (unsigned int)i; n++)
2646 {
2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2648 XClearWindow (dpy, parent[n]);
2649 }
2650
2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2652 am_transparent = 1;
2653 }
2654
2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2656 parent[i] = None;
2657 }
2658
2659 if (scrollBar.win)
2660 {
2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2662 scrollBar.setIdle ();
2663 scrollbar_show (0);
2664 }
2665
2666 if (am_transparent)
2667 {
2668 want_refresh = want_full_refresh = 1;
2669 if (am_pixmap_trans)
2670 flush ();
2671 }
2672
2673 return pchanged;
2674}
2675#endif
2676
2677/*}}} */ 2194/*}}} */
2678 2195
2679bool 2196void
2680rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2681{ 2198{
2682 bool flag = false;
2683 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2684 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2685 2201
2686 for (;;) 2202 for (;;)
2687 { 2203 {
2688 if (ch == NOCHAR) 2204 if (expect_false (ch == NOCHAR))
2689 { 2205 {
2690 seq_begin = cmdbuf_ptr; 2206 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2207 ch = next_char ();
2692 2208
2693 if (ch == NOCHAR) 2209 if (ch == NOCHAR)
2694 break; 2210 break;
2695 } 2211 }
2696 2212
2697 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))
2698 { 2214 {
2699 if (!seen_input) 2215 if (expect_false (!seen_input))
2700 { 2216 {
2701 seen_input = 1; 2217 seen_input = 1;
2702 // many badly-written programs (e.g. jed) contain a race condition: 2218 // many badly-written programs (e.g. jed) contain a race condition:
2703 // they first read the screensize and then install a SIGWINCH handler. 2219 // they first read the screensize and then install a SIGWINCH handler.
2704 // some window managers resize the window early, and these programs 2220 // some window managers resize the window early, and these programs
… …
2717 wchar_t *str = buf; 2233 wchar_t *str = buf;
2718 wchar_t *eol = str + min (ncol, UBUFSIZ); 2234 wchar_t *eol = str + min (ncol, UBUFSIZ);
2719 2235
2720 for (;;) 2236 for (;;)
2721 { 2237 {
2722 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)))
2723 break; 2239 break;
2724 2240
2725 *str++ = ch; 2241 *str++ = ch;
2726 2242
2727 if (ch == C0_LF || str >= eol) 2243 if (expect_false (ch == C0_LF || str >= eol))
2728 { 2244 {
2729 if (ch == C0_LF) 2245 if (ch == C0_LF)
2730 nlines++; 2246 nlines++;
2731 2247
2732 refresh_count++; 2248 refresh_count++;
2733 2249
2734 if (!OPTION (Opt_jumpScroll) 2250 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2736 { 2251 {
2737 refreshnow = true;
2738 refresh_count = 0; 2252 refresh_count = 0;
2253
2254 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2255 {
2256 refreshnow = true;
2739 ch = NOCHAR; 2257 ch = NOCHAR;
2740 break; 2258 break;
2259 }
2741 } 2260 }
2742 2261
2743 // scr_add_lines only works for nlines <= nrow - 1. 2262 // scr_add_lines only works for nlines <= nrow - 1.
2744 if (nlines >= nrow - 1) 2263 if (nlines >= nrow - 1)
2745 { 2264 {
… …
2773 && 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))))
2774 scr_add_lines (buf, str - buf, nlines); 2293 scr_add_lines (buf, str - buf, nlines);
2775 2294
2776 /* 2295 /*
2777 * 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
2778 * 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.
2779 * the number of pages between refreshes is refresh_limit, which 2298 * if skipScroll is enabled.
2780 * is incremented here because we must be doing flat-out scrolling.
2781 */ 2299 */
2782 if (refreshnow) 2300 if (refreshnow)
2783 { 2301 {
2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2785 refresh_limit++;
2786 else
2787 {
2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2790 scr_refresh (); 2302 scr_refresh ();
2791 want_refresh = 1; 2303 want_refresh = 1;
2792 }
2793 } 2304 }
2794
2795 } 2305 }
2796 else 2306 else
2797 { 2307 {
2798 try 2308 try
2799 { 2309 {
… …
2807 } 2317 }
2808 2318
2809 ch = NOCHAR; 2319 ch = NOCHAR;
2810 } 2320 }
2811 } 2321 }
2812
2813 return flag;
2814} 2322}
2815 2323
2816// read the next character 2324// read the next character
2817wchar_t 2325wchar_t
2818rxvt_term::next_char () NOTHROW 2326rxvt_term::next_char () NOTHROW
2819{ 2327{
2820 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2821 { 2329 {
2822 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2824 return *cmdbuf_ptr++; 2332 return *cmdbuf_ptr++;
2825 2333
2826 wchar_t wc; 2334 wchar_t wc;
2827 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);
2828 2336
… …
2832 cmdbuf_ptr = cmdbuf_endp; 2340 cmdbuf_ptr = cmdbuf_endp;
2833 break; 2341 break;
2834 } 2342 }
2835 2343
2836 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2345 {
2346 mbstate.reset (); // reset now undefined conversion state
2837 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 }
2838 2349
2839 // assume wchar == unicode 2350 // assume wchar == unicode
2840 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
2841 return wc & UNICODE_MASK; 2352 return wc & UNICODE_MASK;
2842 } 2353 }
… …
2886/*----------------------------------------------------------------------*/ 2397/*----------------------------------------------------------------------*/
2887#ifdef PRINTPIPE 2398#ifdef PRINTPIPE
2888FILE * 2399FILE *
2889rxvt_term::popen_printer () 2400rxvt_term::popen_printer ()
2890{ 2401{
2891 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2892 2403
2893 if (stream == NULL) 2404 if (stream == NULL)
2894 rxvt_warn ("can't open printer pipe, not printing.\n"); 2405 rxvt_warn ("can't open printer pipe, not printing.\n");
2895 2406
2896 return stream; 2407 return stream;
… …
2907 * simulate attached vt100 printer 2418 * simulate attached vt100 printer
2908 */ 2419 */
2909void 2420void
2910rxvt_term::process_print_pipe () 2421rxvt_term::process_print_pipe ()
2911{ 2422{
2912 int done; 2423 FILE *fd = popen_printer ();
2913 FILE *fd;
2914 2424
2915 if ((fd = popen_printer ()) == NULL) 2425 if (!fd)
2916 return; 2426 return;
2917 2427
2918 /* 2428 /*
2919 * 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
2920 * is received. 2430 * is received.
2921 */ 2431 */
2922 for (done = 0; !done;) 2432 for (int done = 0; !done; )
2923 { 2433 {
2924 unsigned char buf[8]; 2434 unsigned char buf[8];
2925 unicode_t ch; 2435 unicode_t ch;
2926 unsigned int i, len; 2436 unsigned int i, len;
2927 2437
… …
2946 { 2456 {
2947 if ((buf[len++] = cmd_getc ()) == 'i') 2457 if ((buf[len++] = cmd_getc ()) == 'i')
2948 break; /* done = 1 */ 2458 break; /* done = 1 */
2949 } 2459 }
2950 } 2460 }
2951 2461
2952 for (i = 0; i < len; i++) 2462 for (i = 0; i < len; i++)
2953 if (putc (buf[i], fd) == EOF) 2463 if (putc (buf[i], fd) == EOF)
2954 { 2464 {
2955 done = 1; 2465 done = 1;
2956 break; 2466 break;
… …
2958 } 2468 }
2959 } 2469 }
2960 2470
2961 pclose_printer (fd); 2471 pclose_printer (fd);
2962} 2472}
2963#endif /* PRINTPIPE */ 2473#endif /* PRINTPIPE */
2964/*}}} */ 2474/*}}} */
2965 2475
2966/* *INDENT-OFF* */ 2476/* *INDENT-OFF* */
2967enum { 2477enum {
2968 C1_40 = 0x40, 2478 C1_40 = 0x40,
… …
3018 process_dcs_seq (); 2528 process_dcs_seq ();
3019 break; 2529 break;
3020 case 0x9b: /* CSI */ 2530 case 0x9b: /* CSI */
3021 process_csi_seq (); 2531 process_csi_seq ();
3022 break; 2532 break;
3023 case 0x9d: /* CSI */ 2533 case 0x9d: /* OSC */
3024 process_osc_seq (); 2534 process_osc_seq ();
3025 break; 2535 break;
3026#endif 2536#endif
3027 } 2537 }
3028} 2538}
… …
3072 break; 2582 break;
3073 case 'Z': /* identify the terminal type */ 2583 case 'Z': /* identify the terminal type */
3074 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3075 break; 2585 break;
3076 case '<': /* turn off VT52 mode */ 2586 case '<': /* turn off VT52 mode */
3077 PrivMode (0, PrivMode_vt52); 2587 set_privmode (PrivMode_vt52, 0);
3078 break; 2588 break;
3079 case 'F': /* use special graphics character set */ 2589 case 'F': /* use special graphics character set */
3080 case 'G': /* use regular character set */ 2590 case 'G': /* use regular character set */
3081 /* unimplemented */ 2591 /* unimplemented */
3082 break; 2592 break;
… …
3136 scr_forwardindex (); 2646 scr_forwardindex ();
3137 break; 2647 break;
3138#endif 2648#endif
3139 case '=': 2649 case '=':
3140 case '>': 2650 case '>':
3141 PrivMode ((ch == '='), PrivMode_aplKP); 2651 set_privmode (PrivMode_aplKP, ch == '=');
3142 break; 2652 break;
3143 2653
3144 case C1_40: 2654 case C1_40:
3145 cmd_getc (); 2655 cmd_getc ();
3146 break; 2656 break;
… …
3185 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3186 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
3187 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3188 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
3189 2699
3190 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3191 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
3192 process_csi_seq (); 2702 process_csi_seq ();
3193 break; 2703 break;
3194 2704
3195 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3196 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
3197 process_osc_seq (); 2707 process_osc_seq ();
3198 break; 2708 break;
3199 2709
3200 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3201 case 'c': 2711 case 'c':
3202 mbstate.reset (); 2712 mbstate.reset ();
3203 scr_poweron (); 2713 scr_poweron ();
3204 scrollbar_show (1); 2714 scrollBar.show (1);
3205 break; 2715 break;
3206 2716
3207 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3208 case 'n': 2718 case 'n':
3209 scr_charset_choose (2); 2719 scr_charset_choose (2);
… …
3254rxvt_term::process_csi_seq () 2764rxvt_term::process_csi_seq ()
3255{ 2765{
3256 unicode_t ch, priv, i; 2766 unicode_t ch, priv, i;
3257 unsigned int nargs, p; 2767 unsigned int nargs, p;
3258 int n, ndef; 2768 int n, ndef;
3259 int arg[ESC_ARGS]; 2769 int arg[ESC_ARGS] = { };
3260 2770
3261 for (nargs = ESC_ARGS; nargs > 0;) 2771 nargs = 0;
3262 arg[--nargs] = 0;
3263 2772
3264 priv = 0; 2773 priv = 0;
3265 ch = cmd_getc (); 2774 ch = cmd_getc ();
3266 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2776 {
3267 { /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
3268 priv = ch; 2778 priv = ch;
3269 ch = cmd_getc (); 2779 ch = cmd_getc ();
3270 } 2780 }
3271 2781
3272 /* read any numerical arguments */ 2782 /* read any numerical arguments */
… …
3311 switch (priv) 2821 switch (priv)
3312 { 2822 {
3313 case '>': 2823 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2824 if (ch == CSI_DA) /* secondary device attributes */
3315 { 2825 {
3316 // 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,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2827 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 // 2828 //
3319 // 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
3320 // 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
3321 // that we do not support xterm mouse reporting (should be 95 when we do). 2831 // versions.
3322 // 2832 //
3323 tt_printf ("\033[>%d;94;0c", 'U'); 2833 tt_printf ("\033[>%d;95;0c", 'U');
3324 } 2834 }
3325 break; 2835 break;
2836
3326 case '?': 2837 case '?':
3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3328 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
3329 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);
3330 } 2853 }
2854 break;
2855 }
2856
3331 return; 2857 return;
3332 } 2858 }
3333 2859
3334 switch (ch) 2860 switch (ch)
3335 { 2861 {
… …
3455 break; 2981 break;
3456 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3457 scr_report_position (); 2983 scr_report_position ();
3458 break; 2984 break;
3459 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3460 if (OPTION (Opt_insecure)) 2986 if (option (Opt_insecure))
3461 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3462 break; 2988 break;
3463 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3464 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3465 break; 2991 break;
… …
3629 break; 3155 break;
3630 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3631 { 3157 {
3632 char *s; 3158 char *s;
3633 XGetIconName (dpy, parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3634 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 */
3635 XFree (s); 3161 XFree (s);
3636 } 3162 }
3637 break; 3163 break;
3638 case 21: /* report window title */ 3164 case 21: /* report window title */
3639 { 3165 {
3640 char *s; 3166 char *s;
3641 XFetchName (dpy, parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3642 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 */
3643 XFree (s); 3169 XFree (s);
3644 } 3170 }
3645 break; 3171 break;
3646 } 3172 }
3647} 3173}
… …
3674 seen_esc = true; 3200 seen_esc = true;
3675 continue; 3201 continue;
3676 } 3202 }
3677 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3678 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3679 else if (ch < 0x20) 3207 else if (ch < 0x20)
3680 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3681 3209
3682 seen_esc = false; 3210 seen_esc = false;
3683 3211
3684 if (n >= STRING_MAX - 1) 3212 if (n >= STRING_MAX - 1)
3685 // stop at some sane length 3213 // stop at some sane length
3686 return NULL; 3214 return NULL;
3687 3215
3688 if (ch == C0_SYN)
3689 string[n++] = cmd_get8 ();
3690 else
3691 string[n++] = ch; 3216 string[n++] = ch;
3692 } 3217 }
3693 3218
3694 string[n++] = '\0'; 3219 string[n++] = '\0';
3695 3220
3696 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3765 3290
3766/* 3291/*
3767 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3768 */ 3293 */
3769void 3294void
3770rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3771{ 3296{
3772 int color; 3297 int color;
3773 char *buf, *name; 3298 char *buf, *name;
3774 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3775 int saveop = op; 3300 int saveop = op;
3776 3301
3777 dLocal (Display *, dpy); 3302 dLocal (Display *, dpy);
3778 3303
3779 assert (str != NULL); 3304 assert (str != NULL);
3780 3305
3781 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)))
3782 return; 3307 return;
3783 3308
3784 switch (op) 3309 switch (op)
3785 { 3310 {
… …
3816 3341
3817 XFree (value); 3342 XFree (value);
3818 } 3343 }
3819 else 3344 else
3820 { 3345 {
3821 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3822 3347
3823 if (eq) 3348 if (eq)
3824 { 3349 {
3825 *eq = 0; 3350 *eq = 0;
3826 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
… …
3847 *buf++ = '\0'; 3372 *buf++ = '\0';
3848 3373
3849 process_color_seq (op, color, name, resp); 3374 process_color_seq (op, color, name, resp);
3850 } 3375 }
3851 break; 3376 break;
3377 case Rxvt_restoreFG:
3852 case XTerm_Color00: 3378 case XTerm_Color00:
3853 process_color_seq (op, Color_fg, str, resp); 3379 process_color_seq (op, Color_fg, str, resp);
3854 break; 3380 break;
3381 case Rxvt_restoreBG:
3855 case XTerm_Color01: 3382 case XTerm_Color01:
3856 process_color_seq (op, Color_bg, str, resp); 3383 process_color_seq (op, Color_bg, str, resp);
3857 break; 3384 break;
3858#ifndef NO_CURSORCOLOR 3385#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3386 case XTerm_Color_cursor:
… …
3880 break; 3407 break;
3881 case URxvt_Color_IT: 3408 case URxvt_Color_IT:
3882 process_color_seq (op, Color_IT, str, resp); 3409 process_color_seq (op, Color_IT, str, resp);
3883 break; 3410 break;
3884#endif 3411#endif
3885#if TRANSPARENT && TINTING 3412 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp);
3414 break;
3415#if ENABLE_TRANSPARENCY
3886 case URxvt_Color_tint: 3416 case URxvt_Color_tint:
3887 process_color_seq (op, Color_tint, str, resp); 3417 process_color_seq (op, Color_tint, str, resp);
3418 {
3419 bool changed = false;
3888 3420
3889 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 ();
3890 3425
3891 if (am_transparent) 3426 if (changed)
3892 want_full_refresh = want_refresh = 1; 3427 update_background ();
3428 }
3893 3429
3894 break; 3430 break;
3895#endif 3431#endif
3896 3432
3433#if BG_IMAGE_FROM_FILE
3897 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3898 { 3435 if (!strcmp (str, "?"))
3899 if (*str != ';')
3900 { 3436 {
3901#if XPM_BACKGROUND 3437 char str[256];
3902 scale_pixmap (""); /* reset to default scaling */ 3438
3903 set_bgPixmap (str); /* change pixmap */ 3439 sprintf (str, "[%dx%d+%d+%d]",
3904 scr_touch (true); 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3905#endif 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3906 } 3443 }
3907 3444 else
3445 {
3908 int changed = 0; 3446 int changed = 0;
3909 3447
3910 while ((str = strchr (str, ';')) != NULL) 3448 if (*str != ';')
3911 { 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 {
3912 str++; 3461 str++;
3913#if XPM_BACKGROUND 3462 if (bgPixmap.set_geometry (str))
3914 changed += scale_pixmap (str); 3463 changed++;
3915#endif 3464 str = strchr (str, ';');
3916 } 3465 }
3917 3466
3918 if (changed) 3467 if (changed)
3919 { 3468 update_background ();
3920#ifdef XPM_BACKGROUND
3921 resize_pixmap ();
3922 scr_touch (true);
3923#endif
3924 } 3469 }
3925 }
3926 break; 3470 break;
3927 3471#endif
3928 case Rxvt_restoreFG:
3929 set_window_color (Color_fg, str);
3930 break;
3931 case Rxvt_restoreBG:
3932 set_window_color (Color_bg, str);
3933 break;
3934 3472
3935 case XTerm_logfile: 3473 case XTerm_logfile:
3936 // TODO, when secure mode? 3474 // TODO, when secure mode?
3937 break; 3475 break;
3938 3476
… …
3956 case URxvt_italicFont: 3494 case URxvt_italicFont:
3957 case URxvt_boldItalicFont: 3495 case URxvt_boldItalicFont:
3958#endif 3496#endif
3959 if (query) 3497 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop, 3498 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3499 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "", 3500 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp); 3501 resp);
3964 else 3502 else
3965 { 3503 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3504 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3980 break; 3518 break;
3981 3519
3982#if !ENABLE_MINIMAL 3520#if !ENABLE_MINIMAL
3983 case URxvt_locale: 3521 case URxvt_locale:
3984 if (query) 3522 if (query)
3985 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);
3986 else 3524 else
3987 { 3525 {
3988 set_locale (str); 3526 set_locale (str);
3989 pty->set_utf8_mode (enc_utf8); 3527 pty->set_utf8_mode (enc_utf8);
3990 init_xlocale (); 3528 init_xlocale ();
… …
4005 break; 3543 break;
4006#endif 3544#endif
4007 3545
4008#if ENABLE_PERL 3546#if ENABLE_PERL
4009 case URxvt_perl: 3547 case URxvt_perl:
4010 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));
4011 ; // no responses yet
4012 break; 3549 break;
4013#endif 3550#endif
4014 } 3551 }
4015} 3552}
4016/*----------------------------------------------------------------------*/ 3553/*----------------------------------------------------------------------*/
… …
4039 { 3576 {
4040 if (mode == 'r') 3577 if (mode == 'r')
4041 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4042 else 3579 else
4043 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3580 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4044 PrivMode (state, bit); 3581 set_privmode (bit, state);
4045 } 3582 }
4046 3583
4047 return state; 3584 return state;
4048} 3585}
4049 3586
… …
4053{ 3590{
4054 unsigned int i, j; 3591 unsigned int i, j;
4055 int state; 3592 int state;
4056 3593
4057 static const struct 3594 static const struct
4058 { 3595 {
4059 const int argval; 3596 const int argval;
4060 const unsigned long bit; 3597 const unsigned long bit;
4061 }
4062
4063 argtopriv[] = { 3598 } argtopriv[] = {
4064 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR }, // DECCKM
4065 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
4066 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 }, // DECCOLM
4067 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll }, // DECSCLM
4068 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo }, // DECSCNM
4069 { 6, PrivMode_relOrigin }, 3604 { 6, PrivMode_relOrigin }, // DECOM
4070 { 7, PrivMode_Autowrap }, 3605 { 7, PrivMode_Autowrap }, // DECAWM
4071 // 8, bi-directional support mode 3606 // 8, auto-repeat keys // DECARM
4072 { 9, PrivMode_MouseX10 }, 3607 { 9, PrivMode_MouseX10 },
4073 // 18, 19 printing-related 3608 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region
4074 { 25, PrivMode_VisibleCursor }, 3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4075#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
4076 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
4077#endif 3613#endif
4078 { 35, PrivMode_ShiftKeys }, // rxvt extension 3614 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK
4079 { 40, PrivMode_132OK }, 3616 { 40, PrivMode_132OK },
4080 // 41 xterm more fixes NYI 3617 // 41 xterm more fixes NYI
4081 // 45 margin bell NYI 3618 // 45 margin bell NYI
4082 // 46 start logging 3619 // 46 start logging
4083 { 47, PrivMode_Screen }, 3620 { 47, PrivMode_Screen },
4084 { 66, PrivMode_aplKP }, 3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4085#ifndef NO_BACKSPACE_KEY 3622#ifndef NO_BACKSPACE_KEY
4086 { 67, PrivMode_BackSpace }, 3623 { 67, PrivMode_BackSpace }, // DECBKM
4087#endif 3624#endif
4088 { 1000, PrivMode_MouseX11 }, 3625 { 1000, PrivMode_MouseX11 },
4089 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3626 { 1002, PrivMode_MouseBtnEvent },
4090 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3627 { 1003, PrivMode_MouseAnyEvent },
4091 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4092 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4093 { 1011, PrivMode_Keypress }, // rxvt extension 3629 { 1011, PrivMode_Keypress }, // rxvt extension
4094 // 1035 enable modifiers for alt, numlock NYI 3630 // 1035 enable modifiers for alt, numlock NYI
4095 // 1036 send ESC for meta keys NYI 3631 // 1036 send ESC for meta keys NYI
4096 // 1037 send DEL for keypad delete NYI 3632 // 1037 send DEL for keypad delete NYI
4097 { 1047, PrivMode_Screen }, 3633 { 1047, PrivMode_Screen },
4098 // 1048 save and restore cursor 3634 // 1048 save and restore cursor
4099 { 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 */
4100 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste },
4101 }; 3638 };
4102 3639
4103 if (nargs == 0) 3640 if (nargs == 0)
4104 return; 3641 return;
4105 3642
… …
4130 3667
4131 scr_touch (true); 3668 scr_touch (true);
4132 break; 3669 break;
4133#endif 3670#endif
4134 case 1048: /* alternative cursor save */ 3671 case 1048: /* alternative cursor save */
4135 case 1049:
4136 if (OPTION (Opt_secondaryScreen)) 3672 if (option (Opt_secondaryScreen))
4137 if (mode == 0) 3673 if (mode == 0)
4138 scr_cursor (RESTORE); 3674 scr_cursor (RESTORE);
4139 else if (mode == 1) 3675 else if (mode == 1)
4140 scr_cursor (SAVE); 3676 scr_cursor (SAVE);
4141 break; 3677 break;
… …
4149 case 2: /* VT52 mode */ 3685 case 2: /* VT52 mode */
4150 /* oddball mode. should be set regardless of set/reset 3686 /* oddball mode. should be set regardless of set/reset
4151 * parameter. Return from VT52 mode with an ESC < from 3687 * parameter. Return from VT52 mode with an ESC < from
4152 * within VT52 mode 3688 * within VT52 mode
4153 */ 3689 */
4154 PrivMode (1, PrivMode_vt52); 3690 set_privmode (PrivMode_vt52, 1);
4155 break; 3691 break;
4156 case 3: /* 80/132 */ 3692 case 3: /* 80/132 */
4157 if (priv_modes & PrivMode_132OK) 3693 if (priv_modes & PrivMode_132OK)
4158 set_widthheight (((state ? 132 : 80) * fwidth), height); 3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4159 break; 3695 break;
4160 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
4161 set_option (Opt_jumpScroll, !state); 3697 set_option (Opt_jumpScroll, !state);
4162 break; 3698 break;
4163 case 5: /* reverse video */ 3699 case 5: /* reverse video */
… …
4170 scr_autowrap (state); 3706 scr_autowrap (state);
4171 break; 3707 break;
4172 /* 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 */
4173 case 9: /* X10 mouse reporting */ 3709 case 9: /* X10 mouse reporting */
4174 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
4175 priv_modes &= ~PrivMode_MouseX11; 3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4176 break; 3712 break;
4177#ifdef scrollBar_esc 3713#ifdef scrollBar_esc
4178 case scrollBar_esc: 3714 case scrollBar_esc:
4179 if (scrollbar_mapping (state)) 3715 if (scrollBar.map (state))
4180 { 3716 {
4181 resize_all_windows (0, 0, 0); 3717 resize_all_windows (0, 0, 0);
4182 scr_touch (true); 3718 scr_touch (true);
4183 } 3719 }
4184 break; 3720 break;
… …
4193 break; 3729 break;
4194 /* case 66: - application key pad */ 3730 /* case 66: - application key pad */
4195 /* case 67: - backspace key */ 3731 /* case 67: - backspace key */
4196 case 1000: /* X11 mouse reporting */ 3732 case 1000: /* X11 mouse reporting */
4197 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4198 priv_modes &= ~PrivMode_MouseX10; 3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4199 break; 3735 break;
4200#if 0
4201 case 1001: 3736 case 1002:
4202 break; /* X11 mouse highlighting */ 3737 case 1003:
4203#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;
4204 case 1010: /* scroll to bottom on TTY output inhibit */ 3749 case 1010: /* scroll to bottom on TTY output inhibit */
4205 set_option (Opt_scrollTtyOutput, !state); 3750 set_option (Opt_scrollTtyOutput, !state);
4206 break; 3751 break;
4207 case 1011: /* scroll to bottom on key press */ 3752 case 1011: /* scroll to bottom on key press */
4208 set_option (Opt_scrollTtyKeypress, state); 3753 set_option (Opt_scrollTtyKeypress, state);
4209 break; 3754 break;
4210 case 1047: /* secondary screen w/ clearing last */ 3755 case 1047: /* secondary screen w/ clearing last */
4211 if (OPTION (Opt_secondaryScreen)) 3756 if (option (Opt_secondaryScreen))
4212 if (current_screen != PRIMARY) 3757 if (!state)
4213 scr_erase_screen (2); 3758 scr_erase_screen (2);
3759
4214 scr_change_screen (state); 3760 scr_change_screen (state);
4215 break; 3761 break;
4216 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
4217 scr_change_screen (state); 3767 scr_change_screen (state);
3768
4218 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4219 if (current_screen != PRIMARY) 3770 if (state)
4220 scr_erase_screen (2); 3771 scr_erase_screen (2);
3772 else
3773 scr_cursor (RESTORE);
4221 break; 3774 break;
4222 default: 3775 default:
4223 break; 3776 break;
4224 } 3777 }
4225 } 3778 }
… …
4385rxvt_term::process_graphics () 3938rxvt_term::process_graphics ()
4386{ 3939{
4387 unicode_t ch, cmd = cmd_getc (); 3940 unicode_t ch, cmd = cmd_getc ();
4388 3941
4389 if (cmd == 'Q') 3942 if (cmd == 'Q')
3943 {
4390 { /* query graphics */ 3944 /* query graphics */
4391 tt_printf ("\033G0\012"); /* no graphics */ 3945 tt_printf ("\033G0\012"); /* no graphics */
4392 return; 3946 return;
4393 } 3947 }
4394 /* swallow other graphics sequences until terminating ':' */ 3948 /* swallow other graphics sequences until terminating ':' */
4395 do 3949 do
… …
4445 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4446 4000
4447 memcpy (v_buffer + v_buflen, data, len); 4001 memcpy (v_buffer + v_buflen, data, len);
4448 v_buflen += len; 4002 v_buflen += len;
4449 4003
4450 pty_ev.set (EVENT_READ | EVENT_WRITE); 4004 pty_ev.set (ev::READ | ev::WRITE);
4451} 4005}
4452 4006
4453void rxvt_term::pty_write () 4007void rxvt_term::pty_write ()
4454{ 4008{
4455 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));
… …
4460 4014
4461 if (v_buflen == 0) 4015 if (v_buflen == 0)
4462 { 4016 {
4463 free (v_buffer); 4017 free (v_buffer);
4464 v_buffer = 0; 4018 v_buffer = 0;
4465 v_buflen = 0;
4466 4019
4467 pty_ev.set (EVENT_READ); 4020 pty_ev.set (ev::READ);
4468 return; 4021 return;
4469 } 4022 }
4470 4023
4471 memmove (v_buffer, v_buffer + written, v_buflen); 4024 memmove (v_buffer, v_buffer + written, v_buflen);
4472 } 4025 }
4473 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4026 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4474 pty_ev.set (EVENT_READ); 4027 pty_ev.set (ev::READ);
4475} 4028}
4476 4029
4477/*----------------------- end-of-file (C source) -----------------------*/ 4030/*----------------------- end-of-file (C source) -----------------------*/
4478 4031

Diff Legend

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