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.333 by ayin, Tue Jun 26 09:55:22 2007 UTC vs.
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 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.
… …
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
… …
519# endif 615# endif
520 return; 616 return;
521 } 617 }
522 else 618 else
523 { 619 {
524# if ENABLE_OVERLAY 620# if ISO_14755
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 635# endif
539 } 636 }
540#endif 637#endif
… …
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 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
553 newlen = 1; 689 newlen = 0;
554 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:
555 { 773 {
556#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
557 case XK_BackSpace: 775 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 777 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 778 newlen = 0;
840 break;
841 } 779 }
842 780 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
846 785
847 /* 786 /*
848 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
849 */ 788 */
850#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
934#if ENABLE_FRILLS || ISO_14755 873#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 874 // ISO 14755 support
936 if (iso14755buf) 875 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 876 if (iso14755buf & ISO_14755_52)
938 { 877 {
939# if ENABLE_OVERLAY 878# if ISO_14755
940 scr_overlay_off (); 879 scr_overlay_off ();
941# endif 880# endif
942# if ISO_14755 881# if ISO_14755
943 // iso14755 part 5.2 handling: release time 882 // iso14755 part 5.2 handling: release time
944 // first: controls 883 // first: controls
… …
950 commit_iso14755 (); 889 commit_iso14755 ();
951 890
952 return; 891 return;
953 } 892 }
954 893
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 895 if (i[0] == keysym)
957 { 896 {
958 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 898 commit_iso14755 ();
960 899
… …
967 906
968 return; 907 return;
969 } 908 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 909 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 910 {
972# if ENABLE_OVERLAY 911# if ISO_14755
973 scr_overlay_off (); 912 scr_overlay_off ();
974# endif 913# endif
975 if (iso14755buf & ISO_14755_51) 914 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 915 commit_iso14755 ();
977#if ISO_14755 916#if ISO_14755
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
999#endif 938#endif
1000} 939}
1001 940
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 941void
1036rxvt_term::flush () 942rxvt_term::flush ()
1037{ 943{
1038 flush_ev.stop (); 944 flush_ev.stop ();
1039 945
1040#ifdef ENABLE_TRANSPARENCY 946#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 947 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 948 {
1043 want_full_refresh = 0; 949 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 950 scr_touch (false);
1046 } 951 }
1047#endif 952#endif
1048 953
1049 if (want_refresh) 954 if (want_refresh)
… …
1085 } 990 }
1086 while (row < end_row); 991 while (row < end_row);
1087 } 992 }
1088 993
1089 scr_refresh (); 994 scr_refresh ();
1090 scrollbar_show (1); 995 scrollBar.show (1);
1091#ifdef USE_XIM 996#ifdef USE_XIM
1092 IMSendSpot (); 997 IMSendSpot ();
1093#endif 998#endif
1094 } 999 }
1095 1000
1096 display->flush (); 1001 display->flush ();
1097} 1002}
1098 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1099void 1005void
1100rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::refresh_check ()
1101{ 1007{
1102 make_current (); 1008 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1010
1104 display->flush (); 1011 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1012}
1109 1013
1110void 1014void
1111rxvt_term::flush_cb (time_watcher &w) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1016{
1113 make_current (); 1017 make_current ();
1114 1018
1115 refresh_count = 0; 1019 refresh_count = 0;
1116 flush (); 1020 flush ();
1117} 1021}
1118 1022
1119#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1120void 1024void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1025rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1026{
1123 hidden_cursor = !hidden_cursor; 1027 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1028 want_refresh = 1;
1125 1029 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1030}
1128#endif 1031#endif
1129 1032
1130#ifdef TEXT_BLINK 1033#ifdef TEXT_BLINK
1131void 1034void
1132rxvt_term::text_blink_cb (time_watcher &w) 1035rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1036{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1037 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1038 {
1136 hidden_text = !hidden_text; 1039 hidden_text = !hidden_text;
1137 want_refresh = 1; 1040 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1041 refresh_check ();
1139 } 1042 }
1043 else
1044 w.stop ();
1140} 1045}
1141#endif 1046#endif
1142 1047
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1049void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1051{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1054 {
1150 want_refresh = 1; 1055 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1056 refresh_check ();
1152 } 1057 }
1058 else
1059 w.stop ();
1153} 1060}
1154#endif 1061#endif
1155 1062
1156#ifdef SELECTION_SCROLLING 1063#ifdef SELECTION_SCROLLING
1157void 1064void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1066{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1068 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1070 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 refresh_check ();
1165 } 1072 }
1073 else
1074 w.stop ();
1166} 1075}
1167#endif 1076#endif
1168 1077
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1079void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1080rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1081{
1173 if (mouse_slip_wheel_speed == 0 1082 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1083 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1084 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1085 refresh_check ();
1086 }
1087
1088 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1089 {
1090 mouse_slip_wheel_speed = 0;
1091 w.stop ();
1182 } 1092 }
1183} 1093}
1184#endif 1094#endif
1185 1095
1186#if LINUX_YIELD_HACK 1096#if LINUX_YIELD_HACK
1187static struct event_handler 1097static struct event_handler
1188{ 1098{
1189 check_watcher yield_ev; 1099 ev::prepare yield_ev;
1190 1100
1191 void yield_cb (check_watcher &w) 1101 void yield_cb (ev::prepare &w, int revents)
1192 { 1102 {
1193 // this should really be sched_yield(), but the linux guys thought 1103 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1104 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is 1105 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1106 // allowed by the sus... as is returning ENOSYS.
1107 // since the linux guys additionally thought that breaking the only
1108 // known workaround against their unusable sched_yield hack is cool,
1109 // we just nanosleep a bit and hope for the best.
1197 1110
1198 struct timespec ts = { 0, 0 }; 1111 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1112 nanosleep (&ts, 0);
1200 1113
1201 w.stop (); 1114 w.stop ();
1202 } 1115 }
1203 1116
… …
1206 { 1119 {
1207 } 1120 }
1208} event_handler; 1121} event_handler;
1209#endif 1122#endif
1210 1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1154}
1155#endif
1156
1211bool 1157bool
1212rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1213{ 1159{
1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1215 1161
1216 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1217 { 1163
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1219 n = 0;
1220 } 1165 {
1221 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1223 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1224 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1225 1171
1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1227 1173
1228 if (r > 0) 1174 if (r > 0)
1229 { 1175 {
1230 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1231 return true; 1177 return true;
… …
1247 1193
1248 return false; 1194 return false;
1249} 1195}
1250 1196
1251void 1197void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1199{
1254 make_current (); 1200 make_current ();
1255 1201
1256 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1205 cmd_parse ();
1260 break;
1261 1206
1262 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1263 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1264} 1211}
1265 1212
1266void 1213void
1267rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1268{ 1215{
… …
1271 1218
1272#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1220 hidden_pointer = 0;
1274 1221
1275 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1277#endif 1224#endif
1278} 1225}
1279 1226
1280#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1281void 1228void
… …
1289 1236
1290 hidden_pointer = 1; 1237 hidden_pointer = 1;
1291} 1238}
1292 1239
1293void 1240void
1294rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1242{
1296 make_current (); 1243 make_current ();
1297 1244
1298 pointer_blank (); 1245 pointer_blank ();
1299} 1246}
… …
1302void 1249void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1251{
1305 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1306 int x, y; 1253 int x, y;
1254 int code = 32;
1307 1255
1308 x = ev.x; 1256 x = Pixel2Col (ev.x) + 1;
1309 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1310 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1311 1268
1312 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1313 button_number = 3; 1270 button_number = 3;
1314 else 1271 else
1315 { 1272 {
1316 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1318 if (button_number >= 3) 1275 if (button_number >= 3)
1319 button_number += (64 - 3); 1276 button_number += 64 - 3;
1320 } 1277 }
1321 1278
1322 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1323 { 1280 {
1324 /* 1281 /*
… …
1356 fputc ('A', stderr); 1313 fputc ('A', stderr);
1357 if (key_state & 32) 1314 if (key_state & 32)
1358 fputc ('2', stderr); 1315 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1317 button_number,
1361 x + 1, 1318 x,
1362 y + 1); 1319 y);
1363#endif 1320#endif
1364 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1365 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1336 code + button_number + key_state,
1367 (32 + x + 1), 1337 32 + x,
1368 (32 + y + 1)); 1338 32 + y);
1369} 1339}
1370 1340
1371/*{{{ process an X event */ 1341/*{{{ process an X event */
1372void 1342void
1373rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1403 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1404 focus_out ();
1435 } 1405 }
1436#endif 1406#endif
1437 } 1407 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1408 break;
1443 1409
1444 /* 1410 /*
1445 * XXX: this is not the _current_ arrangement 1411 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1412 * Here's my conclusion:
… …
1479 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1446 focus_out ();
1481 break; 1447 break;
1482 1448
1483 case ConfigureNotify: 1449 case ConfigureNotify:
1484 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1485 { 1451 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1488 1473
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1475 {
1491 seen_resize = 1; 1476 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND 1478 }
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1479 else
1480 {
1481#ifdef HAVE_BG_PIXMAP
1482 if (moved)
1495 { 1483 {
1484 if (mapped)
1485 update_background ();
1496 resize_pixmap (); 1486 else
1497 scr_touch (true); 1487 bg_invalidate ();
1498 } 1488 }
1499#endif 1489#endif
1500 } 1490 }
1501 1491
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1493 }
1509 break; 1494 break;
1510 1495
1511 case PropertyNotify: 1496 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1514 && ev.xproperty.state == PropertyNewValue)
1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1516
1517 break; 1498 break;
1518 1499
1519 case SelectionClear: 1500 case SelectionClear:
1520 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1521 break;
1522
1523 case SelectionNotify:
1524 if (selection_wait == Sel_normal)
1525 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1526 break; 1502 break;
1527 1503
1528 case SelectionRequest: 1504 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1530 break; 1506 break;
1531 1507
1532 case MapNotify: 1508 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a
1511 * non-reparenting window manager. In those cases we never get first
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1514 * reparenting.
1515 * We should not render background immediately, as there could be several
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1517 * by scheduling background redraw as soon as we can, but giving a short
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025);
1524#endif
1533 mapped = 1; 1525 mapped = 1;
1534#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1527 text_blink_ev.start ();
1536#endif 1528#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1530 break;
1539 1531
1540 case UnmapNotify: 1532 case UnmapNotify:
… …
1542#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1544#endif 1536#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1538 break;
1547
1548#ifdef ENABLE_TRANSPARENCY
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* ENABLE_TRANSPARENCY */
1553 1539
1554 case GraphicsExpose: 1540 case GraphicsExpose:
1555 case Expose: 1541 case Expose:
1556 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1557 { 1543 {
1558 do 1544 do
1545 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1548 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1550
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1552
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1557 }
1568 1558
1569 want_refresh = 1; 1559 want_refresh = 1;
1570 } 1560 }
1571 else 1561 else
1572 { 1562 {
… …
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1566 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1568 ;
1579 1569
1580 if (isScrollbarWindow (ev.xany.window)) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1571 {
1582 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1583 scrollbar_show (0); 1573 scrollBar.show (0);
1584 } 1574 }
1585
1586#ifdef ENABLE_TRANSPARENCY
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1575 }
1591 break; 1576 break;
1592 1577
1593 case MotionNotify: 1578 case MotionNotify:
1594#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1580 if (hidden_pointer)
1596 pointer_unblank (); 1581 pointer_unblank ();
1597#endif 1582#endif
1583 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1584 || priv_modes & PrivMode_MouseAnyEvent)
1585 mouse_report (ev.xbutton);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1587 break;
1600 1588
1601 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1602 { 1590 {
… …
1636 int dist; 1624 int dist;
1637 1625
1638 /* don't clobber the current delay if we are 1626 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1627 * already in the middle of scrolling.
1640 */ 1628 */
1641 if (!sel_scroll_ev.active) 1629 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1630 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1631
1644 /* save the event params so we can highlight 1632 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1633 * the selection in the pending-scroll loop
1646 */ 1634 */
1647 selection_save_x = ev.xbutton.x; 1635 selection_save_x = ev.xbutton.x;
… …
1669 else 1657 else
1670 { 1658 {
1671 /* we are within the text window, so we 1659 /* we are within the text window, so we
1672 * shouldn't be scrolling 1660 * shouldn't be scrolling
1673 */ 1661 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1662 sel_scroll_ev.stop();
1676 } 1663 }
1677#endif 1664#endif
1678#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1679 } 1666 }
1680#endif 1667#endif
1681 } 1668 }
1682 } 1669 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1671 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1687 ; 1674 ;
1688 1675
… …
1690 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1691 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1692 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1693 &unused_mask); 1680 &unused_mask);
1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1695 scrollbar_size ()); 1682 scrollBar.size ());
1696 want_refresh = 1; 1683 want_refresh = 1;
1697 scrollbar_show (1); 1684 scrollBar.show (1);
1698 } 1685 }
1699 break; 1686 break;
1700 } 1687 }
1701 1688
1702#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
… …
1706 { 1693 {
1707 hidden_cursor = 0; 1694 hidden_cursor = 0;
1708 want_refresh = 1; 1695 want_refresh = 1;
1709 } 1696 }
1710 1697
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.again ();
1712 } 1699 }
1713#endif 1700#endif
1714 1701
1715#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1723 1710
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1712 pointer_blank ();
1726 } 1713 }
1727#endif 1714#endif
1715
1716 refresh_check ();
1728} 1717}
1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1729 1734
1730void 1735void
1731rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1732{ 1737{
1733 if (!focus) 1738 if (!focus)
1734 { 1739 {
1735 focus = 1; 1740 focus = 1;
1736 want_refresh = 1; 1741 want_refresh = 1;
1737 1742
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM 1743#if USE_XIM
1741 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1742 { 1745 {
1743 IMSetPosition (); 1746 IMSetPosition ();
1744 XSetICFocus (Input_Context); 1747 XSetICFocus (Input_Context);
1745 } 1748 }
1746#endif 1749#endif
1747#if CURSOR_BLINK 1750#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1751 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1752 cursor_blink_ev.again ();
1750#endif 1753#endif
1751#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1753 { 1756 {
1754 pix_colors = pix_colors_focused; 1757 pix_colors = pix_colors_focused;
1755 scr_recolour (); 1758 scr_recolour ();
1756 } 1759 }
1757#endif 1760#endif
1758#if ENABLE_FRILLS 1761#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1762 if (option (Opt_urgentOnBell))
1760 { 1763 set_urgency (0);
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif 1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1771 } 1767 }
1772} 1768}
1773 1769
1774void 1770void
1775rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1777 if (focus) 1773 if (focus)
1778 { 1774 {
1779 focus = 0; 1775 focus = 0;
1780 want_refresh = 1; 1776 want_refresh = 1;
1781 1777
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1783 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1784#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1783 if (iso14755buf)
1786 { 1784 {
1787 iso14755buf = 0; 1785 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1786# if ISO_14755
1789 scr_overlay_off (); 1787 scr_overlay_off ();
1790# endif 1788# endif
1791 } 1789 }
1792#endif 1790#endif
1793#if USE_XIM 1791#if USE_XIM
… …
1795 XUnsetICFocus (Input_Context); 1793 XUnsetICFocus (Input_Context);
1796#endif 1794#endif
1797#if CURSOR_BLINK 1795#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1796 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1797 cursor_blink_ev.stop ();
1798
1800 hidden_cursor = 0; 1799 hidden_cursor = 0;
1801#endif 1800#endif
1802#if OFF_FOCUS_FADING 1801#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1802 if (rs[Rs_fade])
1804 { 1803 {
1805 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1806 scr_recolour (); 1805 scr_recolour ();
1807 } 1806 }
1808#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809 } 1810 }
1810} 1811}
1811 1812
1812void 1813void
1813rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
… …
1838 case PropertyNotify: 1839 case PropertyNotify:
1839 /* 1840 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1841 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1842 */ 1843 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1846 {
1847 bg_set_root_pixmap ();
1848 update_background ();
1849 }
1846 1850
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1851 break;
1852 } 1852 }
1853# endif 1853# endif
1854
1855 refresh_check ();
1854} 1856}
1855#endif 1857#endif
1856 1858
1857void 1859void
1858rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1889 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1890 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1891#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1892 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1893 { 1895 {
1894 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1895 MEvent.clicks++; 1897 MEvent.clicks++;
1896 1898
1897 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1898 { 1900 {
1899 /* only report double clicks */ 1901 /* only report double clicks */
… …
1913 mouse_report (ev); 1915 mouse_report (ev);
1914 } 1916 }
1915#else 1917#else
1916 MEvent.button = ev.button; 1918 MEvent.button = ev.button;
1917 mouse_report (ev); 1919 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1920#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1921
1920 } 1922 }
1921 else 1923 else
1922 { 1924 {
1923 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
… …
1971 } 1973 }
1972 1974
1973 /* 1975 /*
1974 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1975 */ 1977 */
1976 if (isScrollbarWindow (ev.window)) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 1979 {
1978 scrollBar.setIdle (); 1980 page_dirn direction = NO_DIR;
1981
1982 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */
1986
1987 scrollBar.state = STATE_IDLE;
1979 /* 1988 /*
1980 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 1990 * move up if mouse is above slider
1982 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1983 * 1992 *
… …
1992 /* 2001 /*
1993 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1996 */ 2005 */
1997 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 2008 else if (direction == DN)
2003 && scrollbarnext_dnButton (ev.y))
2004 || (scrollBar.style == R_SB_RXVT
2005 && scrollbarrxvt_dnButton (ev.y)))
2006 tt_printf ("\033[B"); 2009 tt_printf ("\033[B");
2007 else 2010 else
2008 switch (ev.button) 2011 switch (ev.button)
2009 { 2012 {
2010 case Button2: 2013 case Button2:
… …
2017 tt_printf ("\033[5~"); 2020 tt_printf ("\033[5~");
2018 break; 2021 break;
2019 } 2022 }
2020 } 2023 }
2021 else 2024 else
2022#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
2023
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 2026 {
2029 if (scrollbarnext_upButton (ev.y)) 2027 if (direction != NO_DIR)
2030 upordown = -1; /* up */
2031 else if (scrollbarnext_dnButton (ev.y))
2032 upordown = 1; /* down */
2033 }
2034 else if (scrollBar.style == R_SB_RXVT)
2035 {
2036 if (scrollbarrxvt_upButton (ev.y))
2037 upordown = -1; /* up */
2038 else if (scrollbarrxvt_dnButton (ev.y))
2039 upordown = 1; /* down */
2040 }
2041 if (upordown)
2042 { 2028 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2030 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 2032#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
2047 { 2034 {
2048 if (upordown < 0) 2035 if (direction == UP)
2049 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
2050 else 2037 else
2051 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
2052 } 2039 }
2053 } 2040 }
2054 else 2041 else
2055 switch (ev.button) 2042 switch (ev.button)
2056 { 2043 {
2057 case Button2: 2044 case Button2:
2058 switch (scrollbar_align) 2045 switch (scrollBar.align)
2059 { 2046 {
2060 case R_SB_ALIGN_TOP: 2047 case R_SB_ALIGN_TOP:
2061 csrO = 0; 2048 csrO = 0;
2062 break; 2049 break;
2063 case R_SB_ALIGN_CENTRE: 2050 case R_SB_ALIGN_CENTRE:
… …
2069 } 2056 }
2070 2057
2071 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2072 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2075 2062
2076 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2077 break; 2064 break;
2078 2065
2079 case Button1: 2066 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2069 /* FALLTHROUGH */
2083 2070
2084 case Button3: 2071 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
… …
2095 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2096# else 2083# else
2097 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2098# endif 2085# endif
2099 else 2086 else
2100 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2101 } 2088 }
2102 else 2089 else
2103 { 2090 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2092 (nrow
2106 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2107 / scrollbar_size ())); 2094 / scrollBar.size ()));
2108 } 2095 }
2109 2096
2110 break; 2097 break;
2111 } 2098 }
2112 } 2099 }
… …
2122 2109
2123 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2111 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2113
2127 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2115 {
2129 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2117 scrollBar.show (0);
2131 } 2118 }
2132 2119
2133#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2136#endif 2122#endif
2137 2123
2138 if (ev.window == vt) 2124 if (ev.window == vt)
2139 { 2125 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2164 mouse_report (ev); 2150 mouse_report (ev);
2165 } 2151 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2152#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2153 MEvent.button = AnyButton;
2168 mouse_report (ev); 2154 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2155#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2156 return;
2171 } 2157 }
2172 2158
2173 /* 2159 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2160 * dumb hack to compensate for the failure of click-and-drag
… …
2186 selection_make (ev.time); 2172 selection_make (ev.time);
2187 break; 2173 break;
2188 2174
2189 case Button2: 2175 case Button2:
2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2178 break;
2193 2179
2194#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2195 case Button4: 2181 case Button4:
2196 case Button5: 2182 case Button5:
… …
2212 { 2198 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2199 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2202
2217 if (slip_wheel_ev.at < NOW) 2203 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2205 }
2222 else 2206 else
2207# endif
2223 { 2208 {
2224# endif
2225 scr_page (v, i); 2209 scr_page (v, i);
2226 scrollbar_show (1); 2210 scrollBar.show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2211 }
2229# endif
2230 } 2212 }
2231 break; 2213 break;
2232#endif 2214#endif
2233 } 2215 }
2234 } 2216 }
2235} 2217}
2236 2218
2237/*}}} */ 2219/*}}} */
2238 2220
2239bool 2221void
2240rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2241{ 2223{
2242 bool flag = false;
2243 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2244 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2245 2226
2246 for (;;) 2227 for (;;)
2247 { 2228 {
2248 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2249 { 2230 {
2250 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2251 ch = next_char (); 2232 ch = next_char ();
2252 2233
2253 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2254 break; 2235 break;
2255 } 2236 }
2256 2237
2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2258 { 2239 {
2259 if (!seen_input) 2240 if (expect_false (!seen_input))
2260 { 2241 {
2261 seen_input = 1; 2242 seen_input = 1;
2262 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2263 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2264 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2277 wchar_t *str = buf; 2258 wchar_t *str = buf;
2278 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2279 2260
2280 for (;;) 2261 for (;;)
2281 { 2262 {
2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2283 break; 2264 break;
2284 2265
2285 *str++ = ch; 2266 *str++ = ch;
2286 2267
2287 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2288 { 2269 {
2289 if (ch == C0_LF) 2270 if (ch == C0_LF)
2290 nlines++; 2271 nlines++;
2291 2272
2292 refresh_count++; 2273 refresh_count++;
2293 2274
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2275 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2276 {
2296 refresh_count = 0; 2277 refresh_count = 0;
2297 2278
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2279 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2280 {
2300 refreshnow = true; 2281 refreshnow = true;
2301 ch = NOCHAR; 2282 ch = NOCHAR;
2302 break; 2283 break;
2303 } 2284 }
… …
2341 * What the heck we'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2342 * if skipScroll is enabled. 2323 * if skipScroll is enabled.
2343 */ 2324 */
2344 if (refreshnow) 2325 if (refreshnow)
2345 { 2326 {
2346 flag = true;
2347 scr_refresh (); 2327 scr_refresh ();
2348 want_refresh = 1; 2328 want_refresh = 1;
2349 } 2329 }
2350
2351 } 2330 }
2352 else 2331 else
2353 { 2332 {
2354 try 2333 try
2355 { 2334 {
… …
2363 } 2342 }
2364 2343
2365 ch = NOCHAR; 2344 ch = NOCHAR;
2366 } 2345 }
2367 } 2346 }
2368
2369 return flag;
2370} 2347}
2371 2348
2372// read the next character 2349// read the next character
2373wchar_t 2350wchar_t
2374rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2375{ 2352{
2376 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2377 { 2354 {
2378 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2380 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2381 2358
2382 wchar_t wc; 2359 wchar_t wc;
2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2384 2361
… …
2388 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2389 break; 2366 break;
2390 } 2367 }
2391 2368
2392 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2393 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2394 2374
2395 // assume wchar == unicode 2375 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2397 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2398 } 2378 }
… …
2442/*----------------------------------------------------------------------*/ 2422/*----------------------------------------------------------------------*/
2443#ifdef PRINTPIPE 2423#ifdef PRINTPIPE
2444FILE * 2424FILE *
2445rxvt_term::popen_printer () 2425rxvt_term::popen_printer ()
2446{ 2426{
2447 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2448 2428
2449 if (stream == NULL) 2429 if (stream == NULL)
2450 rxvt_warn ("can't open printer pipe, not printing.\n"); 2430 rxvt_warn ("can't open printer pipe, not printing.\n");
2451 2431
2452 return stream; 2432 return stream;
… …
2463 * simulate attached vt100 printer 2443 * simulate attached vt100 printer
2464 */ 2444 */
2465void 2445void
2466rxvt_term::process_print_pipe () 2446rxvt_term::process_print_pipe ()
2467{ 2447{
2468 int done; 2448 FILE *fd = popen_printer ();
2469 FILE *fd;
2470 2449
2471 if ((fd = popen_printer ()) == NULL) 2450 if (!fd)
2472 return; 2451 return;
2473 2452
2474 /* 2453 /*
2475 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2476 * is received. 2455 * is received.
2477 */ 2456 */
2478 for (done = 0; !done;) 2457 for (int done = 0; !done; )
2479 { 2458 {
2480 unsigned char buf[8]; 2459 unsigned char buf[8];
2481 unicode_t ch; 2460 unicode_t ch;
2482 unsigned int i, len; 2461 unsigned int i, len;
2483 2462
… …
2514 } 2493 }
2515 } 2494 }
2516 2495
2517 pclose_printer (fd); 2496 pclose_printer (fd);
2518} 2497}
2519#endif /* PRINTPIPE */ 2498#endif /* PRINTPIPE */
2520/*}}} */ 2499/*}}} */
2521 2500
2522/* *INDENT-OFF* */ 2501/* *INDENT-OFF* */
2523enum { 2502enum {
2524 C1_40 = 0x40, 2503 C1_40 = 0x40,
… …
2628 break; 2607 break;
2629 case 'Z': /* identify the terminal type */ 2608 case 'Z': /* identify the terminal type */
2630 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2631 break; 2610 break;
2632 case '<': /* turn off VT52 mode */ 2611 case '<': /* turn off VT52 mode */
2633 PrivMode (0, PrivMode_vt52); 2612 set_privmode (PrivMode_vt52, 0);
2634 break; 2613 break;
2635 case 'F': /* use special graphics character set */ 2614 case 'F': /* use special graphics character set */
2636 case 'G': /* use regular character set */ 2615 case 'G': /* use regular character set */
2637 /* unimplemented */ 2616 /* unimplemented */
2638 break; 2617 break;
… …
2692 scr_forwardindex (); 2671 scr_forwardindex ();
2693 break; 2672 break;
2694#endif 2673#endif
2695 case '=': 2674 case '=':
2696 case '>': 2675 case '>':
2697 PrivMode ((ch == '='), PrivMode_aplKP); 2676 set_privmode (PrivMode_aplKP, ch == '=');
2698 break; 2677 break;
2699 2678
2700 case C1_40: 2679 case C1_40:
2701 cmd_getc (); 2680 cmd_getc ();
2702 break; 2681 break;
… …
2706 2685
2707 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2708 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2709 { 2688 {
2710 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2711 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2712 } 2691 }
2713 break; 2692 break;
2714 2693
2715 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2716 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2717 process_graphics (); 2696 // used by original rxvt for rob nations own graphics mode
2697 if (cmd_getc () == 'Q')
2698 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2718 break; 2699 break;
2719 2700
2720 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2721 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2722 scr_set_tab (1); 2703 scr_set_tab (1);
… …
2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2722 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2742 case C1_SCI: /* ESC Z */ 2723 case C1_SCI: /* ESC Z */
2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2724 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2744 break; /* steal obsolete ESC [ c */ 2725 break; /* steal obsolete ESC [ c */
2745 2726
2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2727 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2747 case C1_CSI: /* ESC [ */ 2728 case C1_CSI: /* ESC [ */
2748 process_csi_seq (); 2729 process_csi_seq ();
2749 break; 2730 break;
2750 2731
2751 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2732 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2752 case C1_OSC: /* ESC ] */ 2733 case C1_OSC: /* ESC ] */
2753 process_osc_seq (); 2734 process_osc_seq ();
2754 break; 2735 break;
2755 2736
2756 /* 8.3.106: RESET TO INITIAL STATE */ 2737 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2757 case 'c': 2738 case 'c':
2758 mbstate.reset (); 2739 mbstate.reset ();
2759 scr_poweron (); 2740 scr_poweron ();
2760 scrollbar_show (1); 2741 scrollBar.show (1);
2761 break; 2742 break;
2762 2743
2763 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2744 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2764 case 'n': 2745 case 'n':
2765 scr_charset_choose (2); 2746 scr_charset_choose (2);
… …
2785 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2766 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2786 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2767 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2787 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2768 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2788}; 2769};
2789 2770
2790#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2791 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2792 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2793#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
2794 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2795 2776
2796const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
2797 { 2778 {
2798 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2779 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2799 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2780 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2800 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2781 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2801 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2782 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2810rxvt_term::process_csi_seq () 2791rxvt_term::process_csi_seq ()
2811{ 2792{
2812 unicode_t ch, priv, i; 2793 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2794 unsigned int nargs, p;
2814 int n, ndef; 2795 int n, ndef;
2815 int arg[ESC_ARGS]; 2796 int arg[ESC_ARGS] = { };
2816 2797
2817 for (nargs = ESC_ARGS; nargs > 0;) 2798 nargs = 0;
2818 arg[--nargs] = 0;
2819 2799
2820 priv = 0; 2800 priv = 0;
2821 ch = cmd_getc (); 2801 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2802 if ((ch >= '<' && ch <= '?') || ch == '!')
2803 {
2823 { /* '<' '=' '>' '?' */ 2804 /* '<' '=' '>' '?' '!' */
2824 priv = ch; 2805 priv = ch;
2825 ch = cmd_getc (); 2806 ch = cmd_getc ();
2826 } 2807 }
2827 2808
2828 /* read any numerical arguments */ 2809 /* read any numerical arguments */
… …
2867 switch (priv) 2848 switch (priv)
2868 { 2849 {
2869 case '>': 2850 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2851 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2852 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2853 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2854 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2855 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2856 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2857 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2858 // versions.
2878 // 2859 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2860 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2861 }
2881 break; 2862 break;
2863
2882 case '?': 2864 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2865 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2866 process_terminal_mode (ch, priv, nargs, arg);
2885 break; 2867 break;
2868
2869 case '!':
2870 if (ch == CSI_70)
2871 {
2872 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2873 scr_soft_reset ();
2874
2875 static const int pm_h[] = { 7, 25 };
2876 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2877
2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2886 } 2880 }
2881 break;
2882 }
2883
2887 return; 2884 return;
2888 } 2885 }
2889 2886
2890 switch (ch) 2887 switch (ch)
2891 { 2888 {
… …
3125 { 3122 {
3126 /* 3123 /*
3127 * commands 3124 * commands
3128 */ 3125 */
3129 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3130 XMapWindow (dpy, parent[0]); 3127 XMapWindow (dpy, parent);
3131 break; 3128 break;
3132 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3133 XIconifyWindow (dpy, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent, display->screen);
3134 break; 3131 break;
3135 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3136 XMoveWindow (dpy, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent, args[1], args[2]);
3137 break; 3134 break;
3138 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3140 break; 3137 break;
3141 case 5: /* raise window */ 3138 case 5: /* raise window */
3142 XRaiseWindow (dpy, parent[0]); 3139 XRaiseWindow (dpy, parent);
3143 break; 3140 break;
3144 case 6: /* lower window */ 3141 case 6: /* lower window */
3145 XLowerWindow (dpy, parent[0]); 3142 XLowerWindow (dpy, parent);
3146 break; 3143 break;
3147 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3148 scr_touch (true); 3145 scr_touch (true);
3149 break; 3146 break;
3150 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3161 3158
3162 /* 3159 /*
3163 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3164 */ 3161 */
3165 case 11: /* report window state */ 3162 case 11: /* report window state */
3166 XGetWindowAttributes (dpy, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent, &wattr);
3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3168 break; 3165 break;
3169 case 13: /* report window position */ 3166 case 13: /* report window position */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3171 XTranslateCoordinates (dpy, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent, wattr.root,
3172 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3173 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3174 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3175 break; 3172 break;
3176 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3177 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3179 break; 3176 break;
3180 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3181 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3182 break; 3179 break;
… …
3184 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3185 break; 3182 break;
3186 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3187 { 3184 {
3188 char *s; 3185 char *s;
3189 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent, &s);
3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3191 XFree (s); 3188 XFree (s);
3192 } 3189 }
3193 break; 3190 break;
3194 case 21: /* report window title */ 3191 case 21: /* report window title */
3195 { 3192 {
3196 char *s; 3193 char *s;
3197 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent, &s);
3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3199 XFree (s); 3196 XFree (s);
3200 } 3197 }
3201 break; 3198 break;
3202 } 3199 }
… …
3258 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3255 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3259 */ 3256 */
3260void 3257void
3261rxvt_term::process_dcs_seq () 3258rxvt_term::process_dcs_seq ()
3262{ 3259{
3263 char *s;
3264 unicode_t eh;
3265
3266 /* 3260 /*
3267 * Not handled yet 3261 * Not handled yet
3268 */ 3262 */
3263
3264 unicode_t eh;
3269 s = get_to_st (eh); 3265 char *s = get_to_st (eh);
3270 if (s) 3266 if (s)
3271 free (s); 3267 free (s);
3272 3268
3273 return; 3269 return;
3274} 3270}
… …
3278 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3279 */ 3275 */
3280void 3276void
3281rxvt_term::process_osc_seq () 3277rxvt_term::process_osc_seq ()
3282{ 3278{
3283 unicode_t ch, eh;
3284 int arg; 3279 int arg;
3285 3280
3286 ch = cmd_getc (); 3281 unicode_t ch = cmd_getc ();
3287 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3282 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3288 arg = arg * 10 + (ch - '0'); 3283 arg = arg * 10 + (ch - '0');
3289 3284
3290 if (ch == ';') 3285 if (ch == ';')
3291 { 3286 {
3287 unicode_t eh;
3292 char *s = get_to_st (eh); 3288 char *s = get_to_st (eh);
3293 3289
3294 if (s) 3290 if (s)
3295 { 3291 {
3296 process_xterm_seq (arg, s, eh); 3292 process_xterm_seq (arg, s, eh);
… …
3320 3316
3321/* 3317/*
3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3323 */ 3319 */
3324void 3320void
3325rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3321rxvt_term::process_xterm_seq (int op, char *str, char resp)
3326{ 3322{
3327 int color; 3323 int color;
3328 char *buf, *name; 3324 char *buf, *name;
3329 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3330 int saveop = op; 3326 int saveop = op;
… …
3357 unsigned long bytes_after; 3353 unsigned long bytes_after;
3358 unsigned char *value = 0; 3354 unsigned char *value = 0;
3359 const char *str = ""; 3355 const char *str = "";
3360 3356
3361 if (prop 3357 if (prop
3362 && XGetWindowProperty (dpy, parent[0], 3358 && XGetWindowProperty (dpy, parent,
3363 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3364 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3365 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3366 && actual_type != None 3362 && actual_type != None
3367 && actual_format == 8) 3363 && actual_format == 8)
… …
3371 3367
3372 XFree (value); 3368 XFree (value);
3373 } 3369 }
3374 else 3370 else
3375 { 3371 {
3376 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3372 char *eq = strchr (str, '=');
3377 3373
3378 if (eq) 3374 if (eq)
3379 { 3375 {
3380 *eq = 0; 3376 *eq = 0;
3381 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3382 } 3378 }
3383 else 3379 else
3384 XDeleteProperty (dpy, parent[0], 3380 XDeleteProperty (dpy, parent,
3385 display->atom (str)); 3381 display->atom (str));
3386 } 3382 }
3387 break; 3383 break;
3388 3384
3389 case XTerm_Color: 3385 case XTerm_Color:
… …
3402 *buf++ = '\0'; 3398 *buf++ = '\0';
3403 3399
3404 process_color_seq (op, color, name, resp); 3400 process_color_seq (op, color, name, resp);
3405 } 3401 }
3406 break; 3402 break;
3403 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3404 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3405 process_color_seq (op, Color_fg, str, resp);
3409 break; 3406 break;
3407 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3408 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3409 process_color_seq (op, Color_bg, str, resp);
3412 break; 3410 break;
3413#ifndef NO_CURSORCOLOR 3411#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3412 case XTerm_Color_cursor:
… …
3419 process_color_seq (op, Color_pointer_fg, str, resp); 3417 process_color_seq (op, Color_pointer_fg, str, resp);
3420 break; 3418 break;
3421 case XTerm_Color_pointer_bg: 3419 case XTerm_Color_pointer_bg:
3422 process_color_seq (op, Color_pointer_bg, str, resp); 3420 process_color_seq (op, Color_pointer_bg, str, resp);
3423 break; 3421 break;
3422#ifdef OPTION_HC
3423 case XTerm_Color_HC:
3424 process_color_seq (op, Color_HC, str, resp);
3425 break;
3426 case XTerm_Color_HTC:
3427 process_color_seq (op, Color_HTC, str, resp);
3428 break;
3429#endif
3424#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3425 case XTerm_Color_RV:
3426 process_color_seq (op, Color_RV, str, resp);
3427 break;
3428 case Rxvt_Color_BD:
3429 case URxvt_Color_BD: 3431 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp); 3432 process_color_seq (op, Color_BD, str, resp);
3431 break; 3433 break;
3432 case Rxvt_Color_UL:
3433 case URxvt_Color_UL: 3434 case URxvt_Color_UL:
3434 process_color_seq (op, Color_UL, str, resp); 3435 process_color_seq (op, Color_UL, str, resp);
3435 break; 3436 break;
3436 case URxvt_Color_IT: 3437 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3438 process_color_seq (op, Color_IT, str, resp);
3438 break; 3439 break;
3439#endif 3440#endif
3441 case URxvt_Color_border:
3442 process_color_seq (op, Color_border, str, resp);
3443 break;
3440#if ENABLE_TRANSPARENCY && TINTING 3444#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3445 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3446 process_color_seq (op, Color_tint, str, resp);
3447 {
3448 bool changed = false;
3443 3449
3444 check_our_parents (); 3450 if (ISSET_PIXCOLOR (Color_tint))
3451 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3445 3452
3446 if (am_transparent) 3453 if (changed)
3447 want_full_refresh = want_refresh = 1; 3454 update_background ();
3455 }
3448 3456
3449 break; 3457 break;
3450#endif 3458#endif
3451 3459
3460#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3461 case Rxvt_Pixmap:
3453 { 3462 if (!strcmp (str, "?"))
3454 if (*str != ';')
3455 { 3463 {
3456#if XPM_BACKGROUND 3464 char str[256];
3457 scale_pixmap (""); /* reset to default scaling */ 3465
3458 set_bgPixmap (str); /* change pixmap */ 3466 sprintf (str, "[%dx%d+%d+%d]",
3459 scr_touch (true); 3467 min (h_scale, 32767), min (v_scale, 32767),
3460#endif 3468 min (h_align, 32767), min (v_align, 32767));
3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3470 }
3462 3471 else
3472 {
3463 int changed = 0; 3473 int changed = 0;
3464 3474
3465 while ((str = strchr (str, ';')) != NULL) 3475 if (*str != ';')
3466 { 3476 {
3477 if (bg_set_file (str)) /* change pixmap */
3478 {
3479 changed++;
3480 str = strchr (str, ';');
3481 if (str == NULL)
3482 bg_set_default_geometry ();
3483 else
3484 bg_set_geometry (str+1);
3485 }
3486 }
3487 else
3488 {
3467 str++; 3489 str++;
3468#if XPM_BACKGROUND 3490 if (bg_set_geometry (str, true))
3469 changed += scale_pixmap (str); 3491 changed++;
3470#endif
3471 } 3492 }
3472 3493
3473 if (changed) 3494 if (changed)
3474 { 3495 {
3475#ifdef XPM_BACKGROUND 3496 if (bg_window_position_sensitive ())
3476 resize_pixmap (); 3497 {
3477 scr_touch (true); 3498 int x, y;
3478#endif 3499 get_window_origin (x, y);
3500 bg_set_position (x, y);
3501 }
3502 update_background ();
3479 } 3503 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 } 3504 }
3485 break; 3505 break;
3486 3506#endif
3487 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str);
3489 break;
3490 case Rxvt_restoreBG:
3491 set_window_color (Color_bg, str);
3492 break;
3493 3507
3494 case XTerm_logfile: 3508 case XTerm_logfile:
3495 // TODO, when secure mode? 3509 // TODO, when secure mode?
3496 break; 3510 break;
3497 3511
… …
3564 break; 3578 break;
3565#endif 3579#endif
3566 3580
3567#if ENABLE_PERL 3581#if ENABLE_PERL
3568 case URxvt_perl: 3582 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3583 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3570 ; // no responses yet
3571 break; 3584 break;
3572#endif 3585#endif
3573 } 3586 }
3574} 3587}
3575/*----------------------------------------------------------------------*/ 3588/*----------------------------------------------------------------------*/
… …
3598 { 3611 {
3599 if (mode == 'r') 3612 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3613 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3614 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3615 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3616
3617 set_privmode (bit, state);
3604 } 3618 }
3605 3619
3606 return state; 3620 return state;
3607} 3621}
3608 3622
… …
3612{ 3626{
3613 unsigned int i, j; 3627 unsigned int i, j;
3614 int state; 3628 int state;
3615 3629
3616 static const struct 3630 static const struct
3617 { 3631 {
3618 const int argval; 3632 const int argval;
3619 const unsigned long bit; 3633 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3634 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3635 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3636 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3637 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, 3638 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, 3639 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, 3640 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, 3641 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, bi-directional support mode 3642 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3643 { 9, PrivMode_MouseX10 },
3632 // 18, 19 printing-related 3644 // 18 end FF to printer after print screen
3645 // 19 Print screen prints full screen/scroll region
3633 { 25, PrivMode_VisibleCursor }, 3646 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3634#ifdef scrollBar_esc 3647#ifdef scrollBar_esc
3635 { scrollBar_esc, PrivMode_scrollBar }, 3648 { scrollBar_esc, PrivMode_scrollBar },
3636#endif 3649#endif
3637 { 35, PrivMode_ShiftKeys }, // rxvt extension 3650 { 35, PrivMode_ShiftKeys }, // rxvt extension
3651 // 38, tektronix mode // DECTEK
3638 { 40, PrivMode_132OK }, 3652 { 40, PrivMode_132OK },
3639 // 41 xterm more fixes NYI 3653 // 41 xterm more fixes NYI
3640 // 45 margin bell NYI 3654 // 45 margin bell NYI
3641 // 46 start logging 3655 // 46 start logging
3642 { 47, PrivMode_Screen }, 3656 { 47, PrivMode_Screen },
3643 { 66, PrivMode_aplKP }, 3657 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3644#ifndef NO_BACKSPACE_KEY 3658#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3659 { 67, PrivMode_BackSpace }, // DECBKM
3646#endif 3660#endif
3647 { 1000, PrivMode_MouseX11 }, 3661 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3662 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3663 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3664#if ENABLE_FRILLS
3665 { 1005, PrivMode_ExtModeMouse },
3666#endif
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3667 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3668 { 1011, PrivMode_Keypress }, // rxvt extension
3669#if ENABLE_FRILLS
3670 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3671#endif
3653 // 1035 enable modifiers for alt, numlock NYI 3672 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3673 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3674 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3675 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3676 // 1048 save and restore cursor, implemented in code
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3677 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3678 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3679 { 2004, PrivMode_BracketPaste },
3660 }; 3680 };
3661 3681
3662 if (nargs == 0) 3682 if (nargs == 0)
3663 return; 3683 return;
3664 3684
… …
3671 for (i = 0; i < nargs; i++) 3691 for (i = 0; i < nargs; i++)
3672 { 3692 {
3673 state = -1; 3693 state = -1;
3674 3694
3675 /* basic handling */ 3695 /* basic handling */
3676 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3677 if (argtopriv[j].argval == arg[i]) 3697 if (argtopriv[j].argval == arg[i])
3678 { 3698 {
3679 state = privcases (mode, argtopriv[j].bit); 3699 state = privcases (mode, argtopriv[j].bit);
3680 break; 3700 break;
3681 } 3701 }
… …
3689 3709
3690 scr_touch (true); 3710 scr_touch (true);
3691 break; 3711 break;
3692#endif 3712#endif
3693 case 1048: /* alternative cursor save */ 3713 case 1048: /* alternative cursor save */
3694 case 1049:
3695 if (option (Opt_secondaryScreen)) 3714 if (option (Opt_secondaryScreen))
3696 if (mode == 0) 3715 if (mode == 0)
3697 scr_cursor (RESTORE); 3716 scr_cursor (RESTORE);
3698 else if (mode == 1) 3717 else if (mode == 1)
3699 scr_cursor (SAVE); 3718 scr_cursor (SAVE);
… …
3708 case 2: /* VT52 mode */ 3727 case 2: /* VT52 mode */
3709 /* oddball mode. should be set regardless of set/reset 3728 /* oddball mode. should be set regardless of set/reset
3710 * parameter. Return from VT52 mode with an ESC < from 3729 * parameter. Return from VT52 mode with an ESC < from
3711 * within VT52 mode 3730 * within VT52 mode
3712 */ 3731 */
3713 PrivMode (1, PrivMode_vt52); 3732 set_privmode (PrivMode_vt52, 1);
3714 break; 3733 break;
3715 case 3: /* 80/132 */ 3734 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3735 if (priv_modes & PrivMode_132OK)
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3736 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3718 break; 3737 break;
3719 case 4: /* smooth scrolling */ 3738 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3739 set_option (Opt_jumpScroll, !state);
3721 break; 3740 break;
3722 case 5: /* reverse video */ 3741 case 5: /* reverse video */
… …
3729 scr_autowrap (state); 3748 scr_autowrap (state);
3730 break; 3749 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3750 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3751 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3752 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3753 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3754 break;
3736#ifdef scrollBar_esc 3755#ifdef scrollBar_esc
3737 case scrollBar_esc: 3756 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3757 if (scrollBar.map (state))
3739 { 3758 {
3740 resize_all_windows (0, 0, 0); 3759 resize_all_windows (0, 0, 0);
3741 scr_touch (true); 3760 scr_touch (true);
3742 } 3761 }
3743 break; 3762 break;
… …
3752 break; 3771 break;
3753 /* case 66: - application key pad */ 3772 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3773 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3774 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3775 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3776 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3777 break;
3759#if 0
3760 case 1001: 3778 case 1002:
3761 break; /* X11 mouse highlighting */ 3779 case 1003:
3762#endif 3780 if (state)
3781 {
3782 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3783 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3784 mouse_row = mouse_col = 0;
3785 vt_emask_mouse = PointerMotionMask;
3786 }
3787 else
3788 vt_emask_mouse = NoEventMask;
3789
3790 vt_select_input ();
3791 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3792 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3793 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3794 break;
3766 case 1011: /* scroll to bottom on key press */ 3795 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3796 set_option (Opt_scrollTtyKeypress, state);
3768 break; 3797 break;
3769 case 1047: /* secondary screen w/ clearing last */ 3798 case 1047: /* secondary screen w/ clearing last */
3770 if (option (Opt_secondaryScreen)) 3799 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY) 3800 if (!state)
3772 scr_erase_screen (2); 3801 scr_erase_screen (2);
3802
3773 scr_change_screen (state); 3803 scr_change_screen (state);
3774 break; 3804 break;
3775 case 1049: /* secondary screen w/ clearing first */ 3805 case 1049: /* secondary screen w/ clearing first */
3806 if (option (Opt_secondaryScreen))
3807 if (state)
3808 scr_cursor (SAVE);
3809
3776 scr_change_screen (state); 3810 scr_change_screen (state);
3811
3777 if (option (Opt_secondaryScreen)) 3812 if (option (Opt_secondaryScreen))
3778 if (current_screen != PRIMARY) 3813 if (state)
3779 scr_erase_screen (2); 3814 scr_erase_screen (2);
3815 else
3816 scr_cursor (RESTORE);
3780 break; 3817 break;
3781 default: 3818 default:
3782 break; 3819 break;
3783 } 3820 }
3784 } 3821 }
… …
3937 } 3974 }
3938 } 3975 }
3939} 3976}
3940/*}}} */ 3977/*}}} */
3941 3978
3942/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3943void
3944rxvt_term::process_graphics ()
3945{
3946 unicode_t ch, cmd = cmd_getc ();
3947
3948 if (cmd == 'Q')
3949 { /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */
3951 return;
3952 }
3953 /* swallow other graphics sequences until terminating ':' */
3954 do
3955 ch = cmd_getc ();
3956 while (ch != ':');
3957}
3958/*}}} */
3959
3960/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
3961 3980
3962/* 3981/*
3963 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
3964 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
3977 3996
3978/* ---------------------------------------------------------------------- */ 3997/* ---------------------------------------------------------------------- */
3979/* Write data to the pty as typed by the user, pasted with the mouse, 3998/* Write data to the pty as typed by the user, pasted with the mouse,
3980 * or generated by us in response to a query ESC sequence. 3999 * or generated by us in response to a query ESC sequence.
3981 */ 4000 */
3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4001static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3983 4002
3984void 4003void
3985rxvt_term::tt_write (const char *data, unsigned int len) 4004rxvt_term::tt_write (const char *data, unsigned int len)
3986{ 4005{
3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4006 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3992 4011
3993 if (v_buflen == 0) 4012 if (v_buflen == 0)
3994 { 4013 {
3995 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4014 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3996 4015
4016 max_it (written, 0);
4017
3997 if ((unsigned int)written == len) 4018 if (written == len)
3998 return; 4019 return;
3999 4020
4000 data += written; 4021 data += written;
4001 len -= written; 4022 len -= written;
4002 } 4023 }
4003 4024
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4025 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4005 4026
4006 memcpy (v_buffer + v_buflen, data, len); 4027 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 4028 v_buflen += len;
4008 4029
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 4030 pty_ev.set (ev::READ | ev::WRITE);
4010} 4031}
4011 4032
4012void rxvt_term::pty_write () 4033void rxvt_term::pty_write ()
4013{ 4034{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4035 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4019 4040
4020 if (v_buflen == 0) 4041 if (v_buflen == 0)
4021 { 4042 {
4022 free (v_buffer); 4043 free (v_buffer);
4023 v_buffer = 0; 4044 v_buffer = 0;
4024 v_buflen = 0;
4025 4045
4026 pty_ev.set (EVENT_READ); 4046 pty_ev.set (ev::READ);
4027 return; 4047 return;
4028 } 4048 }
4029 4049
4030 memmove (v_buffer, v_buffer + written, v_buflen); 4050 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 4051 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4052 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 4053 pty_ev.set (ev::READ);
4034} 4054}
4035 4055
4036/*----------------------- end-of-file (C source) -----------------------*/ 4056/*----------------------- end-of-file (C source) -----------------------*/
4037 4057

Diff Legend

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