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.356 by root, Mon Sep 17 08:31:54 2007 UTC vs.
Revision 1.497 by sf-exg, Thu Sep 1 08:11:26 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
161 162
162void 163void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
250#endif 257#endif
251 258
252void 259void
253rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
254{ 261{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 263
260 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
261 { 265 {
262 char mb[16]; 266 char mb[MB_LEN_MAX];
263 int len; 267 int len;
264 268
265 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
268 else 272 else
269 { 273 {
270 mb[0] = ch[0]; 274 mb[0] = ch;
271 len = 1; 275 len = 1;
272 } 276 }
273 277
274 if (len > 0) 278 if (len > 0)
275 tt_write (mb, len); 279 tt_write (mb, len);
… …
278 } 282 }
279 283
280 iso14755buf = 0; 284 iso14755buf = 0;
281} 285}
282 286
283int 287static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
285{ 289{
286 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
289 { 293 {
290 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
291 295
… …
297 301
298 return -1; 302 return -1;
299} 303}
300#endif 304#endif
301 305
306static inline KeySym
307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
302void 401void
303rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
304{ 403{
305 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 405 KeySym keysym;
308 int valid_keysym; 406 int valid_keysym;
309 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
310 408
311#if ISO_14755 409#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
321 */ 419 */
322 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 423
332 kbuf[0] = 0; 424 kbuf[0] = 0;
333 425
334#ifdef USE_XIM 426#ifdef USE_XIM
335 if (Input_Context) 427 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 504#else
413 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
414#endif 506#endif
507 max_it (lnsppg, 1);
508
415 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
416 { 510 {
417 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
418 return; 512 return;
419 } 513 }
… …
472 selection_request (ev.time); 566 selection_request (ev.time);
473 return; 567 return;
474#if TODO 568#if TODO
475 /* rxvt extras */ 569 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 571 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 573 return;
482#endif 574#endif
483 } 575 }
484 } 576 }
485 } 577 }
486 578
487#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 580 // ISO 14755 support
489 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 582 {
491 int hv; 583 int hv;
492 584
493 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 616 scr_overlay_off ();
525# endif 617# endif
526 iso14755buf = 0; 618 iso14755buf = 0;
527 } 619 }
528 } 620 }
621 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
532 { 625 {
533 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 627# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 639 }
547#endif 640#endif
548 641
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
551 { 653 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
553 newlen = 1; 684 newlen = 0;
554 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
555 { 768 {
556#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
557 case XK_BackSpace: 770 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 772 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
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 (kp)
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 (kp)
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; 773 newlen = 0;
840 break;
841 } 774 }
842 775 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
846 780
847 /* 781 /*
848 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
849 */ 783 */
850#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
950 commit_iso14755 (); 884 commit_iso14755 ();
951 885
952 return; 886 return;
953 } 887 }
954 888
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 890 if (i[0] == keysym)
957 { 891 {
958 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 893 commit_iso14755 ();
960 894
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
999#endif 933#endif
1000} 934}
1001 935
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 936void
1036rxvt_term::flush () 937rxvt_term::flush ()
1037{ 938{
1038 flush_ev.stop (); 939 flush_ev.stop ();
940
941#ifdef HAVE_BG_PIXMAP
942 if (bg_flags & BG_NEEDS_REFRESH)
943 {
944 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false);
946 }
947#endif
1039 948
1040 if (want_refresh) 949 if (want_refresh)
1041 { 950 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 951 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 952 {
… …
1076 } 985 }
1077 while (row < end_row); 986 while (row < end_row);
1078 } 987 }
1079 988
1080 scr_refresh (); 989 scr_refresh ();
1081 scrollbar_show (1); 990 scrollBar.show (1);
1082#ifdef USE_XIM 991#ifdef USE_XIM
1083 IMSendSpot (); 992 im_send_spot ();
1084#endif 993#endif
1085 } 994 }
1086 995
1087 display->flush (); 996 display->flush ();
1088} 997}
1089 998
999/* checks whether a refresh is requested and starts the refresh timer */
1090void 1000void
1091rxvt_term::check_cb (check_watcher &w) 1001rxvt_term::refresh_check ()
1092{ 1002{
1093 make_current (); 1003 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1005
1095 display->flush (); 1006 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1007}
1100 1008
1101void 1009void
1102rxvt_term::flush_cb (time_watcher &w) 1010rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1011{
1104 make_current (); 1012 make_current ();
1105 1013
1106 refresh_count = 0; 1014 refresh_count = 0;
1107 flush (); 1015 flush ();
1108} 1016}
1109 1017
1110#ifdef CURSOR_BLINK 1018#ifdef CURSOR_BLINK
1111void 1019void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1021{
1114 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1023 want_refresh = 1;
1116 1024 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1025}
1119#endif 1026#endif
1120 1027
1121#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1122void 1029void
1123rxvt_term::text_blink_cb (time_watcher &w) 1030rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1031{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1033 {
1127 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1128 want_refresh = 1; 1035 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1036 refresh_check ();
1130 } 1037 }
1038 else
1039 w.stop ();
1131} 1040}
1132#endif 1041#endif
1133 1042
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1044void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1046{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1140 { 1049 {
1141 want_refresh = 1; 1050 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1051 refresh_check ();
1143 } 1052 }
1053 else
1054 w.stop ();
1144} 1055}
1145#endif 1056#endif
1146 1057
1147#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
1148void 1059void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1061{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 { 1063 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1065 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1066 refresh_check ();
1156 } 1067 }
1068 else
1069 w.stop ();
1157} 1070}
1158#endif 1071#endif
1159 1072
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1074void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1076{
1164 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1078 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1079 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1084 {
1085 mouse_slip_wheel_speed = 0;
1086 w.stop ();
1173 } 1087 }
1174} 1088}
1175#endif 1089#endif
1176 1090
1177#if LINUX_YIELD_HACK 1091#if LINUX_YIELD_HACK
1178static struct event_handler 1092static struct event_handler
1179{ 1093{
1180 check_watcher yield_ev; 1094 ev::prepare yield_ev;
1181 1095
1182 void yield_cb (check_watcher &w) 1096 void yield_cb (ev::prepare &w, int revents)
1183 { 1097 {
1184 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1188 1105
1189 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1190 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1191 1108
1192 w.stop (); 1109 w.stop ();
1193 } 1110 }
1194 1111
… …
1197 { 1114 {
1198 } 1115 }
1199} event_handler; 1116} event_handler;
1200#endif 1117#endif
1201 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1202bool 1152bool
1203rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1204{ 1154{
1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1206 1156
1207 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1208 { 1158
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1210 n = 0;
1211 } 1160 {
1212 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1214 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1215 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1216 1166
1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1218 1168
1219 if (r > 0) 1169 if (r > 0)
1220 { 1170 {
1221 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1222 return true; 1172 return true;
… …
1238 1188
1239 return false; 1189 return false;
1240} 1190}
1241 1191
1242void 1192void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1194{
1245 make_current (); 1195 make_current ();
1246 1196
1247 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1250 if (cmd_parse ()) 1200 cmd_parse ();
1251 break;
1252 1201
1253 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1254 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1255} 1206}
1256 1207
1257void 1208void
1258rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1259{ 1210{
… …
1262 1213
1263#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1215 hidden_pointer = 0;
1265 1216
1266 if (option (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1268#endif 1219#endif
1269} 1220}
1270 1221
1271#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1272void 1223void
… …
1280 1231
1281 hidden_pointer = 1; 1232 hidden_pointer = 1;
1282} 1233}
1283 1234
1284void 1235void
1285rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1237{
1287 make_current (); 1238 make_current ();
1288 1239
1289 pointer_blank (); 1240 pointer_blank ();
1290} 1241}
… …
1293void 1244void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1246{
1296 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1297 int x, y; 1248 int x, y;
1249 int code = 32;
1298 1250
1299 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
1300 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
1301 pixel_position (&x, &y); 1253
1254 if (ev.type == MotionNotify)
1255 {
1256 if (x == mouse_row && y == mouse_col)
1257 return;
1258
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1302 1263
1303 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1304 button_number = 3; 1265 button_number = 3;
1305 else 1266 else
1306 { 1267 {
1307 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1308 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1309 if (button_number >= 3) 1270 if (button_number >= 3)
1310 button_number += (64 - 3); 1271 button_number += 64 - 3;
1311 } 1272 }
1312 1273
1313 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1314 { 1275 {
1315 /* 1276 /*
… …
1347 fputc ('A', stderr); 1308 fputc ('A', stderr);
1348 if (key_state & 32) 1309 if (key_state & 32)
1349 fputc ('2', stderr); 1310 fputc ('2', stderr);
1350 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1351 button_number, 1312 button_number,
1352 x + 1, 1313 x,
1353 y + 1); 1314 y);
1354#endif 1315#endif
1355 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1356 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1331 code + button_number + key_state,
1358 (32 + x + 1), 1332 32 + x,
1359 (32 + y + 1)); 1333 32 + y);
1360} 1334}
1361 1335
1362/*{{{ process an X event */ 1336/*{{{ process an X event */
1363void 1337void
1364rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1466 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1441 focus_out ();
1468 break; 1442 break;
1469 1443
1470 case ConfigureNotify: 1444 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1475 { 1446 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1478 1468
1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1480 { 1470 {
1481 seen_resize = 1; 1471 seen_resize = 1;
1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1483 } 1473 }
1484 else 1474 else
1485 { 1475 {
1486#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1488 update_background (); 1478 update_background ();
1489#endif 1479#endif
1490 } 1480 }
1481
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1483 }
1493 break; 1484 break;
1494 1485
1495 case PropertyNotify: 1486 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1501 break; 1488 break;
1502 1489
1503 case SelectionClear: 1490 case SelectionClear:
1504 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break;
1506
1507 case SelectionNotify:
1508 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1510 break; 1492 break;
1511 1493
1512 case SelectionRequest: 1494 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1514 break; 1496 break;
1515 1497
1516 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting.
1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025);
1514#endif
1517 mapped = 1; 1515 mapped = 1;
1518#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1520#endif 1518#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1520 break;
1523 1521
1524 case UnmapNotify: 1522 case UnmapNotify:
… …
1532 case GraphicsExpose: 1530 case GraphicsExpose:
1533 case Expose: 1531 case Expose:
1534 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1535 { 1533 {
1536 do 1534 do
1535 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1538 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1540
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1542
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1547 }
1546 1548
1547 want_refresh = 1; 1549 want_refresh = 1;
1548 } 1550 }
1549 else 1551 else
1550 { 1552 {
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1556 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1558 ;
1557 1559
1558 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1561 {
1560 scrollBar.setIdle (); 1562 scrollBar.state = SB_STATE_IDLE;
1561 scrollbar_show (0); 1563 scrollBar.show (0);
1562 } 1564 }
1563 } 1565 }
1564 break; 1566 break;
1565 1567
1566 case MotionNotify: 1568 case MotionNotify:
1567#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1570 if (hidden_pointer)
1569 pointer_unblank (); 1571 pointer_unblank ();
1570#endif 1572#endif
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent)
1575 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1577 break;
1573 1578
1574 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1575 { 1580 {
… …
1609 int dist; 1614 int dist;
1610 1615
1611 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1613 */ 1618 */
1614 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1621
1617 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1619 */ 1624 */
1620 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1642 else 1647 else
1643 { 1648 {
1644 /* we are within the text window, so we 1649 /* we are within the text window, so we
1645 * shouldn't be scrolling 1650 * shouldn't be scrolling
1646 */ 1651 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1649 } 1653 }
1650#endif 1654#endif
1651#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1652 } 1656 }
1653#endif 1657#endif
1654 } 1658 }
1655 } 1659 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1661 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1660 ; 1664 ;
1661 1665
1662 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1670 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1672 scrollBar.size ());
1669 want_refresh = 1; 1673 want_refresh = 1;
1670 scrollbar_show (1); 1674 scrollBar.show (1);
1671 } 1675 }
1672 break; 1676 break;
1673 } 1677 }
1674 1678
1675#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
… …
1679 { 1683 {
1680 hidden_cursor = 0; 1684 hidden_cursor = 0;
1681 want_refresh = 1; 1685 want_refresh = 1;
1682 } 1686 }
1683 1687
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1685 } 1689 }
1686#endif 1690#endif
1687 1691
1688#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1696 1700
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1702 pointer_blank ();
1699 } 1703 }
1700#endif 1704#endif
1705
1706 refresh_check ();
1701} 1707}
1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 }
1722}
1723#endif
1702 1724
1703void 1725void
1704rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1705{ 1727{
1706 if (!focus) 1728 if (!focus)
1707 { 1729 {
1708 focus = 1; 1730 focus = 1;
1709 want_refresh = 1; 1731 want_refresh = 1;
1710 1732
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1733#if USE_XIM
1714 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1715 { 1735 {
1716 IMSetPosition (); 1736 im_set_position ();
1717 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1718 } 1738 }
1719#endif 1739#endif
1720#if CURSOR_BLINK 1740#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1742 cursor_blink_ev.again ();
1723#endif 1743#endif
1724#if OFF_FOCUS_FADING 1744#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1745 if (rs[Rs_fade])
1726 { 1746 {
1727 pix_colors = pix_colors_focused; 1747 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1748 scr_recolour ();
1729 } 1749 }
1730#endif 1750#endif
1731#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1752 if (option (Opt_urgentOnBell))
1733 { 1753 set_urgency (0);
1734 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1735 {
1736 h->flags &= ~XUrgencyHint;
1737 XSetWMHints (dpy, parent[0], h);
1738 }
1739 }
1740#endif 1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741 } 1757 }
1742} 1758}
1743 1759
1744void 1760void
1745rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1747 if (focus) 1763 if (focus)
1748 { 1764 {
1749 focus = 0; 1765 focus = 0;
1750 want_refresh = 1; 1766 want_refresh = 1;
1751 1767
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1753 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1754#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1773 if (iso14755buf)
1756 { 1774 {
1757 iso14755buf = 0; 1775 iso14755buf = 0;
1758# if ISO_14755 1776# if ISO_14755
… …
1765 XUnsetICFocus (Input_Context); 1783 XUnsetICFocus (Input_Context);
1766#endif 1784#endif
1767#if CURSOR_BLINK 1785#if CURSOR_BLINK
1768 if (option (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1787 cursor_blink_ev.stop ();
1788
1770 hidden_cursor = 0; 1789 hidden_cursor = 0;
1771#endif 1790#endif
1772#if OFF_FOCUS_FADING 1791#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1792 if (rs[Rs_fade])
1774 { 1793 {
1775 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1795 scr_recolour ();
1777 } 1796 }
1778#endif 1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1800 }
1780} 1801}
1781 1802
1782void 1803void
1783rxvt_term::update_fade_color (unsigned int idx) 1804rxvt_term::update_fade_color (unsigned int idx)
… …
1811 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1812 */ 1833 */
1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1836 {
1816 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1817 update_background (); 1838 update_background ();
1818 } 1839 }
1840
1819 break; 1841 break;
1820 } 1842 }
1821# endif 1843# endif
1844
1845 refresh_check ();
1822} 1846}
1823#endif 1847#endif
1824 1848
1825void 1849void
1826rxvt_term::button_press (XButtonEvent &ev) 1850rxvt_term::button_press (XButtonEvent &ev)
… …
1857 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1861 { 1885 {
1862 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1863 MEvent.clicks++; 1887 MEvent.clicks++;
1864 1888
1865 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1866 { 1890 {
1867 /* only report double clicks */ 1891 /* only report double clicks */
… …
1881 mouse_report (ev); 1905 mouse_report (ev);
1882 } 1906 }
1883#else 1907#else
1884 MEvent.button = ev.button; 1908 MEvent.button = ev.button;
1885 mouse_report (ev); 1909 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1910#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1911
1888 } 1912 }
1889 else 1913 else
1890 { 1914 {
1891 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
… …
1939 } 1963 }
1940 1964
1941 /* 1965 /*
1942 * Scrollbar window processing of button press 1966 * Scrollbar window processing of button press
1943 */ 1967 */
1944 if (isScrollbarWindow (ev.window)) 1968 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 1969 {
1946 scrollBar.setIdle (); 1970 page_dirn direction = NO_DIR;
1971
1972 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */
1976
1977 scrollBar.state = SB_STATE_IDLE;
1947 /* 1978 /*
1948 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 1980 * move up if mouse is above slider
1950 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1951 * 1982 *
… …
1960 /* 1991 /*
1961 * Mouse report disabled scrollbar: 1992 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 1993 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 1994 * click on scrollbar - send pageup/down
1964 */ 1995 */
1965 if ((scrollBar.style == R_SB_NEXT 1996 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 1997 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 1998 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 1999 tt_printf ("\033[B");
1975 else 2000 else
1976 switch (ev.button) 2001 switch (ev.button)
1977 { 2002 {
1978 case Button2: 2003 case Button2:
… …
1985 tt_printf ("\033[5~"); 2010 tt_printf ("\033[5~");
1986 break; 2011 break;
1987 } 2012 }
1988 } 2013 }
1989 else 2014 else
1990#endif /* NO_SCROLLBAR_REPORT */ 2015#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 2016 {
1997 if (scrollbarnext_upButton (ev.y)) 2017 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 2018 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2019#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2020 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2022#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2023 if (scr_page (direction, 1))
2015 { 2024 {
2016 if (upordown < 0) 2025 if (direction == UP)
2017 scrollBar.setUp (); 2026 scrollBar.state = SB_STATE_UP;
2018 else 2027 else
2019 scrollBar.setDn (); 2028 scrollBar.state = SB_STATE_DOWN;
2020 } 2029 }
2021 } 2030 }
2022 else 2031 else
2023 switch (ev.button) 2032 switch (ev.button)
2024 { 2033 {
2025 case Button2: 2034 case Button2:
2026 switch (scrollbar_align) 2035 switch (scrollBar.align)
2027 { 2036 {
2028 case R_SB_ALIGN_TOP: 2037 case SB_ALIGN_TOP:
2029 csrO = 0; 2038 csrO = 0;
2030 break; 2039 break;
2031 case R_SB_ALIGN_CENTRE: 2040 case SB_ALIGN_CENTRE:
2032 csrO = (scrollBar.bot - scrollBar.top) / 2; 2041 csrO = (scrollBar.bot - scrollBar.top) / 2;
2033 break; 2042 break;
2034 case R_SB_ALIGN_BOTTOM: 2043 case SB_ALIGN_BOTTOM:
2035 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2036 break; 2045 break;
2037 } 2046 }
2038 2047
2039 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == SB_STYLE_XTERM
2040 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2043 2052
2044 scrollBar.setMotion (); 2053 scrollBar.state = SB_STATE_MOTION;
2045 break; 2054 break;
2046 2055
2047 case Button1: 2056 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2051 2060
2052 case Button3: 2061 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != SB_STYLE_XTERM)
2054 { 2063 {
2055 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2057 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2058# else 2067# else
2059 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2060# endif 2069# endif
2061 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2062# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2063 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2064# else 2073# else
2065 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2066# endif 2075# endif
2067 else 2076 else
2068 scrollBar.setMotion (); 2077 scrollBar.state = SB_STATE_MOTION;
2069 } 2078 }
2070 else 2079 else
2071 { 2080 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2082 (nrow
2074 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2075 / scrollbar_size ())); 2084 / scrollBar.size ()));
2076 } 2085 }
2077 2086
2078 break; 2087 break;
2079 } 2088 }
2080 } 2089 }
… …
2090 2099
2091 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2101 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2103
2095 if (scrollbar_isUpDn ()) 2104 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2096 { 2105 {
2097 scrollBar.setIdle (); 2106 scrollBar.state = SB_STATE_IDLE;
2098 scrollbar_show (0); 2107 scrollBar.show (0);
2099 } 2108 }
2100 2109
2101#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
2104#endif 2112#endif
2105 2113
2106 if (ev.window == vt) 2114 if (ev.window == vt)
2107 { 2115 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2116 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2132 mouse_report (ev); 2140 mouse_report (ev);
2133 } 2141 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2142#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2143 MEvent.button = AnyButton;
2136 mouse_report (ev); 2144 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2145#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2146 return;
2139 } 2147 }
2140 2148
2141 /* 2149 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2150 * dumb hack to compensate for the failure of click-and-drag
… …
2154 selection_make (ev.time); 2162 selection_make (ev.time);
2155 break; 2163 break;
2156 2164
2157 case Button2: 2165 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2168 break;
2161 2169
2162#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2163 case Button4: 2171 case Button4:
2164 case Button5: 2172 case Button5:
… …
2180 { 2188 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2192
2185 if (slip_wheel_ev.at < NOW) 2193 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2195 }
2190 else 2196 else
2197# endif
2191 { 2198 {
2192# endif
2193 scr_page (v, i); 2199 scr_page (v, i);
2194 scrollbar_show (1); 2200 scrollBar.show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2201 }
2197# endif
2198 } 2202 }
2199 break; 2203 break;
2200#endif 2204#endif
2201 } 2205 }
2202 } 2206 }
2203} 2207}
2204 2208
2205/*}}} */ 2209/*}}} */
2206 2210
2207bool 2211void
2208rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2209{ 2213{
2210 bool flag = false;
2211 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2212 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2213 2216
2214 for (;;) 2217 for (;;)
2215 { 2218 {
2216 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2217 { 2220 {
2218 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2219 ch = next_char (); 2222 ch = next_char ();
2220 2223
2221 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2222 break; 2225 break;
2223 } 2226 }
2224 2227
2225 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2226 { 2229 {
2227 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2228 { 2231 {
2229 seen_input = 1; 2232 seen_input = 1;
2230 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2231 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2232 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2245 wchar_t *str = buf; 2248 wchar_t *str = buf;
2246 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2247 2250
2248 for (;;) 2251 for (;;)
2249 { 2252 {
2250 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2251 break; 2254 break;
2252 2255
2253 *str++ = ch; 2256 *str++ = ch;
2254 2257
2255 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2256 { 2259 {
2257 if (ch == C0_LF) 2260 if (ch == C0_LF)
2258 nlines++; 2261 nlines++;
2259 2262
2260 refresh_count++; 2263 refresh_count++;
2261 2264
2262 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2263 { 2266 {
2264 refresh_count = 0; 2267 refresh_count = 0;
2265 2268
2266 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2267 { 2270 {
2268 refreshnow = true; 2271 refreshnow = true;
2269 ch = NOCHAR; 2272 ch = NOCHAR;
2270 break; 2273 break;
2271 } 2274 }
… …
2309 * What the heck we'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2310 * if skipScroll is enabled. 2313 * if skipScroll is enabled.
2311 */ 2314 */
2312 if (refreshnow) 2315 if (refreshnow)
2313 { 2316 {
2314 flag = true;
2315 scr_refresh (); 2317 scr_refresh ();
2316 want_refresh = 1; 2318 want_refresh = 1;
2317 } 2319 }
2318
2319 } 2320 }
2320 else 2321 else
2321 { 2322 {
2322 try 2323 try
2323 { 2324 {
… …
2331 } 2332 }
2332 2333
2333 ch = NOCHAR; 2334 ch = NOCHAR;
2334 } 2335 }
2335 } 2336 }
2336
2337 return flag;
2338} 2337}
2339 2338
2340// read the next character 2339// read the next character
2341wchar_t 2340wchar_t
2342rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2343{ 2342{
2344 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2345 { 2344 {
2346 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2347 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2348 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2349 2348
2350 wchar_t wc; 2349 wchar_t wc;
2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2352 2351
… …
2356 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2357 break; 2356 break;
2358 } 2357 }
2359 2358
2360 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2361 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 }
2362 2364
2363 // assume wchar == unicode 2365 // assume wchar == unicode
2364 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2365 return wc & UNICODE_MASK; 2367 return wc & UNICODE_MASK;
2366 } 2368 }
… …
2377 : NOCHAR; 2379 : NOCHAR;
2378} 2380}
2379 2381
2380static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2381 2383
2382/* rxvt_cmd_getc () - Return next input character */
2383/*
2384 * Return the next input character after first passing any keyboard input
2385 * to the command.
2386 */
2387wchar_t 2384wchar_t
2388rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2389{ 2386{
2390 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2391 2388
… …
2410/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2411#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2412FILE * 2409FILE *
2413rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2414{ 2411{
2415 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2416 2413
2417 if (stream == NULL) 2414 if (stream == NULL)
2418 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2419 2416
2420 return stream; 2417 return stream;
… …
2431 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2432 */ 2429 */
2433void 2430void
2434rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2435{ 2432{
2436 int done; 2433 FILE *fd = popen_printer ();
2437 FILE *fd;
2438 2434
2439 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2440 return; 2436 return;
2441 2437
2442 /* 2438 /*
2443 * Send all input to the printer until either ESC[4i or ESC[?4i 2439 * Send all input to the printer until either ESC[4i or ESC[?4i
2444 * is received. 2440 * is received.
2445 */ 2441 */
2446 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2447 { 2443 {
2448 unsigned char buf[8]; 2444 unsigned char buf[8];
2449 unicode_t ch; 2445 unicode_t ch;
2450 unsigned int i, len; 2446 unsigned int i, len;
2451 2447
… …
2482 } 2478 }
2483 } 2479 }
2484 2480
2485 pclose_printer (fd); 2481 pclose_printer (fd);
2486} 2482}
2487#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2488/*}}} */ 2484/*}}} */
2489 2485
2490/* *INDENT-OFF* */
2491enum { 2486enum {
2492 C1_40 = 0x40, 2487 C1_40 = 0x40,
2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497}; 2492};
2498/* *INDENT-ON* */
2499 2493
2500/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2501void 2495void
2502rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2503{ 2497{
… …
2596 break; 2590 break;
2597 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2598 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2599 break; 2593 break;
2600 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2601 PrivMode (0, PrivMode_vt52); 2595 priv_modes &= ~PrivMode_vt52;
2602 break; 2596 break;
2603 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2604 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2605 /* unimplemented */ 2599 /* unimplemented */
2606 break; 2600 break;
… …
2625 return; 2619 return;
2626 } 2620 }
2627 2621
2628 switch (ch) 2622 switch (ch)
2629 { 2623 {
2630 /* case 1: do_tek_mode (); break; */
2631 case '#': 2624 case '#':
2632 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2633 scr_E (); 2626 scr_E ();
2634 break; 2627 break;
2635 case '(': 2628 case '(':
… …
2658#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2659 case '9': 2652 case '9':
2660 scr_forwardindex (); 2653 scr_forwardindex ();
2661 break; 2654 break;
2662#endif 2655#endif
2656 // DECPAM/DECPNM
2663 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2664 case '>': 2660 case '>':
2665 PrivMode ((ch == '='), PrivMode_aplKP); 2661 priv_modes &= ~PrivMode_aplKP;
2666 break; 2662 break;
2667 2663
2668 case C1_40: 2664 case C1_40:
2669 cmd_getc (); 2665 cmd_getc ();
2670 break; 2666 break;
… …
2674 2670
2675 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
2676 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
2677 { 2673 {
2678 wchar_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
2679 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2680 } 2676 }
2681 break; 2677 break;
2682 2678
2683 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
2684 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
2685 process_graphics (); 2681 // used by original rxvt for rob nations own graphics mode
2682 if (cmd_getc () == 'Q')
2683 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2686 break; 2684 break;
2687 2685
2688 /* 8.3.63: CHARACTER TABULATION SET */ 2686 /* 8.3.63: CHARACTER TABULATION SET */
2689 case C1_HTS: /* ESC H */ 2687 case C1_HTS: /* ESC H */
2690 scr_set_tab (1); 2688 scr_set_tab (1);
… …
2694 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
2695 scr_index (DN); 2693 scr_index (DN);
2696 break; 2694 break;
2697 2695
2698 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
2699 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
2700 2698
2701 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
2702 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
2703 2701
2704 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
2705 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
2706 process_dcs_seq (); 2704 process_dcs_seq ();
2707 break; 2705 break;
… …
2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2707 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2710 case C1_SCI: /* ESC Z */ 2708 case C1_SCI: /* ESC Z */
2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2709 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2712 break; /* steal obsolete ESC [ c */ 2710 break; /* steal obsolete ESC [ c */
2713 2711
2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2712 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2715 case C1_CSI: /* ESC [ */ 2713 case C1_CSI: /* ESC [ */
2716 process_csi_seq (); 2714 process_csi_seq ();
2717 break; 2715 break;
2718 2716
2719 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2717 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2720 case C1_OSC: /* ESC ] */ 2718 case C1_OSC: /* ESC ] */
2721 process_osc_seq (); 2719 process_osc_seq ();
2722 break; 2720 break;
2723 2721
2724 /* 8.3.106: RESET TO INITIAL STATE */ 2722 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2725 case 'c': 2723 case 'c':
2726 mbstate.reset (); 2724 mbstate.reset ();
2727 scr_poweron (); 2725 scr_poweron ();
2728 scrollbar_show (1); 2726 scrollBar.show (1);
2729 break; 2727 break;
2730 2728
2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2729 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2732 case 'n': 2730 case 'n':
2733 scr_charset_choose (2); 2731 scr_charset_choose (2);
… …
2740 } 2738 }
2741} 2739}
2742/*}}} */ 2740/*}}} */
2743 2741
2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2745/* *INDENT-OFF* */
2746enum { 2743enum {
2747 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2745 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2746 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2747 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2750 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2754 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2751 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2755 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2752 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2756}; 2753};
2757 2754
2758#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2755#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2759 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2756 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2760 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2757 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2761#define get_byte_array_bit(array, bit) \ 2758#define get_byte_array_bit(array, bit) \
2762 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2759 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2763 2760
2764const unsigned char csi_defaults[] = 2761static const unsigned char csi_defaults[] =
2765 { 2762 {
2766 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2763 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2767 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2764 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2768 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2765 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2766 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2767 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2774 }; 2771 };
2775/* *INDENT-ON* */
2776 2772
2777void 2773void
2778rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
2779{ 2775{
2780 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
… …
2784 2780
2785 nargs = 0; 2781 nargs = 0;
2786 2782
2787 priv = 0; 2783 priv = 0;
2788 ch = cmd_getc (); 2784 ch = cmd_getc ();
2789 if (ch >= '<' && ch <= '?') 2785 if ((ch >= '<' && ch <= '?') || ch == '!')
2786 {
2790 { /* '<' '=' '>' '?' */ 2787 /* '<' '=' '>' '?' '!' */
2791 priv = ch; 2788 priv = ch;
2792 ch = cmd_getc (); 2789 ch = cmd_getc ();
2793 } 2790 }
2794 2791
2795 /* read any numerical arguments */ 2792 /* read any numerical arguments */
… …
2838 { 2835 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2836 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2837 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 // 2838 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2839 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2840 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2844 // that we do not support xterm mouse reporting (should be 95 when we do). 2841 // versions.
2845 // 2842 //
2846 tt_printf ("\033[>%d;94;0c", 'U'); 2843 tt_printf ("\033[>%d;95;0c", 'U');
2847 } 2844 }
2848 break; 2845 break;
2846
2849 case '?': 2847 case '?':
2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2848 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2851 process_terminal_mode (ch, priv, nargs, arg); 2849 process_terminal_mode (ch, priv, nargs, arg);
2852 break; 2850 break;
2851
2852 case '!':
2853 if (ch == CSI_70)
2854 {
2855 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2856 scr_soft_reset ();
2857
2858 static const int pm_h[] = { 7, 25 };
2859 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2860
2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2853 } 2863 }
2864 break;
2865 }
2866
2854 return; 2867 return;
2855 } 2868 }
2856 2869
2857 switch (ch) 2870 switch (ch)
2858 { 2871 {
… …
3073 } 3086 }
3074} 3087}
3075/*}}} */ 3088/*}}} */
3076 3089
3077#if !ENABLE_MINIMAL 3090#if !ENABLE_MINIMAL
3078/* ARGSUSED */
3079void 3091void
3080rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3081{ 3093{
3082 int x, y; 3094 int x, y;
3083 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
… …
3092 { 3104 {
3093 /* 3105 /*
3094 * commands 3106 * commands
3095 */ 3107 */
3096 case 1: /* deiconify window */ 3108 case 1: /* deiconify window */
3097 XMapWindow (dpy, parent[0]); 3109 XMapWindow (dpy, parent);
3098 break; 3110 break;
3099 case 2: /* iconify window */ 3111 case 2: /* iconify window */
3100 XIconifyWindow (dpy, parent[0], display->screen); 3112 XIconifyWindow (dpy, parent, display->screen);
3101 break; 3113 break;
3102 case 3: /* set position (pixels) */ 3114 case 3: /* set position (pixels) */
3103 XMoveWindow (dpy, parent[0], args[1], args[2]); 3115 XMoveWindow (dpy, parent, args[1], args[2]);
3104 break; 3116 break;
3105 case 4: /* set size (pixels) */ 3117 case 4: /* set size (pixels) */
3106 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3118 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3107 break; 3119 break;
3108 case 5: /* raise window */ 3120 case 5: /* raise window */
3109 XRaiseWindow (dpy, parent[0]); 3121 XRaiseWindow (dpy, parent);
3110 break; 3122 break;
3111 case 6: /* lower window */ 3123 case 6: /* lower window */
3112 XLowerWindow (dpy, parent[0]); 3124 XLowerWindow (dpy, parent);
3113 break; 3125 break;
3114 case 7: /* refresh window */ 3126 case 7: /* refresh window */
3115 scr_touch (true); 3127 scr_touch (true);
3116 break; 3128 break;
3117 case 8: /* set size (chars) */ 3129 case 8: /* set size (chars) */
… …
3128 3140
3129 /* 3141 /*
3130 * reports - some output format copied from XTerm 3142 * reports - some output format copied from XTerm
3131 */ 3143 */
3132 case 11: /* report window state */ 3144 case 11: /* report window state */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent, &wattr);
3134 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3146 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3135 break; 3147 break;
3136 case 13: /* report window position */ 3148 case 13: /* report window position */
3137 XGetWindowAttributes (dpy, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent, &wattr);
3138 XTranslateCoordinates (dpy, parent[0], wattr.root, 3150 XTranslateCoordinates (dpy, parent, wattr.root,
3139 -wattr.border_width, -wattr.border_width, 3151 -wattr.border_width, -wattr.border_width,
3140 &x, &y, &wdummy); 3152 &x, &y, &wdummy);
3141 tt_printf ("\033[3;%d;%dt", x, y); 3153 tt_printf ("\033[3;%d;%dt", x, y);
3142 break; 3154 break;
3143 case 14: /* report window size (pixels) */ 3155 case 14: /* report window size (pixels) */
3144 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3145 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3157 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3146 break; 3158 break;
3147 case 18: /* report text area size (chars) */ 3159 case 18: /* report text area size (chars) */
3148 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3160 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3149 break; 3161 break;
… …
3151 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3152 break; 3164 break;
3153 case 20: /* report icon label */ 3165 case 20: /* report icon label */
3154 { 3166 {
3155 char *s; 3167 char *s;
3156 XGetIconName (dpy, parent[0], &s); 3168 XGetIconName (dpy, parent, &s);
3157 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3158 XFree (s); 3170 XFree (s);
3159 } 3171 }
3160 break; 3172 break;
3161 case 21: /* report window title */ 3173 case 21: /* report window title */
3162 { 3174 {
3163 char *s; 3175 char *s;
3164 XFetchName (dpy, parent[0], &s); 3176 XFetchName (dpy, parent, &s);
3165 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3177 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3166 XFree (s); 3178 XFree (s);
3167 } 3179 }
3168 break; 3180 break;
3169 } 3181 }
… …
3225 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3237 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3226 */ 3238 */
3227void 3239void
3228rxvt_term::process_dcs_seq () 3240rxvt_term::process_dcs_seq ()
3229{ 3241{
3230 char *s;
3231 unicode_t eh;
3232
3233 /* 3242 /*
3234 * Not handled yet 3243 * Not handled yet
3235 */ 3244 */
3245
3246 unicode_t eh;
3236 s = get_to_st (eh); 3247 char *s = get_to_st (eh);
3237 if (s) 3248 if (s)
3238 free (s); 3249 free (s);
3239 3250
3240 return; 3251 return;
3241} 3252}
… …
3245 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3246 */ 3257 */
3247void 3258void
3248rxvt_term::process_osc_seq () 3259rxvt_term::process_osc_seq ()
3249{ 3260{
3250 unicode_t ch, eh;
3251 int arg; 3261 int arg;
3252 3262
3253 ch = cmd_getc (); 3263 unicode_t ch = cmd_getc ();
3254 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3264 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3255 arg = arg * 10 + (ch - '0'); 3265 arg = arg * 10 + (ch - '0');
3256 3266
3257 if (ch == ';') 3267 if (ch == ';')
3258 { 3268 {
3269 unicode_t eh;
3259 char *s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3260 3271
3261 if (s) 3272 if (s)
3262 { 3273 {
3263 process_xterm_seq (arg, s, eh); 3274 process_xterm_seq (arg, s, eh);
… …
3287 3298
3288/* 3299/*
3289 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3290 */ 3301 */
3291void 3302void
3292rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3303rxvt_term::process_xterm_seq (int op, char *str, char resp)
3293{ 3304{
3294 int color; 3305 int color;
3295 char *buf, *name; 3306 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3297 int saveop = op; 3308 int saveop = op;
… …
3324 unsigned long bytes_after; 3335 unsigned long bytes_after;
3325 unsigned char *value = 0; 3336 unsigned char *value = 0;
3326 const char *str = ""; 3337 const char *str = "";
3327 3338
3328 if (prop 3339 if (prop
3329 && XGetWindowProperty (dpy, parent[0], 3340 && XGetWindowProperty (dpy, parent,
3330 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3331 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3332 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3333 && actual_type != None 3344 && actual_type != None
3334 && actual_format == 8) 3345 && actual_format == 8)
… …
3338 3349
3339 XFree (value); 3350 XFree (value);
3340 } 3351 }
3341 else 3352 else
3342 { 3353 {
3343 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3354 char *eq = strchr (str, '=');
3344 3355
3345 if (eq) 3356 if (eq)
3346 { 3357 {
3347 *eq = 0; 3358 *eq = 0;
3348 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3349 } 3360 }
3350 else 3361 else
3351 XDeleteProperty (dpy, parent[0], 3362 XDeleteProperty (dpy, parent,
3352 display->atom (str)); 3363 display->atom (str));
3353 } 3364 }
3354 break; 3365 break;
3355 3366
3356 case XTerm_Color: 3367 case XTerm_Color:
… …
3369 *buf++ = '\0'; 3380 *buf++ = '\0';
3370 3381
3371 process_color_seq (op, color, name, resp); 3382 process_color_seq (op, color, name, resp);
3372 } 3383 }
3373 break; 3384 break;
3385 case Rxvt_restoreFG:
3374 case XTerm_Color00: 3386 case XTerm_Color00:
3375 process_color_seq (op, Color_fg, str, resp); 3387 process_color_seq (op, Color_fg, str, resp);
3376 break; 3388 break;
3389 case Rxvt_restoreBG:
3377 case XTerm_Color01: 3390 case XTerm_Color01:
3378 process_color_seq (op, Color_bg, str, resp); 3391 process_color_seq (op, Color_bg, str, resp);
3379 break; 3392 break;
3380#ifndef NO_CURSORCOLOR 3393#ifndef NO_CURSORCOLOR
3381 case XTerm_Color_cursor: 3394 case XTerm_Color_cursor:
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3399 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3400 break;
3388 case XTerm_Color_pointer_bg: 3401 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3402 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3403 break;
3404#ifdef OPTION_HC
3405 case XTerm_Color_HC:
3406 process_color_seq (op, Color_HC, str, resp);
3407 break;
3408 case XTerm_Color_HTC:
3409 process_color_seq (op, Color_HTC, str, resp);
3410 break;
3411#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3412#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3413 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3414 process_color_seq (op, Color_BD, str, resp);
3398 break; 3415 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3416 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3417 process_color_seq (op, Color_UL, str, resp);
3402 break; 3418 break;
3403 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3405 break; 3421 break;
3406#endif 3422#endif
3423 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp);
3425 break;
3407#if ENABLE_TRANSPARENCY 3426#if ENABLE_TRANSPARENCY
3408 case URxvt_Color_tint: 3427 case URxvt_Color_tint:
3409 process_color_seq (op, Color_tint, str, resp); 3428 process_color_seq (op, Color_tint, str, resp);
3410 { 3429 {
3411 bool changed = false; 3430 bool changed = false;
3431
3412 if (ISSET_PIXCOLOR (Color_tint)) 3432 if (ISSET_PIXCOLOR (Color_tint))
3413 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3433 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3414 else 3434
3415 changed = bgPixmap.unset_tint ();
3416 if (changed) 3435 if (changed)
3417 update_background (); 3436 update_background ();
3418 } 3437 }
3419 3438
3420 break; 3439 break;
… …
3424 case Rxvt_Pixmap: 3443 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3444 if (!strcmp (str, "?"))
3426 { 3445 {
3427 char str[256]; 3446 char str[256];
3428 3447
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3448 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3449 min (h_scale, 32767), min (v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3452 }
3434 else 3453 else
3435 { 3454 {
3436 int changed = 0; 3455 bool changed = false;
3437 3456
3438 if (*str != ';') 3457 if (*str != ';')
3439 { 3458 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3443 changed++; 3460 changed = true;
3444 str = strchr (str, ';');
3445 if (str == NULL)
3446 bgPixmap.set_defaultGeometry ();
3447 } 3461 }
3448 while (str) 3462 else
3449 { 3463 {
3450 str++; 3464 str++;
3451 if (bgPixmap.set_geometry (str)) 3465 if (bg_set_geometry (str, true))
3452 changed++; 3466 changed = true;
3453 str = strchr (str, ';');
3454 } 3467 }
3468
3455 if (changed) 3469 if (changed)
3470 {
3471 if (bg_window_position_sensitive ())
3472 {
3473 int x, y;
3474 get_window_origin (x, y);
3475 bg_set_position (x, y);
3476 }
3456 update_background (); 3477 update_background ();
3478 }
3457 } 3479 }
3458 break; 3480 break;
3459#endif 3481#endif
3460
3461 case Rxvt_restoreFG:
3462 set_window_color (Color_fg, str);
3463 break;
3464 case Rxvt_restoreBG:
3465 set_window_color (Color_bg, str);
3466 break;
3467 3482
3468 case XTerm_logfile: 3483 case XTerm_logfile:
3469 // TODO, when secure mode? 3484 // TODO, when secure mode?
3470 break; 3485 break;
3471 3486
… …
3538 break; 3553 break;
3539#endif 3554#endif
3540 3555
3541#if ENABLE_PERL 3556#if ENABLE_PERL
3542 case URxvt_perl: 3557 case URxvt_perl:
3543 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3558 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3544 ; // no responses yet
3545 break; 3559 break;
3546#endif 3560#endif
3547 } 3561 }
3548} 3562}
3549/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
… …
3572 { 3586 {
3573 if (mode == 'r') 3587 if (mode == 'r')
3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575 else 3589 else
3576 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3577 PrivMode (state, bit); 3591
3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3578 } 3596 }
3579 3597
3580 return state; 3598 return state;
3581} 3599}
3582 3600
3583/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3584void 3602void
3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3586{ 3604{
3587 unsigned int i, j; 3605 unsigned int i, j;
3588 int state; 3606 int state;
3589 3607
3590 static const struct 3608 static const struct
3591 { 3609 {
3592 const int argval; 3610 const int argval;
3593 const unsigned long bit; 3611 const unsigned long bit;
3594 } argtopriv[] = { 3612 } argtopriv[] = {
3595 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR }, // DECCKM
3596 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3597 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 }, // DECCOLM
3598 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3599 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo }, // DECSCNM
3600 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin }, // DECOM
3601 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap }, // DECAWM
3602 // 8, bi-directional support mode 3620 // 8, auto-repeat keys // DECARM
3603 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3604 // 18, 19 printing-related 3622 // 18 end FF to printer after print screen
3623 // 19 Print screen prints full screen/scroll region
3605 { 25, PrivMode_VisibleCursor }, 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3627#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3629 // 38, tektronix mode // DECTEK
3610 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3611 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3612 // 45 margin bell NYI 3632 // 45 margin bell NYI
3613 // 46 start logging 3633 // 46 start logging
3614 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3615 { 66, PrivMode_aplKP }, 3635 { 66, PrivMode_aplKP }, // DECNKM
3616#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3617 { 67, PrivMode_BackSpace }, 3637 { 67, PrivMode_BackSpace }, // DECBKM
3618#endif 3638#endif
3619 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3620 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3640 { 1002, PrivMode_MouseBtnEvent },
3621 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3641 { 1003, PrivMode_MouseAnyEvent },
3622 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3642#if ENABLE_FRILLS
3643 { 1005, PrivMode_ExtModeMouse },
3644#endif
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3645 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3646 { 1011, PrivMode_Keypress }, // rxvt extension
3647#if ENABLE_FRILLS
3648 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3649#endif
3625 // 1035 enable modifiers for alt, numlock NYI 3650 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3651 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3652 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3653 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3654 // 1048 save and restore cursor, implemented in code
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3655 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3657 { 2004, PrivMode_BracketPaste },
3632 }; 3658 };
3633 3659
3634 if (nargs == 0) 3660 if (nargs == 0)
3635 return; 3661 return;
3636 3662
… …
3643 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
3644 { 3670 {
3645 state = -1; 3671 state = -1;
3646 3672
3647 /* basic handling */ 3673 /* basic handling */
3648 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
3649 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
3650 { 3676 {
3651 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
3652 break; 3678 break;
3653 } 3679 }
… …
3661 3687
3662 scr_touch (true); 3688 scr_touch (true);
3663 break; 3689 break;
3664#endif 3690#endif
3665 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
3666 case 1049:
3667 if (option (Opt_secondaryScreen)) 3692 if (option (Opt_secondaryScreen))
3668 if (mode == 0) 3693 if (mode == 0)
3669 scr_cursor (RESTORE); 3694 scr_cursor (RESTORE);
3670 else if (mode == 1) 3695 else if (mode == 1)
3671 scr_cursor (SAVE); 3696 scr_cursor (SAVE);
… …
3680 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3708 * within VT52 mode
3684 */ 3709 */
3685 PrivMode (1, PrivMode_vt52); 3710 priv_modes |= PrivMode_vt52;
3686 break; 3711 break;
3687 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3688 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * fwidth), height); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3715 break;
3691 case 4: /* smooth scrolling */ 3716 case 4: /* smooth scrolling */
3692 set_option (Opt_jumpScroll, !state); 3717 set_option (Opt_jumpScroll, !state);
3693 break; 3718 break;
3694 case 5: /* reverse video */ 3719 case 5: /* reverse video */
… …
3701 scr_autowrap (state); 3726 scr_autowrap (state);
3702 break; 3727 break;
3703 /* case 8: - auto repeat, can't do on a per window basis */ 3728 /* case 8: - auto repeat, can't do on a per window basis */
3704 case 9: /* X10 mouse reporting */ 3729 case 9: /* X10 mouse reporting */
3705 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3706 priv_modes &= ~PrivMode_MouseX11; 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3707 break; 3732 break;
3708#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3709 case scrollBar_esc: 3734 case scrollBar_esc:
3710 if (scrollbar_mapping (state)) 3735 scrollBar.map (state);
3711 {
3712 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3713 scr_touch (true); 3737 scr_touch (true);
3714 }
3715 break; 3738 break;
3716#endif 3739#endif
3717 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3718 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3719 break; 3742 break;
… …
3724 break; 3747 break;
3725 /* case 66: - application key pad */ 3748 /* case 66: - application key pad */
3726 /* case 67: - backspace key */ 3749 /* case 67: - backspace key */
3727 case 1000: /* X11 mouse reporting */ 3750 case 1000: /* X11 mouse reporting */
3728 if (state) /* orthogonal */ 3751 if (state) /* orthogonal */
3729 priv_modes &= ~PrivMode_MouseX10; 3752 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3730 break; 3753 break;
3731#if 0
3732 case 1001: 3754 case 1002:
3733 break; /* X11 mouse highlighting */ 3755 case 1003:
3734#endif 3756 if (state)
3757 {
3758 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3759 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3760 mouse_row = mouse_col = 0;
3761 vt_emask_mouse = PointerMotionMask;
3762 }
3763 else
3764 vt_emask_mouse = NoEventMask;
3765
3766 vt_select_input ();
3767 break;
3735 case 1010: /* scroll to bottom on TTY output inhibit */ 3768 case 1010: /* scroll to bottom on TTY output inhibit */
3736 set_option (Opt_scrollTtyOutput, !state); 3769 set_option (Opt_scrollTtyOutput, !state);
3737 break; 3770 break;
3738 case 1011: /* scroll to bottom on key press */ 3771 case 1011: /* scroll to bottom on key press */
3739 set_option (Opt_scrollTtyKeypress, state); 3772 set_option (Opt_scrollTtyKeypress, state);
3740 break; 3773 break;
3741 case 1047: /* secondary screen w/ clearing last */ 3774 case 1047: /* secondary screen w/ clearing last */
3742 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3776 if (!state)
3744 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778
3745 scr_change_screen (state); 3779 scr_change_screen (state);
3746 break; 3780 break;
3747 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
3782 if (option (Opt_secondaryScreen))
3783 if (state)
3784 scr_cursor (SAVE);
3785
3748 scr_change_screen (state); 3786 scr_change_screen (state);
3787
3749 if (option (Opt_secondaryScreen)) 3788 if (option (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 3789 if (state)
3751 scr_erase_screen (2); 3790 scr_erase_screen (2);
3791 else
3792 scr_cursor (RESTORE);
3752 break; 3793 break;
3753 default: 3794 default:
3754 break; 3795 break;
3755 } 3796 }
3756 } 3797 }
… …
3909 } 3950 }
3910 } 3951 }
3911} 3952}
3912/*}}} */ 3953/*}}} */
3913 3954
3914/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3915void
3916rxvt_term::process_graphics ()
3917{
3918 unicode_t ch, cmd = cmd_getc ();
3919
3920 if (cmd == 'Q')
3921 { /* query graphics */
3922 tt_printf ("\033G0\012"); /* no graphics */
3923 return;
3924 }
3925 /* swallow other graphics sequences until terminating ':' */
3926 do
3927 ch = cmd_getc ();
3928 while (ch != ':');
3929}
3930/*}}} */
3931
3932/* ------------------------------------------------------------------------- */ 3955/* ------------------------------------------------------------------------- */
3933 3956
3934/* 3957/*
3935 * Send printf () formatted output to the command. 3958 * Send printf () formatted output to the command.
3936 * Only use for small amounts of data. 3959 * Only use for small amounts of data.
… …
3949 3972
3950/* ---------------------------------------------------------------------- */ 3973/* ---------------------------------------------------------------------- */
3951/* Write data to the pty as typed by the user, pasted with the mouse, 3974/* Write data to the pty as typed by the user, pasted with the mouse,
3952 * or generated by us in response to a query ESC sequence. 3975 * or generated by us in response to a query ESC sequence.
3953 */ 3976 */
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955 3978
3956void 3979void
3957rxvt_term::tt_write (const char *data, unsigned int len) 3980rxvt_term::tt_write (const char *data, unsigned int len)
3958{ 3981{
3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3964 3987
3965 if (v_buflen == 0) 3988 if (v_buflen == 0)
3966 { 3989 {
3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3968 3991
3992 max_it (written, 0);
3993
3969 if ((unsigned int)written == len) 3994 if (written == len)
3970 return; 3995 return;
3971 3996
3972 data += written; 3997 data += written;
3973 len -= written; 3998 len -= written;
3974 } 3999 }
3975 4000
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4001 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3977 4002
3978 memcpy (v_buffer + v_buflen, data, len); 4003 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4004 v_buflen += len;
3980 4005
3981 pty_ev.set (EVENT_READ | EVENT_WRITE); 4006 pty_ev.set (ev::READ | ev::WRITE);
3982} 4007}
3983 4008
3984void rxvt_term::pty_write () 4009void rxvt_term::pty_write ()
3985{ 4010{
3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4011 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3992 if (v_buflen == 0) 4017 if (v_buflen == 0)
3993 { 4018 {
3994 free (v_buffer); 4019 free (v_buffer);
3995 v_buffer = 0; 4020 v_buffer = 0;
3996 4021
3997 pty_ev.set (EVENT_READ); 4022 pty_ev.set (ev::READ);
3998 return; 4023 return;
3999 } 4024 }
4000 4025
4001 memmove (v_buffer, v_buffer + written, v_buflen); 4026 memmove (v_buffer, v_buffer + written, v_buflen);
4002 } 4027 }
4003 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4004 pty_ev.set (EVENT_READ); 4029 pty_ev.set (ev::READ);
4005} 4030}
4006 4031
4007/*----------------------- end-of-file (C source) -----------------------*/ 4032/*----------------------- end-of-file (C source) -----------------------*/
4008 4033

Diff Legend

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