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.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs.
Revision 1.478 by root, Thu Feb 24 12:42:41 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
… …
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 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
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
… …
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
551 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
552 newlen = 1; 689 newlen = 0;
553 switch (keysym) 690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
554 { 773 {
555#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
556 case XK_BackSpace: 775 if (param > 0)
557 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else 777 else
564 strcpy (kbuf, key_backspace);
565 break;
566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete:
579 strcpy (kbuf, key_delete);
580 break;
581#endif
582 case XK_Tab:
583 if (shft)
584 strcpy (kbuf, "\033[Z");
585 else
586 {
587#ifdef CTRL_TAB_MAKES_META
588 if (ctrl)
589 meta = 1;
590#endif
591#ifdef MOD4_TAB_MAKES_META
592 if (ev.state & Mod4Mask)
593 meta = 1;
594#endif
595 newlen = 0;
596 }
597 break;
598
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z");
620 kbuf[2] = "DACB"[keysym - XK_Left];
621 /* do Shift first */
622 if (shft)
623 kbuf[2] = "dacb"[keysym - XK_Left];
624 else if (ctrl)
625 {
626 kbuf[1] = 'O';
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 }
629 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O';
631 break;
632
633#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior:
645 strcpy (kbuf, "\033[5~");
646 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next:
658 strcpy (kbuf, "\033[6~");
659 break;
660#endif
661 case XK_KP_Enter:
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
677 }
678 else
679 {
680 kbuf[0] = '\015';
681 kbuf[1] = '\0';
682 }
683 break;
684
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP");
696 kbuf[2] += (keysym - XK_KP_F1);
697 break;
698
699 case XK_KP_Multiply: /* "\033Oj" : "*" */
700 case XK_KP_Add: /* "\033Ok" : "+" */
701 case XK_KP_Separator: /* "\033Ol" : "," */
702 case XK_KP_Subtract: /* "\033Om" : "-" */
703 case XK_KP_Decimal: /* "\033On" : "." */
704 case XK_KP_Divide: /* "\033Oo" : "/" */
705 case XK_KP_0: /* "\033Op" : "0" */
706 case XK_KP_1: /* "\033Oq" : "1" */
707 case XK_KP_2: /* "\033Or" : "2" */
708 case XK_KP_3: /* "\033Os" : "3" */
709 case XK_KP_4: /* "\033Ot" : "4" */
710 case XK_KP_5: /* "\033Ou" : "5" */
711 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
717 {
718 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply);
720 }
721 else
722 {
723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_Find:
729 strcpy (kbuf, "\033[1~");
730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert:
743 strcpy (kbuf, "\033[2~");
744 break;
745#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove:
747 /* FALLTHROUGH */
748#endif
749 case XK_Execute:
750 strcpy (kbuf, "\033[3~");
751 break;
752 case XK_Select:
753 strcpy (kbuf, "\033[4~");
754 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End:
766 strcpy (kbuf, KS_END);
767 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home:
779 strcpy (kbuf, KS_HOME);
780 break;
781
782#define FKEY(n, fkey) \
783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
784
785 case XK_F1: /* "\033[11~" */
786 case XK_F2: /* "\033[12~" */
787 case XK_F3: /* "\033[13~" */
788 case XK_F4: /* "\033[14~" */
789 case XK_F5: /* "\033[15~" */
790 FKEY (11, XK_F1);
791 break;
792 case XK_F6: /* "\033[17~" */
793 case XK_F7: /* "\033[18~" */
794 case XK_F8: /* "\033[19~" */
795 case XK_F9: /* "\033[20~" */
796 case XK_F10: /* "\033[21~" */
797 FKEY (17, XK_F6);
798 break;
799 case XK_F11: /* "\033[23~" */
800 case XK_F12: /* "\033[24~" */
801 case XK_F13: /* "\033[25~" */
802 case XK_F14: /* "\033[26~" */
803 FKEY (23, XK_F11);
804 break;
805 case XK_F15: /* "\033[28~" */
806 case XK_F16: /* "\033[29~" */
807 FKEY (28, XK_F15);
808 break;
809 case XK_Help: /* "\033[28~" */
810 FKEY (28, XK_Help);
811 break;
812 case XK_Menu: /* "\033[29~" */
813 FKEY (29, XK_Menu);
814 break;
815 case XK_F17: /* "\033[31~" */
816 case XK_F18: /* "\033[32~" */
817 case XK_F19: /* "\033[33~" */
818 case XK_F20: /* "\033[34~" */
819 case XK_F21: /* "\033[35~" */
820 case XK_F22: /* "\033[36~" */
821 case XK_F23: /* "\033[37~" */
822 case XK_F24: /* "\033[38~" */
823 case XK_F25: /* "\033[39~" */
824 case XK_F26: /* "\033[40~" */
825 case XK_F27: /* "\033[41~" */
826 case XK_F28: /* "\033[42~" */
827 case XK_F29: /* "\033[43~" */
828 case XK_F30: /* "\033[44~" */
829 case XK_F31: /* "\033[45~" */
830 case XK_F32: /* "\033[46~" */
831 case XK_F33: /* "\033[47~" */
832 case XK_F34: /* "\033[48~" */
833 case XK_F35: /* "\033[49~" */
834 FKEY (31, XK_F17);
835 break;
836#undef FKEY
837 default:
838 newlen = 0; 778 newlen = 0;
839 break;
840 } 779 }
841 780 break;
842 if (newlen)
843 len = strlen (kbuf);
844 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
845 785
846 /* 786 /*
847 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
848 */ 788 */
849#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
949 commit_iso14755 (); 889 commit_iso14755 ();
950 890
951 return; 891 return;
952 } 892 }
953 893
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
955 if (i[0] == keysym) 895 if (i[0] == keysym)
956 { 896 {
957 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 (); 898 commit_iso14755 ();
959 899
… …
1034void 974void
1035rxvt_term::flush () 975rxvt_term::flush ()
1036{ 976{
1037 flush_ev.stop (); 977 flush_ev.stop ();
1038 978
1039#ifdef ENABLE_TRANSPARENCY 979#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 980 if (bg_flags & BG_NEEDS_REFRESH)
1041 { 981 {
1042 want_full_refresh = 0; 982 bg_flags &= ~BG_NEEDS_REFRESH;
1043 scr_clear ();
1044 scr_touch (false); 983 scr_touch (false);
1045 } 984 }
1046#endif 985#endif
1047 986
1048 if (want_refresh) 987 if (want_refresh)
… …
1084 } 1023 }
1085 while (row < end_row); 1024 while (row < end_row);
1086 } 1025 }
1087 1026
1088 scr_refresh (); 1027 scr_refresh ();
1089 scrollbar_show (1); 1028 scrollBar.show (1);
1090#ifdef USE_XIM 1029#ifdef USE_XIM
1091 IMSendSpot (); 1030 IMSendSpot ();
1092#endif 1031#endif
1093 } 1032 }
1094 1033
1095 display->flush (); 1034 display->flush ();
1096} 1035}
1097 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1098void 1038void
1099rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1100{ 1040{
1101 make_current (); 1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1043
1103 display->flush (); 1044 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1045}
1108 1046
1109void 1047void
1110rxvt_term::flush_cb (time_watcher &w) 1048rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1049{
1112 make_current (); 1050 make_current ();
1113 1051
1114 refresh_count = 0; 1052 refresh_count = 0;
1115 flush (); 1053 flush ();
1116} 1054}
1117 1055
1118#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1119void 1057void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1059{
1122 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1061 want_refresh = 1;
1124 1062 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1063}
1127#endif 1064#endif
1128 1065
1129#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1130void 1067void
1131rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1069{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1071 {
1135 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1136 want_refresh = 1; 1073 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1138 } 1075 }
1076 else
1077 w.stop ();
1139} 1078}
1140#endif 1079#endif
1141 1080
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1082void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1084{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1087 {
1149 want_refresh = 1; 1088 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1151 } 1090 }
1091 else
1092 w.stop ();
1152} 1093}
1153#endif 1094#endif
1154 1095
1155#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1156void 1097void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1099{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1101 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1103 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1164 } 1105 }
1106 else
1107 w.stop ();
1165} 1108}
1166#endif 1109#endif
1167 1110
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1112void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1114{
1172 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1116 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1117 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1181 } 1125 }
1182} 1126}
1183#endif 1127#endif
1184 1128
1185#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1186static struct event_handler 1130static struct event_handler
1187{ 1131{
1188 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1189 1133
1190 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1191 { 1135 {
1192 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1196 1143
1197 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1199 1146
1200 w.stop (); 1147 w.stop ();
1201 } 1148 }
1202 1149
… …
1211rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1212{ 1159{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1214 1161
1215 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1216 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1218 n = 0;
1219 }
1220 1164
1221 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1224 1168
… …
1246 1190
1247 return false; 1191 return false;
1248} 1192}
1249 1193
1250void 1194void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1195rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1196{
1253 make_current (); 1197 make_current ();
1254 1198
1255 if (revents & EVENT_READ) 1199 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1202 cmd_parse ();
1259 break;
1260 1203
1261 if (revents & EVENT_WRITE) 1204 if (revents & ev::WRITE)
1262 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1263} 1208}
1264 1209
1265void 1210void
1266rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1267{ 1212{
… …
1270 1215
1271#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1217 hidden_pointer = 0;
1273 1218
1274 if (option (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1276#endif 1221#endif
1277} 1222}
1278 1223
1279#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1280void 1225void
… …
1288 1233
1289 hidden_pointer = 1; 1234 hidden_pointer = 1;
1290} 1235}
1291 1236
1292void 1237void
1293rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1239{
1295 make_current (); 1240 make_current ();
1296 1241
1297 pointer_blank (); 1242 pointer_blank ();
1298} 1243}
… …
1301void 1246void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1248{
1304 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1305 int x, y; 1250 int x, y;
1251 int code = 32;
1306 1252
1307 x = ev.x; 1253 x = Pixel2Col (ev.x) + 1;
1308 y = ev.y; 1254 y = Pixel2Row (ev.y) + 1;
1309 pixel_position (&x, &y); 1255
1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260
1261 mouse_row = x;
1262 mouse_col = y;
1263 code += 32;
1264 }
1310 1265
1311 if (MEvent.button == AnyButton) 1266 if (MEvent.button == AnyButton)
1312 button_number = 3; 1267 button_number = 3;
1313 else 1268 else
1314 { 1269 {
1315 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1316 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1317 if (button_number >= 3) 1272 if (button_number >= 3)
1318 button_number += (64 - 3); 1273 button_number += 64 - 3;
1319 } 1274 }
1320 1275
1321 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1322 { 1277 {
1323 /* 1278 /*
… …
1355 fputc ('A', stderr); 1310 fputc ('A', stderr);
1356 if (key_state & 32) 1311 if (key_state & 32)
1357 fputc ('2', stderr); 1312 fputc ('2', stderr);
1358 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1359 button_number, 1314 button_number,
1360 x + 1, 1315 x,
1361 y + 1); 1316 y);
1362#endif 1317#endif
1363 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1364 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1333 code + button_number + key_state,
1366 (32 + x + 1), 1334 32 + x,
1367 (32 + y + 1)); 1335 32 + y);
1368} 1336}
1369 1337
1370/*{{{ process an X event */ 1338/*{{{ process an X event */
1371void 1339void
1372rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
… …
1474 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1443 focus_out ();
1476 break; 1444 break;
1477 1445
1478 case ConfigureNotify: 1446 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1483 { 1448 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1486 1470
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1472 {
1489 seen_resize = 1; 1473 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1475 }
1492 else 1476 else
1493 { 1477 {
1494#ifdef ENABLE_TRANSPARENCY 1478#ifdef HAVE_BG_PIXMAP
1495 if (option (Opt_transparent)) 1479 if (moved)
1480 {
1481 if (mapped)
1496 update_background (); 1482 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1497#endif 1486#endif
1498 } 1487 }
1488
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1490 }
1501 break; 1491 break;
1502 1492
1503 case PropertyNotify: 1493 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1506 && ev.xproperty.state == PropertyNewValue)
1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1508
1509 break; 1495 break;
1510 1496
1511 case SelectionClear: 1497 case SelectionClear:
1512 selection_clear (); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1513 break;
1514
1515 case SelectionNotify:
1516 if (selection_wait == Sel_normal)
1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1518 break; 1499 break;
1519 1500
1520 case SelectionRequest: 1501 case SelectionRequest:
1521 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1522 break; 1503 break;
1523 1504
1524 case MapNotify: 1505 case MapNotify:
1506#ifdef HAVE_BG_PIXMAP
1507 /* This is needed specifically to fix the case of no window manager or a
1508 * non-reparenting window manager. In those cases we never get first
1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1511 * reparenting.
1512 * We should not render background immediately, as there could be several
1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1514 * by scheduling background redraw as soon as we can, but giving a short
1515 * bit of time for ConfigureNotifies to arrive.
1516 * We should render background PRIOR to drawing any text, but AFTER all
1517 * of ConfigureNotifys for the best results.
1518 */
1519 if (!(bg_flags & BG_IS_VALID))
1520 update_background_ev.start (0.025);
1521#endif
1525 mapped = 1; 1522 mapped = 1;
1526#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1524 text_blink_ev.start ();
1528#endif 1525#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1526 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1527 break;
1531 1528
1532 case UnmapNotify: 1529 case UnmapNotify:
… …
1534#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1535 text_blink_ev.stop (); 1532 text_blink_ev.stop ();
1536#endif 1533#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1535 break;
1539
1540#ifdef ENABLE_TRANSPARENCY
1541 case ReparentNotify:
1542 rootwin_cb (ev);
1543 break;
1544#endif /* ENABLE_TRANSPARENCY */
1545 1536
1546 case GraphicsExpose: 1537 case GraphicsExpose:
1547 case Expose: 1538 case Expose:
1548 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1549 { 1540 {
1550 do 1541 do
1542 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1545 }
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554 1547
1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556 1549
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 {
1558 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1559 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1554 }
1560 1555
1561 want_refresh = 1; 1556 want_refresh = 1;
1562 } 1557 }
1563 else 1558 else
1564 { 1559 {
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1568 ; 1563 ;
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1570 ; 1565 ;
1571 1566
1572 if (isScrollbarWindow (ev.xany.window)) 1567 if (scrollBar.state && ev.xany.window == scrollBar.win)
1573 { 1568 {
1574 scrollBar.setIdle (); 1569 scrollBar.state = STATE_IDLE;
1575 scrollbar_show (0); 1570 scrollBar.show (0);
1576 } 1571 }
1577 } 1572 }
1578 break; 1573 break;
1579 1574
1580 case MotionNotify: 1575 case MotionNotify:
1581#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1582 if (hidden_pointer) 1577 if (hidden_pointer)
1583 pointer_unblank (); 1578 pointer_unblank ();
1584#endif 1579#endif
1580 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1581 || priv_modes & PrivMode_MouseAnyEvent)
1582 mouse_report (ev.xbutton);
1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586 break; 1584 break;
1587 1585
1588 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1589 { 1587 {
… …
1623 int dist; 1621 int dist;
1624 1622
1625 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1626 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
1627 */ 1625 */
1628 if (!sel_scroll_ev.active) 1626 if (!sel_scroll_ev.is_active ())
1629 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1627 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630 1628
1631 /* save the event params so we can highlight 1629 /* save the event params so we can highlight
1632 * the selection in the pending-scroll loop 1630 * the selection in the pending-scroll loop
1633 */ 1631 */
1634 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
… …
1656 else 1654 else
1657 { 1655 {
1658 /* we are within the text window, so we 1656 /* we are within the text window, so we
1659 * shouldn't be scrolling 1657 * shouldn't be scrolling
1660 */ 1658 */
1661 if (sel_scroll_ev.active)
1662 sel_scroll_ev.stop(); 1659 sel_scroll_ev.stop();
1663 } 1660 }
1664#endif 1661#endif
1665#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1666 } 1663 }
1667#endif 1664#endif
1668 } 1665 }
1669 } 1666 }
1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1668 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1674 ; 1671 ;
1675 1672
… …
1677 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1677 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1682 scrollbar_size ()); 1679 scrollBar.size ());
1683 want_refresh = 1; 1680 want_refresh = 1;
1684 scrollbar_show (1); 1681 scrollBar.show (1);
1685 } 1682 }
1686 break; 1683 break;
1687 } 1684 }
1688 1685
1689#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
… …
1693 { 1690 {
1694 hidden_cursor = 0; 1691 hidden_cursor = 0;
1695 want_refresh = 1; 1692 want_refresh = 1;
1696 } 1693 }
1697 1694
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1695 cursor_blink_ev.again ();
1699 } 1696 }
1700#endif 1697#endif
1701 1698
1702#if defined(POINTER_BLANK) 1699#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1707
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1708 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1709 pointer_blank ();
1713 } 1710 }
1714#endif 1711#endif
1712
1713 refresh_check ();
1715} 1714}
1715
1716#if ENABLE_FRILLS
1717void
1718rxvt_term::set_urgency (bool enable)
1719{
1720 if (enable == urgency_hint)
1721 return;
1722
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1724 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h);
1727 urgency_hint = enable;
1728 }
1729}
1730#endif
1716 1731
1717void 1732void
1718rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1719{ 1734{
1720 if (!focus) 1735 if (!focus)
1721 { 1736 {
1722 focus = 1; 1737 focus = 1;
1723 want_refresh = 1; 1738 want_refresh = 1;
1724 1739
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM 1740#if USE_XIM
1728 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1729 { 1742 {
1730 IMSetPosition (); 1743 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1732 } 1745 }
1733#endif 1746#endif
1734#if CURSOR_BLINK 1747#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.again ();
1737#endif 1750#endif
1738#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1740 { 1753 {
1741 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1755 scr_recolour ();
1743 } 1756 }
1744#endif 1757#endif
1745#if ENABLE_FRILLS 1758#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1759 if (option (Opt_urgentOnBell))
1747 { 1760 set_urgency (0);
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif 1761#endif
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 } 1764 }
1759} 1765}
1760 1766
1761void 1767void
1762rxvt_term::focus_out () 1768rxvt_term::focus_out ()
… …
1764 if (focus) 1770 if (focus)
1765 { 1771 {
1766 focus = 0; 1772 focus = 0;
1767 want_refresh = 1; 1773 want_refresh = 1;
1768 1774
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1775#if ENABLE_FRILLS
1770 1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1771#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf) 1780 if (iso14755buf)
1773 { 1781 {
1774 iso14755buf = 0; 1782 iso14755buf = 0;
1775# if ISO_14755 1783# if ISO_14755
… …
1782 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1783#endif 1791#endif
1784#if CURSOR_BLINK 1792#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1795
1787 hidden_cursor = 0; 1796 hidden_cursor = 0;
1788#endif 1797#endif
1789#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
1791 { 1800 {
1792 pix_colors = pix_colors_unfocused; 1801 pix_colors = pix_colors_unfocused;
1793 scr_recolour (); 1802 scr_recolour ();
1794 } 1803 }
1795#endif 1804#endif
1805
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1796 } 1807 }
1797} 1808}
1798 1809
1799void 1810void
1800rxvt_term::update_fade_color (unsigned int idx) 1811rxvt_term::update_fade_color (unsigned int idx)
… …
1828 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1829 */ 1840 */
1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 { 1843 {
1833 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1834 update_background (); 1845 update_background ();
1835 } 1846 }
1847
1836 break; 1848 break;
1837 } 1849 }
1838# endif 1850# endif
1851
1852 refresh_check ();
1839} 1853}
1840#endif 1854#endif
1841 1855
1842void 1856void
1843rxvt_term::button_press (XButtonEvent &ev) 1857rxvt_term::button_press (XButtonEvent &ev)
… …
1874 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1875 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1876#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1877 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1878 { 1892 {
1879 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1880 MEvent.clicks++; 1894 MEvent.clicks++;
1881 1895
1882 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1883 { 1897 {
1884 /* only report double clicks */ 1898 /* only report double clicks */
… …
1898 mouse_report (ev); 1912 mouse_report (ev);
1899 } 1913 }
1900#else 1914#else
1901 MEvent.button = ev.button; 1915 MEvent.button = ev.button;
1902 mouse_report (ev); 1916 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1917#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1918
1905 } 1919 }
1906 else 1920 else
1907 { 1921 {
1908 if (ev.button != MEvent.button) 1922 if (ev.button != MEvent.button)
… …
1956 } 1970 }
1957 1971
1958 /* 1972 /*
1959 * Scrollbar window processing of button press 1973 * Scrollbar window processing of button press
1960 */ 1974 */
1961 if (isScrollbarWindow (ev.window)) 1975 if (scrollBar.state && ev.window == scrollBar.win)
1962 { 1976 {
1963 scrollBar.setIdle (); 1977 page_dirn direction = NO_DIR;
1978
1979 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */
1983
1984 scrollBar.state = STATE_IDLE;
1964 /* 1985 /*
1965 * Rxvt-style scrollbar: 1986 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 1987 * move up if mouse is above slider
1967 * move dn if mouse is below slider 1988 * move dn if mouse is below slider
1968 * 1989 *
… …
1977 /* 1998 /*
1978 * Mouse report disabled scrollbar: 1999 * Mouse report disabled scrollbar:
1979 * arrow buttons - send up/down 2000 * arrow buttons - send up/down
1980 * click on scrollbar - send pageup/down 2001 * click on scrollbar - send pageup/down
1981 */ 2002 */
1982 if ((scrollBar.style == R_SB_NEXT 2003 if (direction == UP)
1983 && scrollbarnext_upButton (ev.y))
1984 || (scrollBar.style == R_SB_RXVT
1985 && scrollbarrxvt_upButton (ev.y)))
1986 tt_printf ("\033[A"); 2004 tt_printf ("\033[A");
1987 else if ((scrollBar.style == R_SB_NEXT 2005 else if (direction == DN)
1988 && scrollbarnext_dnButton (ev.y))
1989 || (scrollBar.style == R_SB_RXVT
1990 && scrollbarrxvt_dnButton (ev.y)))
1991 tt_printf ("\033[B"); 2006 tt_printf ("\033[B");
1992 else 2007 else
1993 switch (ev.button) 2008 switch (ev.button)
1994 { 2009 {
1995 case Button2: 2010 case Button2:
… …
2002 tt_printf ("\033[5~"); 2017 tt_printf ("\033[5~");
2003 break; 2018 break;
2004 } 2019 }
2005 } 2020 }
2006 else 2021 else
2007#endif /* NO_SCROLLBAR_REPORT */ 2022#endif /* NO_SCROLLBAR_REPORT */
2008
2009 {
2010 char upordown = 0;
2011
2012 if (scrollBar.style == R_SB_NEXT)
2013 { 2023 {
2014 if (scrollbarnext_upButton (ev.y)) 2024 if (direction != NO_DIR)
2015 upordown = -1; /* up */
2016 else if (scrollbarnext_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 else if (scrollBar.style == R_SB_RXVT)
2020 {
2021 if (scrollbarrxvt_upButton (ev.y))
2022 upordown = -1; /* up */
2023 else if (scrollbarrxvt_dnButton (ev.y))
2024 upordown = 1; /* down */
2025 }
2026 if (upordown)
2027 { 2025 {
2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2027 if (!cont_scroll_ev.is_active ())
2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2029#endif
2031 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (direction, 1))
2032 { 2031 {
2033 if (upordown < 0) 2032 if (direction == UP)
2034 scrollBar.setUp (); 2033 scrollBar.state = STATE_UP;
2035 else 2034 else
2036 scrollBar.setDn (); 2035 scrollBar.state = STATE_DOWN;
2037 } 2036 }
2038 } 2037 }
2039 else 2038 else
2040 switch (ev.button) 2039 switch (ev.button)
2041 { 2040 {
2042 case Button2: 2041 case Button2:
2043 switch (scrollbar_align) 2042 switch (scrollBar.align)
2044 { 2043 {
2045 case R_SB_ALIGN_TOP: 2044 case R_SB_ALIGN_TOP:
2046 csrO = 0; 2045 csrO = 0;
2047 break; 2046 break;
2048 case R_SB_ALIGN_CENTRE: 2047 case R_SB_ALIGN_CENTRE:
… …
2054 } 2053 }
2055 2054
2056 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2057 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2060 2059
2061 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2062 break; 2061 break;
2063 2062
2064 case Button1: 2063 case Button1:
2065 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2064 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2065 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2066 /* FALLTHROUGH */
2068 2067
2069 case Button3: 2068 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2069 if (scrollBar.style != R_SB_XTERM)
… …
2080 scr_page (DN, nrow - 1); 2079 scr_page (DN, nrow - 1);
2081# else 2080# else
2082 scr_page (DN, nrow / 4); 2081 scr_page (DN, nrow / 4);
2083# endif 2082# endif
2084 else 2083 else
2085 scrollBar.setMotion (); 2084 scrollBar.state = STATE_MOTION;
2086 } 2085 }
2087 else 2086 else
2088 { 2087 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2089 (nrow
2091 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2092 / scrollbar_size ())); 2091 / scrollBar.size ()));
2093 } 2092 }
2094 2093
2095 break; 2094 break;
2096 } 2095 }
2097 } 2096 }
… …
2107 2106
2108 csrO = 0; /* reset csr Offset */ 2107 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2108 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2110
2112 if (scrollbar_isUpDn ()) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2113 { 2112 {
2114 scrollBar.setIdle (); 2113 scrollBar.state = STATE_IDLE;
2115 scrollbar_show (0); 2114 scrollBar.show (0);
2116 } 2115 }
2117 2116
2118#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2119 if (sel_scroll_ev.active)
2120 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2121#endif 2119#endif
2122 2120
2123 if (ev.window == vt) 2121 if (ev.window == vt)
2124 { 2122 {
2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2149 mouse_report (ev); 2147 mouse_report (ev);
2150 } 2148 }
2151#else /* MOUSE_REPORT_DOUBLECLICK */ 2149#else /* MOUSE_REPORT_DOUBLECLICK */
2152 MEvent.button = AnyButton; 2150 MEvent.button = AnyButton;
2153 mouse_report (ev); 2151 mouse_report (ev);
2154#endif /* MOUSE_REPORT_DOUBLECLICK */ 2152#endif /* MOUSE_REPORT_DOUBLECLICK */
2155 return; 2153 return;
2156 } 2154 }
2157 2155
2158 /* 2156 /*
2159 * dumb hack to compensate for the failure of click-and-drag 2157 * dumb hack to compensate for the failure of click-and-drag
… …
2171 selection_make (ev.time); 2169 selection_make (ev.time);
2172 break; 2170 break;
2173 2171
2174 case Button2: 2172 case Button2:
2175 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2177 break; 2175 break;
2178 2176
2179#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2180 case Button4: 2178 case Button4:
2181 case Button5: 2179 case Button5:
… …
2197 { 2195 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2196 mouse_slip_wheel_speed += v ? -1 : 1;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2199
2202 if (slip_wheel_ev.at < NOW) 2200 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2201 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205 slip_wheel_ev.start ();
2206 } 2202 }
2207 else 2203 else
2204# endif
2208 { 2205 {
2209# endif
2210 scr_page (v, i); 2206 scr_page (v, i);
2211 scrollbar_show (1); 2207 scrollBar.show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2208 }
2214# endif
2215 } 2209 }
2216 break; 2210 break;
2217#endif 2211#endif
2218 } 2212 }
2219 } 2213 }
2220} 2214}
2221 2215
2222/*}}} */ 2216/*}}} */
2223 2217
2224bool 2218void
2225rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2226{ 2220{
2227 bool flag = false;
2228 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2229 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2230 2223
2231 for (;;) 2224 for (;;)
2232 { 2225 {
2233 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2234 { 2227 {
2235 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2236 ch = next_char (); 2229 ch = next_char ();
2237 2230
2238 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2239 break; 2232 break;
2240 } 2233 }
2241 2234
2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2243 { 2236 {
2244 if (!seen_input) 2237 if (expect_false (!seen_input))
2245 { 2238 {
2246 seen_input = 1; 2239 seen_input = 1;
2247 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2248 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2249 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
… …
2262 wchar_t *str = buf; 2255 wchar_t *str = buf;
2263 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2264 2257
2265 for (;;) 2258 for (;;)
2266 { 2259 {
2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2268 break; 2261 break;
2269 2262
2270 *str++ = ch; 2263 *str++ = ch;
2271 2264
2272 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2273 { 2266 {
2274 if (ch == C0_LF) 2267 if (ch == C0_LF)
2275 nlines++; 2268 nlines++;
2276 2269
2277 refresh_count++; 2270 refresh_count++;
2278 2271
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2273 {
2281 refresh_count = 0; 2274 refresh_count = 0;
2282 2275
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2276 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2277 {
2285 refreshnow = true; 2278 refreshnow = true;
2286 ch = NOCHAR; 2279 ch = NOCHAR;
2287 break; 2280 break;
2288 } 2281 }
… …
2326 * What the heck we'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2327 * if skipScroll is enabled. 2320 * if skipScroll is enabled.
2328 */ 2321 */
2329 if (refreshnow) 2322 if (refreshnow)
2330 { 2323 {
2331 flag = true;
2332 scr_refresh (); 2324 scr_refresh ();
2333 want_refresh = 1; 2325 want_refresh = 1;
2334 } 2326 }
2335
2336 } 2327 }
2337 else 2328 else
2338 { 2329 {
2339 try 2330 try
2340 { 2331 {
… …
2348 } 2339 }
2349 2340
2350 ch = NOCHAR; 2341 ch = NOCHAR;
2351 } 2342 }
2352 } 2343 }
2353
2354 return flag;
2355} 2344}
2356 2345
2357// read the next character 2346// read the next character
2358wchar_t 2347wchar_t
2359rxvt_term::next_char () NOTHROW 2348rxvt_term::next_char () NOTHROW
2360{ 2349{
2361 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2362 { 2351 {
2363 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2365 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2366 2355
2367 wchar_t wc; 2356 wchar_t wc;
2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2369 2358
… …
2373 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2374 break; 2363 break;
2375 } 2364 }
2376 2365
2377 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 }
2379 2371
2380 // assume wchar == unicode 2372 // assume wchar == unicode
2381 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2382 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2383 } 2375 }
… …
2427/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2428#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2429FILE * 2421FILE *
2430rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2431{ 2423{
2432 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2433 2425
2434 if (stream == NULL) 2426 if (stream == NULL)
2435 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2436 2428
2437 return stream; 2429 return stream;
… …
2448 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2449 */ 2441 */
2450void 2442void
2451rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2452{ 2444{
2453 int done; 2445 FILE *fd = popen_printer ();
2454 FILE *fd;
2455 2446
2456 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2457 return; 2448 return;
2458 2449
2459 /* 2450 /*
2460 * Send all input to the printer until either ESC[4i or ESC[?4i 2451 * Send all input to the printer until either ESC[4i or ESC[?4i
2461 * is received. 2452 * is received.
2462 */ 2453 */
2463 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2464 { 2455 {
2465 unsigned char buf[8]; 2456 unsigned char buf[8];
2466 unicode_t ch; 2457 unicode_t ch;
2467 unsigned int i, len; 2458 unsigned int i, len;
2468 2459
… …
2499 } 2490 }
2500 } 2491 }
2501 2492
2502 pclose_printer (fd); 2493 pclose_printer (fd);
2503} 2494}
2504#endif /* PRINTPIPE */ 2495#endif /* PRINTPIPE */
2505/*}}} */ 2496/*}}} */
2506 2497
2507/* *INDENT-OFF* */ 2498/* *INDENT-OFF* */
2508enum { 2499enum {
2509 C1_40 = 0x40, 2500 C1_40 = 0x40,
… …
2613 break; 2604 break;
2614 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2616 break; 2607 break;
2617 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
2618 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
2619 break; 2610 break;
2620 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
2621 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
2622 /* unimplemented */ 2613 /* unimplemented */
2623 break; 2614 break;
… …
2677 scr_forwardindex (); 2668 scr_forwardindex ();
2678 break; 2669 break;
2679#endif 2670#endif
2680 case '=': 2671 case '=':
2681 case '>': 2672 case '>':
2682 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
2683 break; 2674 break;
2684 2675
2685 case C1_40: 2676 case C1_40:
2686 cmd_getc (); 2677 cmd_getc ();
2687 break; 2678 break;
… …
2691 2682
2692 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2693 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2694 { 2685 {
2695 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2697 } 2688 }
2698 break; 2689 break;
2699 2690
2700 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2701 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
… …
2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2727 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2729 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
2730 2721
2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2732 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
2733 process_csi_seq (); 2724 process_csi_seq ();
2734 break; 2725 break;
2735 2726
2736 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2737 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
2738 process_osc_seq (); 2729 process_osc_seq ();
2739 break; 2730 break;
2740 2731
2741 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2742 case 'c': 2733 case 'c':
2743 mbstate.reset (); 2734 mbstate.reset ();
2744 scr_poweron (); 2735 scr_poweron ();
2745 scrollbar_show (1); 2736 scrollBar.show (1);
2746 break; 2737 break;
2747 2738
2748 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2739 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2749 case 'n': 2740 case 'n':
2750 scr_charset_choose (2); 2741 scr_charset_choose (2);
… …
2770 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2771 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2772 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2773}; 2764};
2774 2765
2775#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2776 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2777 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2778#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2779 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2780 2771
2781const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2782 { 2773 {
2783 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2784 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2785 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2786 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2801 2792
2802 nargs = 0; 2793 nargs = 0;
2803 2794
2804 priv = 0; 2795 priv = 0;
2805 ch = cmd_getc (); 2796 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2798 {
2807 { /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
2808 priv = ch; 2800 priv = ch;
2809 ch = cmd_getc (); 2801 ch = cmd_getc ();
2810 } 2802 }
2811 2803
2812 /* read any numerical arguments */ 2804 /* read any numerical arguments */
… …
2855 { 2847 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2848 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2849 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 // 2850 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2851 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2852 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // that we do not support xterm mouse reporting (should be 95 when we do). 2853 // versions.
2862 // 2854 //
2863 tt_printf ("\033[>%d;94;0c", 'U'); 2855 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2856 }
2865 break; 2857 break;
2858
2866 case '?': 2859 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2862 break;
2863
2864 case '!':
2865 if (ch == CSI_70)
2866 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset ();
2869
2870 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2870 } 2875 }
2876 break;
2877 }
2878
2871 return; 2879 return;
2872 } 2880 }
2873 2881
2874 switch (ch) 2882 switch (ch)
2875 { 2883 {
… …
3242 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3243 */ 3251 */
3244void 3252void
3245rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3246{ 3254{
3247 char *s;
3248 unicode_t eh;
3249
3250 /* 3255 /*
3251 * Not handled yet 3256 * Not handled yet
3252 */ 3257 */
3258
3259 unicode_t eh;
3253 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3254 if (s) 3261 if (s)
3255 free (s); 3262 free (s);
3256 3263
3257 return; 3264 return;
3258} 3265}
… …
3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3263 */ 3270 */
3264void 3271void
3265rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3266{ 3273{
3267 unicode_t ch, eh;
3268 int arg; 3274 int arg;
3269 3275
3270 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3271 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3272 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3273 3279
3274 if (ch == ';') 3280 if (ch == ';')
3275 { 3281 {
3282 unicode_t eh;
3276 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3277 3284
3278 if (s) 3285 if (s)
3279 { 3286 {
3280 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3304 3311
3305/* 3312/*
3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3307 */ 3314 */
3308void 3315void
3309rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3310{ 3317{
3311 int color; 3318 int color;
3312 char *buf, *name; 3319 char *buf, *name;
3313 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3314 int saveop = op; 3321 int saveop = op;
… …
3355 3362
3356 XFree (value); 3363 XFree (value);
3357 } 3364 }
3358 else 3365 else
3359 { 3366 {
3360 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3361 3368
3362 if (eq) 3369 if (eq)
3363 { 3370 {
3364 *eq = 0; 3371 *eq = 0;
3365 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
… …
3386 *buf++ = '\0'; 3393 *buf++ = '\0';
3387 3394
3388 process_color_seq (op, color, name, resp); 3395 process_color_seq (op, color, name, resp);
3389 } 3396 }
3390 break; 3397 break;
3398 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3399 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3400 process_color_seq (op, Color_fg, str, resp);
3393 break; 3401 break;
3402 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3403 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3404 process_color_seq (op, Color_bg, str, resp);
3396 break; 3405 break;
3397#ifndef NO_CURSORCOLOR 3406#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3407 case XTerm_Color_cursor:
… …
3403 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3404 break; 3413 break;
3405 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3406 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3407 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3408#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3409 case XTerm_Color_RV:
3410 process_color_seq (op, Color_RV, str, resp);
3411 break;
3412 case Rxvt_Color_BD:
3413 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3414 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3415 break; 3428 break;
3416 case Rxvt_Color_UL:
3417 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3418 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3419 break; 3431 break;
3420 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3421 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3422 break; 3434 break;
3423#endif 3435#endif
3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3424#if ENABLE_TRANSPARENCY 3439#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3440 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3427 { 3442 {
3428 bool changed = false; 3443 bool changed = false;
3444
3429 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3431 else 3447
3432 changed = bgPixmap.unset_tint ();
3433 if (changed) 3448 if (changed)
3434 update_background (); 3449 update_background ();
3435 } 3450 }
3436 3451
3437 break; 3452 break;
3438#endif 3453#endif
3439 3454
3440#if XPM_BACKGROUND 3455#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3443 { 3458 {
3444 char str[256]; 3459 char str[256];
3445 3460
3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3465 }
3451 else 3466 else
3452 { 3467 {
3453 int changed = 0; 3468 int changed = 0;
3454 3469
3455 if (*str != ';') 3470 if (*str != ';')
3456 { 3471 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3460 changed++; 3474 changed++;
3461 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3462 if (str == NULL) 3476 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3464 } 3481 }
3465 while (str) 3482 else
3466 { 3483 {
3467 str++; 3484 str++;
3468 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3469 changed++; 3486 changed++;
3470 str = strchr (str, ';');
3471 } 3487 }
3488
3472 if (changed) 3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3473 update_background (); 3497 update_background ();
3498 }
3474 } 3499 }
3475 break; 3500 break;
3476#endif 3501#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3502
3485 case XTerm_logfile: 3503 case XTerm_logfile:
3486 // TODO, when secure mode? 3504 // TODO, when secure mode?
3487 break; 3505 break;
3488 3506
… …
3555 break; 3573 break;
3556#endif 3574#endif
3557 3575
3558#if ENABLE_PERL 3576#if ENABLE_PERL
3559 case URxvt_perl: 3577 case URxvt_perl:
3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3561 ; // no responses yet
3562 break; 3579 break;
3563#endif 3580#endif
3564 } 3581 }
3565} 3582}
3566/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
3589 { 3606 {
3590 if (mode == 'r') 3607 if (mode == 'r')
3591 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3592 else 3609 else
3593 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3594 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3595 } 3613 }
3596 3614
3597 return state; 3615 return state;
3598} 3616}
3599 3617
… …
3607 static const struct 3625 static const struct
3608 { 3626 {
3609 const int argval; 3627 const int argval;
3610 const unsigned long bit; 3628 const unsigned long bit;
3611 } argtopriv[] = { 3629 } argtopriv[] = {
3612 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3613 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3614 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3615 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3616 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3617 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3618 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3619 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
3620 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3621 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
3622 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3623#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3624 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3625#endif 3644#endif
3626 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3627 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3628 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3629 // 45 margin bell NYI 3649 // 45 margin bell NYI
3630 // 46 start logging 3650 // 46 start logging
3631 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3632 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3633#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3635#endif 3655#endif
3636 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3657 { 1002, PrivMode_MouseBtnEvent },
3638 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3658 { 1003, PrivMode_MouseAnyEvent },
3639 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3642 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3674 { 2004, PrivMode_BracketPaste },
3649 }; 3675 };
3650 3676
3651 if (nargs == 0) 3677 if (nargs == 0)
3652 return; 3678 return;
3653 3679
… …
3660 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3661 { 3687 {
3662 state = -1; 3688 state = -1;
3663 3689
3664 /* basic handling */ 3690 /* basic handling */
3665 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3666 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3667 { 3693 {
3668 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3669 break; 3695 break;
3670 } 3696 }
… …
3678 3704
3679 scr_touch (true); 3705 scr_touch (true);
3680 break; 3706 break;
3681#endif 3707#endif
3682 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
3683 case 1049:
3684 if (option (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
3685 if (mode == 0) 3710 if (mode == 0)
3686 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
3687 else if (mode == 1) 3712 else if (mode == 1)
3688 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
… …
3697 case 2: /* VT52 mode */ 3722 case 2: /* VT52 mode */
3698 /* oddball mode. should be set regardless of set/reset 3723 /* oddball mode. should be set regardless of set/reset
3699 * parameter. Return from VT52 mode with an ESC < from 3724 * parameter. Return from VT52 mode with an ESC < from
3700 * within VT52 mode 3725 * within VT52 mode
3701 */ 3726 */
3702 PrivMode (1, PrivMode_vt52); 3727 set_privmode (PrivMode_vt52, 1);
3703 break; 3728 break;
3704 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3707 break; 3732 break;
3708 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
3710 break; 3735 break;
3711 case 5: /* reverse video */ 3736 case 5: /* reverse video */
… …
3718 scr_autowrap (state); 3743 scr_autowrap (state);
3719 break; 3744 break;
3720 /* case 8: - auto repeat, can't do on a per window basis */ 3745 /* case 8: - auto repeat, can't do on a per window basis */
3721 case 9: /* X10 mouse reporting */ 3746 case 9: /* X10 mouse reporting */
3722 if (state) /* orthogonal */ 3747 if (state) /* orthogonal */
3723 priv_modes &= ~PrivMode_MouseX11; 3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3749 break;
3725#ifdef scrollBar_esc 3750#ifdef scrollBar_esc
3726 case scrollBar_esc: 3751 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3752 if (scrollBar.map (state))
3728 { 3753 {
3729 resize_all_windows (0, 0, 0); 3754 resize_all_windows (0, 0, 0);
3730 scr_touch (true); 3755 scr_touch (true);
3731 } 3756 }
3732 break; 3757 break;
… …
3741 break; 3766 break;
3742 /* case 66: - application key pad */ 3767 /* case 66: - application key pad */
3743 /* case 67: - backspace key */ 3768 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3769 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3770 if (state) /* orthogonal */
3746 priv_modes &= ~PrivMode_MouseX10; 3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3772 break;
3748#if 0
3749 case 1001: 3773 case 1002:
3750 break; /* X11 mouse highlighting */ 3774 case 1003:
3751#endif 3775 if (state)
3776 {
3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3780 vt_emask_mouse = PointerMotionMask;
3781 }
3782 else
3783 vt_emask_mouse = NoEventMask;
3784
3785 vt_select_input ();
3786 break;
3752 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
3753 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
3754 break; 3789 break;
3755 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
3756 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
3757 break; 3792 break;
3758 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
3759 if (option (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
3760 if (current_screen != PRIMARY) 3795 if (!state)
3761 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
3762 scr_change_screen (state); 3798 scr_change_screen (state);
3763 break; 3799 break;
3764 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3802 if (state)
3803 scr_cursor (SAVE);
3804
3765 scr_change_screen (state); 3805 scr_change_screen (state);
3806
3766 if (option (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
3767 if (current_screen != PRIMARY) 3808 if (state)
3768 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
3769 break; 3812 break;
3770 default: 3813 default:
3771 break; 3814 break;
3772 } 3815 }
3773 } 3816 }
… …
3933rxvt_term::process_graphics () 3976rxvt_term::process_graphics ()
3934{ 3977{
3935 unicode_t ch, cmd = cmd_getc (); 3978 unicode_t ch, cmd = cmd_getc ();
3936 3979
3937 if (cmd == 'Q') 3980 if (cmd == 'Q')
3981 {
3938 { /* query graphics */ 3982 /* query graphics */
3939 tt_printf ("\033G0\012"); /* no graphics */ 3983 tt_printf ("\033G0\012"); /* no graphics */
3940 return; 3984 return;
3941 } 3985 }
3942 /* swallow other graphics sequences until terminating ':' */ 3986 /* swallow other graphics sequences until terminating ':' */
3943 do 3987 do
… …
3966 4010
3967/* ---------------------------------------------------------------------- */ 4011/* ---------------------------------------------------------------------- */
3968/* Write data to the pty as typed by the user, pasted with the mouse, 4012/* Write data to the pty as typed by the user, pasted with the mouse,
3969 * or generated by us in response to a query ESC sequence. 4013 * or generated by us in response to a query ESC sequence.
3970 */ 4014 */
3971const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4015static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3972 4016
3973void 4017void
3974rxvt_term::tt_write (const char *data, unsigned int len) 4018rxvt_term::tt_write (const char *data, unsigned int len)
3975{ 4019{
3976 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4020 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3988 4032
3989 data += written; 4033 data += written;
3990 len -= written; 4034 len -= written;
3991 } 4035 }
3992 4036
3993 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4037 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3994 4038
3995 memcpy (v_buffer + v_buflen, data, len); 4039 memcpy (v_buffer + v_buflen, data, len);
3996 v_buflen += len; 4040 v_buflen += len;
3997 4041
3998 pty_ev.set (EVENT_READ | EVENT_WRITE); 4042 pty_ev.set (ev::READ | ev::WRITE);
3999} 4043}
4000 4044
4001void rxvt_term::pty_write () 4045void rxvt_term::pty_write ()
4002{ 4046{
4003 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4047 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4008 4052
4009 if (v_buflen == 0) 4053 if (v_buflen == 0)
4010 { 4054 {
4011 free (v_buffer); 4055 free (v_buffer);
4012 v_buffer = 0; 4056 v_buffer = 0;
4013 v_buflen = 0;
4014 4057
4015 pty_ev.set (EVENT_READ); 4058 pty_ev.set (ev::READ);
4016 return; 4059 return;
4017 } 4060 }
4018 4061
4019 memmove (v_buffer, v_buffer + written, v_buflen); 4062 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4063 }
4021 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4064 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4022 pty_ev.set (EVENT_READ); 4065 pty_ev.set (ev::READ);
4023} 4066}
4024 4067
4025/*----------------------- end-of-file (C source) -----------------------*/ 4068/*----------------------- end-of-file (C source) -----------------------*/
4026 4069

Diff Legend

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