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.330 by root, Mon Jun 18 12:53:25 2007 UTC vs.
Revision 1.478 by root, Thu Feb 24 12:42:41 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
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
… …
1035void 974void
1036rxvt_term::flush () 975rxvt_term::flush ()
1037{ 976{
1038 flush_ev.stop (); 977 flush_ev.stop ();
1039 978
1040#ifdef TRANSPARENT 979#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 980 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 981 {
1043 want_full_refresh = 0; 982 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 983 scr_touch (false);
1046 } 984 }
1047#endif 985#endif
1048 986
1049 if (want_refresh) 987 if (want_refresh)
… …
1085 } 1023 }
1086 while (row < end_row); 1024 while (row < end_row);
1087 } 1025 }
1088 1026
1089 scr_refresh (); 1027 scr_refresh ();
1090 scrollbar_show (1); 1028 scrollBar.show (1);
1091#ifdef USE_XIM 1029#ifdef USE_XIM
1092 IMSendSpot (); 1030 IMSendSpot ();
1093#endif 1031#endif
1094 } 1032 }
1095 1033
1096 display->flush (); 1034 display->flush ();
1097} 1035}
1098 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1099void 1038void
1100rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1101{ 1040{
1102 make_current (); 1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1043
1104 display->flush (); 1044 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1045}
1109 1046
1110void 1047void
1111rxvt_term::flush_cb (time_watcher &w) 1048rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1049{
1113 make_current (); 1050 make_current ();
1114 1051
1115 refresh_count = 0; 1052 refresh_count = 0;
1116 flush (); 1053 flush ();
1117} 1054}
1118 1055
1119#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1120void 1057void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1059{
1123 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1061 want_refresh = 1;
1125 1062 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1063}
1128#endif 1064#endif
1129 1065
1130#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1131void 1067void
1132rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1069{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1071 {
1136 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1137 want_refresh = 1; 1073 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1139 } 1075 }
1076 else
1077 w.stop ();
1140} 1078}
1141#endif 1079#endif
1142 1080
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1082void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1084{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1087 {
1150 want_refresh = 1; 1088 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1152 } 1090 }
1091 else
1092 w.stop ();
1153} 1093}
1154#endif 1094#endif
1155 1095
1156#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1157void 1097void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1099{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1101 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1103 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1165 } 1105 }
1106 else
1107 w.stop ();
1166} 1108}
1167#endif 1109#endif
1168 1110
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1112void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1114{
1173 if (mouse_slip_wheel_speed == 0 1115 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 { 1116 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1117 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1182 } 1125 }
1183} 1126}
1184#endif 1127#endif
1185 1128
1186#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1187static struct event_handler 1130static struct event_handler
1188{ 1131{
1189 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1190 1133
1191 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1192 { 1135 {
1193 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1137 // 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 1138 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1197 1143
1198 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1200 1146
1201 w.stop (); 1147 w.stop ();
1202 } 1148 }
1203 1149
… …
1212rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1213{ 1159{
1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1215 1161
1216 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1217 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1219 n = 0;
1220 }
1221 1164
1222 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1223 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1224 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1225 1168
… …
1247 1190
1248 return false; 1191 return false;
1249} 1192}
1250 1193
1251void 1194void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1195rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1196{
1254 make_current (); 1197 make_current ();
1255 1198
1256 if (revents & EVENT_READ) 1199 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1202 cmd_parse ();
1260 break;
1261 1203
1262 if (revents & EVENT_WRITE) 1204 if (revents & ev::WRITE)
1263 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1264} 1208}
1265 1209
1266void 1210void
1267rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1268{ 1212{
… …
1271 1215
1272#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1217 hidden_pointer = 0;
1274 1218
1275 if (option (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1277#endif 1221#endif
1278} 1222}
1279 1223
1280#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1281void 1225void
… …
1289 1233
1290 hidden_pointer = 1; 1234 hidden_pointer = 1;
1291} 1235}
1292 1236
1293void 1237void
1294rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1239{
1296 make_current (); 1240 make_current ();
1297 1241
1298 pointer_blank (); 1242 pointer_blank ();
1299} 1243}
… …
1302void 1246void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1248{
1305 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1306 int x, y; 1250 int x, y;
1251 int code = 32;
1307 1252
1308 x = ev.x; 1253 x = Pixel2Col (ev.x) + 1;
1309 y = ev.y; 1254 y = Pixel2Row (ev.y) + 1;
1310 pixel_position (&x, &y); 1255
1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260
1261 mouse_row = x;
1262 mouse_col = y;
1263 code += 32;
1264 }
1311 1265
1312 if (MEvent.button == AnyButton) 1266 if (MEvent.button == AnyButton)
1313 button_number = 3; 1267 button_number = 3;
1314 else 1268 else
1315 { 1269 {
1316 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1318 if (button_number >= 3) 1272 if (button_number >= 3)
1319 button_number += (64 - 3); 1273 button_number += 64 - 3;
1320 } 1274 }
1321 1275
1322 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1323 { 1277 {
1324 /* 1278 /*
… …
1356 fputc ('A', stderr); 1310 fputc ('A', stderr);
1357 if (key_state & 32) 1311 if (key_state & 32)
1358 fputc ('2', stderr); 1312 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1314 button_number,
1361 x + 1, 1315 x,
1362 y + 1); 1316 y);
1363#endif 1317#endif
1364 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1365 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1333 code + button_number + key_state,
1367 (32 + x + 1), 1334 32 + x,
1368 (32 + y + 1)); 1335 32 + y);
1369} 1336}
1370 1337
1371/*{{{ process an X event */ 1338/*{{{ process an X event */
1372void 1339void
1373rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1401 focus_out ();
1435 } 1402 }
1436#endif 1403#endif
1437 } 1404 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1405 break;
1443 1406
1444 /* 1407 /*
1445 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1484 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1485 { 1448 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1450 ;
1488 1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1470
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1472 {
1491 seen_resize = 1; 1473 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND 1475 }
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1476 else
1477 {
1478#ifdef HAVE_BG_PIXMAP
1479 if (moved)
1495 { 1480 {
1481 if (mapped)
1482 update_background ();
1496 resize_pixmap (); 1483 else
1497 scr_touch (true); 1484 bg_invalidate ();
1498 } 1485 }
1499#endif 1486#endif
1500 } 1487 }
1501 1488
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef TRANSPARENT
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1490 }
1509 break; 1491 break;
1510 1492
1511 case PropertyNotify: 1493 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 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; 1495 break;
1518 1496
1519 case SelectionClear: 1497 case SelectionClear:
1520 selection_clear (); 1498 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; 1499 break;
1527 1500
1528 case SelectionRequest: 1501 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1530 break; 1503 break;
1531 1504
1532 case MapNotify: 1505 case MapNotify:
1506#ifdef HAVE_BG_PIXMAP
1507 /* This is needed specifically to fix the case of no window manager or a
1508 * non-reparenting window manager. In those cases we never get first
1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1511 * reparenting.
1512 * We should not render background immediately, as there could be several
1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1514 * by scheduling background redraw as soon as we can, but giving a short
1515 * bit of time for ConfigureNotifies to arrive.
1516 * We should render background PRIOR to drawing any text, but AFTER all
1517 * of ConfigureNotifys for the best results.
1518 */
1519 if (!(bg_flags & BG_IS_VALID))
1520 update_background_ev.start (0.025);
1521#endif
1533 mapped = 1; 1522 mapped = 1;
1534#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1524 text_blink_ev.start ();
1536#endif 1525#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1526 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1527 break;
1539 1528
1540 case UnmapNotify: 1529 case UnmapNotify:
… …
1542#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1532 text_blink_ev.stop ();
1544#endif 1533#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1535 break;
1547
1548#ifdef TRANSPARENT
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* TRANSPARENT */
1553 1536
1554 case GraphicsExpose: 1537 case GraphicsExpose:
1555 case Expose: 1538 case Expose:
1556 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1557 { 1540 {
1558 do 1541 do
1542 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1545 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1547
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1549
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1554 }
1568 1555
1569 want_refresh = 1; 1556 want_refresh = 1;
1570 } 1557 }
1571 else 1558 else
1572 { 1559 {
… …
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1563 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1565 ;
1579 1566
1580 if (isScrollbarWindow (ev.xany.window)) 1567 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1568 {
1582 scrollBar.setIdle (); 1569 scrollBar.state = STATE_IDLE;
1583 scrollbar_show (0); 1570 scrollBar.show (0);
1584 } 1571 }
1585
1586#ifdef TRANSPARENT
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1572 }
1591 break; 1573 break;
1592 1574
1593 case MotionNotify: 1575 case MotionNotify:
1594#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1577 if (hidden_pointer)
1596 pointer_unblank (); 1578 pointer_unblank ();
1597#endif 1579#endif
1580 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1581 || priv_modes & PrivMode_MouseAnyEvent)
1582 mouse_report (ev.xbutton);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1584 break;
1600 1585
1601 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1602 { 1587 {
… …
1636 int dist; 1621 int dist;
1637 1622
1638 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
1640 */ 1625 */
1641 if (!sel_scroll_ev.active) 1626 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1627 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1628
1644 /* save the event params so we can highlight 1629 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1630 * the selection in the pending-scroll loop
1646 */ 1631 */
1647 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
… …
1669 else 1654 else
1670 { 1655 {
1671 /* we are within the text window, so we 1656 /* we are within the text window, so we
1672 * shouldn't be scrolling 1657 * shouldn't be scrolling
1673 */ 1658 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1659 sel_scroll_ev.stop();
1676 } 1660 }
1677#endif 1661#endif
1678#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1679 } 1663 }
1680#endif 1664#endif
1681 } 1665 }
1682 } 1666 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1668 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1687 ; 1671 ;
1688 1672
… …
1690 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1691 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1692 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1693 &unused_mask); 1677 &unused_mask);
1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1695 scrollbar_size ()); 1679 scrollBar.size ());
1696 want_refresh = 1; 1680 want_refresh = 1;
1697 scrollbar_show (1); 1681 scrollBar.show (1);
1698 } 1682 }
1699 break; 1683 break;
1700 } 1684 }
1701 1685
1702#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
… …
1706 { 1690 {
1707 hidden_cursor = 0; 1691 hidden_cursor = 0;
1708 want_refresh = 1; 1692 want_refresh = 1;
1709 } 1693 }
1710 1694
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1695 cursor_blink_ev.again ();
1712 } 1696 }
1713#endif 1697#endif
1714 1698
1715#if defined(POINTER_BLANK) 1699#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1723 1707
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1708 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1709 pointer_blank ();
1726 } 1710 }
1727#endif 1711#endif
1712
1713 refresh_check ();
1728} 1714}
1715
1716#if ENABLE_FRILLS
1717void
1718rxvt_term::set_urgency (bool enable)
1719{
1720 if (enable == urgency_hint)
1721 return;
1722
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1724 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h);
1727 urgency_hint = enable;
1728 }
1729}
1730#endif
1729 1731
1730void 1732void
1731rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1732{ 1734{
1733 if (!focus) 1735 if (!focus)
1734 { 1736 {
1735 focus = 1; 1737 focus = 1;
1736 want_refresh = 1; 1738 want_refresh = 1;
1737 1739
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM 1740#if USE_XIM
1741 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1742 { 1742 {
1743 IMSetPosition (); 1743 IMSetPosition ();
1744 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1745 } 1745 }
1746#endif 1746#endif
1747#if CURSOR_BLINK 1747#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.again ();
1750#endif 1750#endif
1751#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1753 { 1753 {
1754 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1755 scr_recolour (); 1755 scr_recolour ();
1756 } 1756 }
1757#endif 1757#endif
1758#if ENABLE_FRILLS 1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1759 if (option (Opt_urgentOnBell))
1760 { 1760 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 1761#endif
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1771 } 1764 }
1772} 1765}
1773 1766
1774void 1767void
1775rxvt_term::focus_out () 1768rxvt_term::focus_out ()
… …
1777 if (focus) 1770 if (focus)
1778 { 1771 {
1779 focus = 0; 1772 focus = 0;
1780 want_refresh = 1; 1773 want_refresh = 1;
1781 1774
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1775#if ENABLE_FRILLS
1783 1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1784#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1780 if (iso14755buf)
1786 { 1781 {
1787 iso14755buf = 0; 1782 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1783# if ISO_14755
1789 scr_overlay_off (); 1784 scr_overlay_off ();
1790# endif 1785# endif
1791 } 1786 }
1792#endif 1787#endif
1793#if USE_XIM 1788#if USE_XIM
… …
1795 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1796#endif 1791#endif
1797#if CURSOR_BLINK 1792#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1795
1800 hidden_cursor = 0; 1796 hidden_cursor = 0;
1801#endif 1797#endif
1802#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
1804 { 1800 {
1805 pix_colors = pix_colors_unfocused; 1801 pix_colors = pix_colors_unfocused;
1806 scr_recolour (); 1802 scr_recolour ();
1807 } 1803 }
1808#endif 1804#endif
1805
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809 } 1807 }
1810} 1808}
1811 1809
1812void 1810void
1813rxvt_term::update_fade_color (unsigned int idx) 1811rxvt_term::update_fade_color (unsigned int idx)
… …
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1818 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 } 1819 }
1822#endif 1820#endif
1823} 1821}
1824 1822
1825#if TRANSPARENT || ENABLE_PERL 1823#if ENABLE_TRANSPARENCY || ENABLE_PERL
1826void 1824void
1827rxvt_term::rootwin_cb (XEvent &ev) 1825rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1826{
1829 make_current (); 1827 make_current ();
1830 1828
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1829 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1830 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1831 return;
1834 1832
1835# if TRANSPARENT 1833# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1834 switch (ev.type)
1837 { 1835 {
1838 case PropertyNotify: 1836 case PropertyNotify:
1839 /* 1837 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1838 * 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. 1839 * use the property to determine the pixmap. We use it later on.
1842 */ 1840 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1843 {
1844 bg_set_root_pixmap ();
1845 update_background ();
1846 }
1846 1847
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1848 break;
1852 } 1849 }
1853# endif 1850# endif
1851
1852 refresh_check ();
1854} 1853}
1855#endif 1854#endif
1856 1855
1857void 1856void
1858rxvt_term::button_press (XButtonEvent &ev) 1857rxvt_term::button_press (XButtonEvent &ev)
… …
1889 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1890 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1891#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1892 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1893 { 1892 {
1894 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1895 MEvent.clicks++; 1894 MEvent.clicks++;
1896 1895
1897 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1898 { 1897 {
1899 /* only report double clicks */ 1898 /* only report double clicks */
… …
1913 mouse_report (ev); 1912 mouse_report (ev);
1914 } 1913 }
1915#else 1914#else
1916 MEvent.button = ev.button; 1915 MEvent.button = ev.button;
1917 mouse_report (ev); 1916 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1917#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1918
1920 } 1919 }
1921 else 1920 else
1922 { 1921 {
1923 if (ev.button != MEvent.button) 1922 if (ev.button != MEvent.button)
… …
1971 } 1970 }
1972 1971
1973 /* 1972 /*
1974 * Scrollbar window processing of button press 1973 * Scrollbar window processing of button press
1975 */ 1974 */
1976 if (isScrollbarWindow (ev.window)) 1975 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 1976 {
1978 scrollBar.setIdle (); 1977 page_dirn direction = NO_DIR;
1978
1979 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */
1983
1984 scrollBar.state = STATE_IDLE;
1979 /* 1985 /*
1980 * Rxvt-style scrollbar: 1986 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 1987 * move up if mouse is above slider
1982 * move dn if mouse is below slider 1988 * move dn if mouse is below slider
1983 * 1989 *
… …
1992 /* 1998 /*
1993 * Mouse report disabled scrollbar: 1999 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 2000 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 2001 * click on scrollbar - send pageup/down
1996 */ 2002 */
1997 if ((scrollBar.style == R_SB_NEXT 2003 if (direction == UP)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 2004 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 2005 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"); 2006 tt_printf ("\033[B");
2007 else 2007 else
2008 switch (ev.button) 2008 switch (ev.button)
2009 { 2009 {
2010 case Button2: 2010 case Button2:
… …
2017 tt_printf ("\033[5~"); 2017 tt_printf ("\033[5~");
2018 break; 2018 break;
2019 } 2019 }
2020 } 2020 }
2021 else 2021 else
2022#endif /* NO_SCROLLBAR_REPORT */ 2022#endif /* NO_SCROLLBAR_REPORT */
2023
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 2023 {
2029 if (scrollbarnext_upButton (ev.y)) 2024 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 { 2025 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2027 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 2029#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (direction, 1))
2047 { 2031 {
2048 if (upordown < 0) 2032 if (direction == UP)
2049 scrollBar.setUp (); 2033 scrollBar.state = STATE_UP;
2050 else 2034 else
2051 scrollBar.setDn (); 2035 scrollBar.state = STATE_DOWN;
2052 } 2036 }
2053 } 2037 }
2054 else 2038 else
2055 switch (ev.button) 2039 switch (ev.button)
2056 { 2040 {
2057 case Button2: 2041 case Button2:
2058 switch (scrollbar_align) 2042 switch (scrollBar.align)
2059 { 2043 {
2060 case R_SB_ALIGN_TOP: 2044 case R_SB_ALIGN_TOP:
2061 csrO = 0; 2045 csrO = 0;
2062 break; 2046 break;
2063 case R_SB_ALIGN_CENTRE: 2047 case R_SB_ALIGN_CENTRE:
… …
2069 } 2053 }
2070 2054
2071 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2072 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2075 2059
2076 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2077 break; 2061 break;
2078 2062
2079 case Button1: 2063 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2064 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2065 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2066 /* FALLTHROUGH */
2083 2067
2084 case Button3: 2068 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2069 if (scrollBar.style != R_SB_XTERM)
… …
2095 scr_page (DN, nrow - 1); 2079 scr_page (DN, nrow - 1);
2096# else 2080# else
2097 scr_page (DN, nrow / 4); 2081 scr_page (DN, nrow / 4);
2098# endif 2082# endif
2099 else 2083 else
2100 scrollBar.setMotion (); 2084 scrollBar.state = STATE_MOTION;
2101 } 2085 }
2102 else 2086 else
2103 { 2087 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2089 (nrow
2106 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2107 / scrollbar_size ())); 2091 / scrollBar.size ()));
2108 } 2092 }
2109 2093
2110 break; 2094 break;
2111 } 2095 }
2112 } 2096 }
… …
2122 2106
2123 csrO = 0; /* reset csr Offset */ 2107 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2108 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2110
2127 if (scrollbar_isUpDn ()) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2112 {
2129 scrollBar.setIdle (); 2113 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2114 scrollBar.show (0);
2131 } 2115 }
2132 2116
2133#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2136#endif 2119#endif
2137 2120
2138 if (ev.window == vt) 2121 if (ev.window == vt)
2139 { 2122 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2164 mouse_report (ev); 2147 mouse_report (ev);
2165 } 2148 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2149#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2150 MEvent.button = AnyButton;
2168 mouse_report (ev); 2151 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2152#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2153 return;
2171 } 2154 }
2172 2155
2173 /* 2156 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2157 * dumb hack to compensate for the failure of click-and-drag
… …
2186 selection_make (ev.time); 2169 selection_make (ev.time);
2187 break; 2170 break;
2188 2171
2189 case Button2: 2172 case Button2:
2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2175 break;
2193 2176
2194#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2195 case Button4: 2178 case Button4:
2196 case Button5: 2179 case Button5:
… …
2212 { 2195 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2196 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2199
2217 if (slip_wheel_ev.at < NOW) 2200 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2201 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2202 }
2222 else 2203 else
2204# endif
2223 { 2205 {
2224# endif
2225 scr_page (v, i); 2206 scr_page (v, i);
2226 scrollbar_show (1); 2207 scrollBar.show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2208 }
2229# endif
2230 } 2209 }
2231 break; 2210 break;
2232#endif 2211#endif
2233 } 2212 }
2234 } 2213 }
2235} 2214}
2236 2215
2237/*}}} */ 2216/*}}} */
2238 2217
2239bool 2218void
2240rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2241{ 2220{
2242 bool flag = false;
2243 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2244 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2245 2223
2246 for (;;) 2224 for (;;)
2247 { 2225 {
2248 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2249 { 2227 {
2250 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2251 ch = next_char (); 2229 ch = next_char ();
2252 2230
2253 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2254 break; 2232 break;
2255 } 2233 }
2256 2234
2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2258 { 2236 {
2259 if (!seen_input) 2237 if (expect_false (!seen_input))
2260 { 2238 {
2261 seen_input = 1; 2239 seen_input = 1;
2262 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2263 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2264 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
… …
2277 wchar_t *str = buf; 2255 wchar_t *str = buf;
2278 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2279 2257
2280 for (;;) 2258 for (;;)
2281 { 2259 {
2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2283 break; 2261 break;
2284 2262
2285 *str++ = ch; 2263 *str++ = ch;
2286 2264
2287 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2288 { 2266 {
2289 if (ch == C0_LF) 2267 if (ch == C0_LF)
2290 nlines++; 2268 nlines++;
2291 2269
2292 refresh_count++; 2270 refresh_count++;
2293 2271
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2273 {
2296 refresh_count = 0; 2274 refresh_count = 0;
2297 2275
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + .1) 2276 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2277 {
2300 refreshnow = true; 2278 refreshnow = true;
2301 ch = NOCHAR; 2279 ch = NOCHAR;
2302 break; 2280 break;
2303 } 2281 }
… …
2341 * What the heck we'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2342 * if skipScroll is enabled. 2320 * if skipScroll is enabled.
2343 */ 2321 */
2344 if (refreshnow) 2322 if (refreshnow)
2345 { 2323 {
2346 flag = true;
2347 scr_refresh (); 2324 scr_refresh ();
2348 want_refresh = 1; 2325 want_refresh = 1;
2349 } 2326 }
2350
2351 } 2327 }
2352 else 2328 else
2353 { 2329 {
2354 try 2330 try
2355 { 2331 {
… …
2363 } 2339 }
2364 2340
2365 ch = NOCHAR; 2341 ch = NOCHAR;
2366 } 2342 }
2367 } 2343 }
2368
2369 return flag;
2370} 2344}
2371 2345
2372// read the next character 2346// read the next character
2373wchar_t 2347wchar_t
2374rxvt_term::next_char () NOTHROW 2348rxvt_term::next_char () NOTHROW
2375{ 2349{
2376 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2377 { 2351 {
2378 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2380 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2381 2355
2382 wchar_t wc; 2356 wchar_t wc;
2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2384 2358
… …
2388 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2389 break; 2363 break;
2390 } 2364 }
2391 2365
2392 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2393 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 }
2394 2371
2395 // assume wchar == unicode 2372 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2397 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2398 } 2375 }
… …
2442/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2443#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2444FILE * 2421FILE *
2445rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2446{ 2423{
2447 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2448 2425
2449 if (stream == NULL) 2426 if (stream == NULL)
2450 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2451 2428
2452 return stream; 2429 return stream;
… …
2463 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2464 */ 2441 */
2465void 2442void
2466rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2467{ 2444{
2468 int done; 2445 FILE *fd = popen_printer ();
2469 FILE *fd;
2470 2446
2471 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2472 return; 2448 return;
2473 2449
2474 /* 2450 /*
2475 * Send all input to the printer until either ESC[4i or ESC[?4i 2451 * Send all input to the printer until either ESC[4i or ESC[?4i
2476 * is received. 2452 * is received.
2477 */ 2453 */
2478 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2479 { 2455 {
2480 unsigned char buf[8]; 2456 unsigned char buf[8];
2481 unicode_t ch; 2457 unicode_t ch;
2482 unsigned int i, len; 2458 unsigned int i, len;
2483 2459
… …
2514 } 2490 }
2515 } 2491 }
2516 2492
2517 pclose_printer (fd); 2493 pclose_printer (fd);
2518} 2494}
2519#endif /* PRINTPIPE */ 2495#endif /* PRINTPIPE */
2520/*}}} */ 2496/*}}} */
2521 2497
2522/* *INDENT-OFF* */ 2498/* *INDENT-OFF* */
2523enum { 2499enum {
2524 C1_40 = 0x40, 2500 C1_40 = 0x40,
… …
2574 process_dcs_seq (); 2550 process_dcs_seq ();
2575 break; 2551 break;
2576 case 0x9b: /* CSI */ 2552 case 0x9b: /* CSI */
2577 process_csi_seq (); 2553 process_csi_seq ();
2578 break; 2554 break;
2579 case 0x9d: /* CSI */ 2555 case 0x9d: /* OSC */
2580 process_osc_seq (); 2556 process_osc_seq ();
2581 break; 2557 break;
2582#endif 2558#endif
2583 } 2559 }
2584} 2560}
… …
2628 break; 2604 break;
2629 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
2630 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2631 break; 2607 break;
2632 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
2633 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
2634 break; 2610 break;
2635 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
2636 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
2637 /* unimplemented */ 2613 /* unimplemented */
2638 break; 2614 break;
… …
2692 scr_forwardindex (); 2668 scr_forwardindex ();
2693 break; 2669 break;
2694#endif 2670#endif
2695 case '=': 2671 case '=':
2696 case '>': 2672 case '>':
2697 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
2698 break; 2674 break;
2699 2675
2700 case C1_40: 2676 case C1_40:
2701 cmd_getc (); 2677 cmd_getc ();
2702 break; 2678 break;
… …
2706 2682
2707 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2708 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2709 { 2685 {
2710 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2711 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2712 } 2688 }
2713 break; 2689 break;
2714 2690
2715 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2716 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
… …
2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2742 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2744 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
2745 2721
2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2747 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
2748 process_csi_seq (); 2724 process_csi_seq ();
2749 break; 2725 break;
2750 2726
2751 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2752 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
2753 process_osc_seq (); 2729 process_osc_seq ();
2754 break; 2730 break;
2755 2731
2756 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2757 case 'c': 2733 case 'c':
2758 mbstate.reset (); 2734 mbstate.reset ();
2759 scr_poweron (); 2735 scr_poweron ();
2760 scrollbar_show (1); 2736 scrollBar.show (1);
2761 break; 2737 break;
2762 2738
2763 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2739 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2764 case 'n': 2740 case 'n':
2765 scr_charset_choose (2); 2741 scr_charset_choose (2);
… …
2785 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2786 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2787 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2788}; 2764};
2789 2765
2790#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2791 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2792 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2793#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2794 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2795 2771
2796const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2797 { 2773 {
2798 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2799 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2800 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2801 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2810rxvt_term::process_csi_seq () 2786rxvt_term::process_csi_seq ()
2811{ 2787{
2812 unicode_t ch, priv, i; 2788 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2789 unsigned int nargs, p;
2814 int n, ndef; 2790 int n, ndef;
2815 int arg[ESC_ARGS]; 2791 int arg[ESC_ARGS] = { };
2816 2792
2817 for (nargs = ESC_ARGS; nargs > 0;) 2793 nargs = 0;
2818 arg[--nargs] = 0;
2819 2794
2820 priv = 0; 2795 priv = 0;
2821 ch = cmd_getc (); 2796 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2798 {
2823 { /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
2824 priv = ch; 2800 priv = ch;
2825 ch = cmd_getc (); 2801 ch = cmd_getc ();
2826 } 2802 }
2827 2803
2828 /* read any numerical arguments */ 2804 /* read any numerical arguments */
… …
2867 switch (priv) 2843 switch (priv)
2868 { 2844 {
2869 case '>': 2845 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2846 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2847 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2848 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2849 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2850 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2851 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2852 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2853 // versions.
2878 // 2854 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2855 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2856 }
2881 break; 2857 break;
2858
2882 case '?': 2859 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
2885 break; 2862 break;
2863
2864 case '!':
2865 if (ch == CSI_70)
2866 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset ();
2869
2870 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2886 } 2875 }
2876 break;
2877 }
2878
2887 return; 2879 return;
2888 } 2880 }
2889 2881
2890 switch (ch) 2882 switch (ch)
2891 { 2883 {
… …
3258 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3259 */ 3251 */
3260void 3252void
3261rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3262{ 3254{
3263 char *s;
3264 unicode_t eh;
3265
3266 /* 3255 /*
3267 * Not handled yet 3256 * Not handled yet
3268 */ 3257 */
3258
3259 unicode_t eh;
3269 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3270 if (s) 3261 if (s)
3271 free (s); 3262 free (s);
3272 3263
3273 return; 3264 return;
3274} 3265}
… …
3278 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3279 */ 3270 */
3280void 3271void
3281rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3282{ 3273{
3283 unicode_t ch, eh;
3284 int arg; 3274 int arg;
3285 3275
3286 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3287 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3288 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3289 3279
3290 if (ch == ';') 3280 if (ch == ';')
3291 { 3281 {
3282 unicode_t eh;
3292 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3293 3284
3294 if (s) 3285 if (s)
3295 { 3286 {
3296 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3320 3311
3321/* 3312/*
3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3323 */ 3314 */
3324void 3315void
3325rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3326{ 3317{
3327 int color; 3318 int color;
3328 char *buf, *name; 3319 char *buf, *name;
3329 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3330 int saveop = op; 3321 int saveop = op;
… …
3371 3362
3372 XFree (value); 3363 XFree (value);
3373 } 3364 }
3374 else 3365 else
3375 { 3366 {
3376 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3377 3368
3378 if (eq) 3369 if (eq)
3379 { 3370 {
3380 *eq = 0; 3371 *eq = 0;
3381 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
… …
3402 *buf++ = '\0'; 3393 *buf++ = '\0';
3403 3394
3404 process_color_seq (op, color, name, resp); 3395 process_color_seq (op, color, name, resp);
3405 } 3396 }
3406 break; 3397 break;
3398 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3399 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3400 process_color_seq (op, Color_fg, str, resp);
3409 break; 3401 break;
3402 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3403 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3404 process_color_seq (op, Color_bg, str, resp);
3412 break; 3405 break;
3413#ifndef NO_CURSORCOLOR 3406#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3407 case XTerm_Color_cursor:
… …
3419 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3420 break; 3413 break;
3421 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3422 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3423 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3424#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#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: 3426 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3431 break; 3428 break;
3432 case Rxvt_Color_UL:
3433 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3434 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3435 break; 3431 break;
3436 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3438 break; 3434 break;
3439#endif 3435#endif
3440#if TRANSPARENT && TINTING 3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3439#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3440 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3442 {
3443 bool changed = false;
3443 3444
3444 check_our_parents (); 3445 if (ISSET_PIXCOLOR (Color_tint))
3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3445 3447
3446 if (am_transparent) 3448 if (changed)
3447 want_full_refresh = want_refresh = 1; 3449 update_background ();
3450 }
3448 3451
3449 break; 3452 break;
3450#endif 3453#endif
3451 3454
3455#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3453 { 3457 if (!strcmp (str, "?"))
3454 if (*str != ';')
3455 { 3458 {
3456#if XPM_BACKGROUND 3459 char str[256];
3457 scale_pixmap (""); /* reset to default scaling */ 3460
3458 set_bgPixmap (str); /* change pixmap */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3459 scr_touch (true); 3462 min (h_scale, 32767), min (v_scale, 32767),
3460#endif 3463 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3465 }
3462 3466 else
3467 {
3463 int changed = 0; 3468 int changed = 0;
3464 3469
3465 while ((str = strchr (str, ';')) != NULL) 3470 if (*str != ';')
3466 { 3471 {
3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3474 changed++;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3481 }
3482 else
3483 {
3467 str++; 3484 str++;
3468#if XPM_BACKGROUND 3485 if (bg_set_geometry (str, true))
3469 changed += scale_pixmap (str); 3486 changed++;
3470#endif
3471 } 3487 }
3472 3488
3473 if (changed) 3489 if (changed)
3474 { 3490 {
3475#ifdef XPM_BACKGROUND 3491 if (bg_window_position_sensitive ())
3476 resize_pixmap (); 3492 {
3477 scr_touch (true); 3493 int x, y;
3478#endif 3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3497 update_background ();
3479 } 3498 }
3480#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 } 3499 }
3485 break; 3500 break;
3486 3501#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 3502
3494 case XTerm_logfile: 3503 case XTerm_logfile:
3495 // TODO, when secure mode? 3504 // TODO, when secure mode?
3496 break; 3505 break;
3497 3506
… …
3564 break; 3573 break;
3565#endif 3574#endif
3566 3575
3567#if ENABLE_PERL 3576#if ENABLE_PERL
3568 case URxvt_perl: 3577 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3570 ; // no responses yet
3571 break; 3579 break;
3572#endif 3580#endif
3573 } 3581 }
3574} 3582}
3575/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
3598 { 3606 {
3599 if (mode == 'r') 3607 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3609 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3604 } 3613 }
3605 3614
3606 return state; 3615 return state;
3607} 3616}
3608 3617
… …
3612{ 3621{
3613 unsigned int i, j; 3622 unsigned int i, j;
3614 int state; 3623 int state;
3615 3624
3616 static const struct 3625 static const struct
3617 { 3626 {
3618 const int argval; 3627 const int argval;
3619 const unsigned long bit; 3628 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3629 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3632 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
3633 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3634#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3635 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3636#endif 3644#endif
3637 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3638 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3639 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3640 // 45 margin bell NYI 3649 // 45 margin bell NYI
3641 // 46 start logging 3650 // 46 start logging
3642 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3643 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3644#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3646#endif 3655#endif
3647 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3657 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3658 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3653 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3674 { 2004, PrivMode_BracketPaste },
3660 }; 3675 };
3661 3676
3662 if (nargs == 0) 3677 if (nargs == 0)
3663 return; 3678 return;
3664 3679
… …
3671 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3672 { 3687 {
3673 state = -1; 3688 state = -1;
3674 3689
3675 /* basic handling */ 3690 /* basic handling */
3676 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3677 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3678 { 3693 {
3679 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3680 break; 3695 break;
3681 } 3696 }
… …
3689 3704
3690 scr_touch (true); 3705 scr_touch (true);
3691 break; 3706 break;
3692#endif 3707#endif
3693 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
3694 case 1049:
3695 if (option (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
3696 if (mode == 0) 3710 if (mode == 0)
3697 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
3698 else if (mode == 1) 3712 else if (mode == 1)
3699 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
… …
3708 case 2: /* VT52 mode */ 3722 case 2: /* VT52 mode */
3709 /* oddball mode. should be set regardless of set/reset 3723 /* oddball mode. should be set regardless of set/reset
3710 * parameter. Return from VT52 mode with an ESC < from 3724 * parameter. Return from VT52 mode with an ESC < from
3711 * within VT52 mode 3725 * within VT52 mode
3712 */ 3726 */
3713 PrivMode (1, PrivMode_vt52); 3727 set_privmode (PrivMode_vt52, 1);
3714 break; 3728 break;
3715 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3718 break; 3732 break;
3719 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
3721 break; 3735 break;
3722 case 5: /* reverse video */ 3736 case 5: /* reverse video */
… …
3729 scr_autowrap (state); 3743 scr_autowrap (state);
3730 break; 3744 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3745 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3746 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3747 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3749 break;
3736#ifdef scrollBar_esc 3750#ifdef scrollBar_esc
3737 case scrollBar_esc: 3751 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3752 if (scrollBar.map (state))
3739 { 3753 {
3740 resize_all_windows (0, 0, 0); 3754 resize_all_windows (0, 0, 0);
3741 scr_touch (true); 3755 scr_touch (true);
3742 } 3756 }
3743 break; 3757 break;
… …
3752 break; 3766 break;
3753 /* case 66: - application key pad */ 3767 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3768 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3769 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3770 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3772 break;
3759#if 0
3760 case 1001: 3773 case 1002:
3761 break; /* X11 mouse highlighting */ 3774 case 1003:
3762#endif 3775 if (state)
3776 {
3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3780 vt_emask_mouse = PointerMotionMask;
3781 }
3782 else
3783 vt_emask_mouse = NoEventMask;
3784
3785 vt_select_input ();
3786 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3789 break;
3766 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
3768 break; 3792 break;
3769 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
3770 if (option (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY) 3795 if (!state)
3772 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
3773 scr_change_screen (state); 3798 scr_change_screen (state);
3774 break; 3799 break;
3775 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3802 if (state)
3803 scr_cursor (SAVE);
3804
3776 scr_change_screen (state); 3805 scr_change_screen (state);
3806
3777 if (option (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
3778 if (current_screen != PRIMARY) 3808 if (state)
3779 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
3780 break; 3812 break;
3781 default: 3813 default:
3782 break; 3814 break;
3783 } 3815 }
3784 } 3816 }
… …
3944rxvt_term::process_graphics () 3976rxvt_term::process_graphics ()
3945{ 3977{
3946 unicode_t ch, cmd = cmd_getc (); 3978 unicode_t ch, cmd = cmd_getc ();
3947 3979
3948 if (cmd == 'Q') 3980 if (cmd == 'Q')
3981 {
3949 { /* query graphics */ 3982 /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */ 3983 tt_printf ("\033G0\012"); /* no graphics */
3951 return; 3984 return;
3952 } 3985 }
3953 /* swallow other graphics sequences until terminating ':' */ 3986 /* swallow other graphics sequences until terminating ':' */
3954 do 3987 do
… …
3977 4010
3978/* ---------------------------------------------------------------------- */ 4011/* ---------------------------------------------------------------------- */
3979/* Write data to the pty as typed by the user, pasted with the mouse, 4012/* Write data to the pty as typed by the user, pasted with the mouse,
3980 * or generated by us in response to a query ESC sequence. 4013 * or generated by us in response to a query ESC sequence.
3981 */ 4014 */
3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4015static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3983 4016
3984void 4017void
3985rxvt_term::tt_write (const char *data, unsigned int len) 4018rxvt_term::tt_write (const char *data, unsigned int len)
3986{ 4019{
3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4020 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3999 4032
4000 data += written; 4033 data += written;
4001 len -= written; 4034 len -= written;
4002 } 4035 }
4003 4036
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4037 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4005 4038
4006 memcpy (v_buffer + v_buflen, data, len); 4039 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 4040 v_buflen += len;
4008 4041
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 4042 pty_ev.set (ev::READ | ev::WRITE);
4010} 4043}
4011 4044
4012void rxvt_term::pty_write () 4045void rxvt_term::pty_write ()
4013{ 4046{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4047 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4019 4052
4020 if (v_buflen == 0) 4053 if (v_buflen == 0)
4021 { 4054 {
4022 free (v_buffer); 4055 free (v_buffer);
4023 v_buffer = 0; 4056 v_buffer = 0;
4024 v_buflen = 0;
4025 4057
4026 pty_ev.set (EVENT_READ); 4058 pty_ev.set (ev::READ);
4027 return; 4059 return;
4028 } 4060 }
4029 4061
4030 memmove (v_buffer, v_buffer + written, v_buflen); 4062 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 4063 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4064 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 4065 pty_ev.set (ev::READ);
4034} 4066}
4035 4067
4036/*----------------------- end-of-file (C source) -----------------------*/ 4068/*----------------------- end-of-file (C source) -----------------------*/
4037 4069

Diff Legend

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