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.336 by root, Sat Jun 30 18:10:41 2007 UTC vs.
Revision 1.490 by sf-exg, Sat Jul 9 18:23:48 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284int 287static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
302 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
303void 401void
304rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
305{ 403{
306 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 405 KeySym keysym;
309 int valid_keysym; 406 int valid_keysym;
310 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
311 408
312#if ISO_14755 409#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
322 */ 419 */
323 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 423
333 kbuf[0] = 0; 424 kbuf[0] = 0;
334 425
335#ifdef USE_XIM 426#ifdef USE_XIM
336 if (Input_Context) 427 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 504#else
414 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
415#endif 506#endif
507 max_it (lnsppg, 1);
508
416 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
417 { 510 {
418 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
419 return; 512 return;
420 } 513 }
… …
473 selection_request (ev.time); 566 selection_request (ev.time);
474 return; 567 return;
475#if TODO 568#if TODO
476 /* rxvt extras */ 569 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 571 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 573 return;
483#endif 574#endif
484 } 575 }
485 } 576 }
486 } 577 }
487 578
488#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 580 // ISO 14755 support
490 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 582 {
492 int hv; 583 int hv;
493 584
494 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 610# endif
520 return; 611 return;
521 } 612 }
522 else 613 else
523 { 614 {
524# if ENABLE_OVERLAY 615# if ISO_14755
525 scr_overlay_off (); 616 scr_overlay_off ();
526# endif 617# endif
527 iso14755buf = 0; 618 iso14755buf = 0;
528 } 619 }
529 } 620 }
621 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
533 { 625 {
534 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 627# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 629 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 630# endif
539 } 631 }
540#endif 632#endif
… …
547 } 639 }
548#endif 640#endif
549 641
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 653 {
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, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 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
… …
934#if ENABLE_FRILLS || ISO_14755 868#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 869 // ISO 14755 support
936 if (iso14755buf) 870 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 871 if (iso14755buf & ISO_14755_52)
938 { 872 {
939# if ENABLE_OVERLAY 873# if ISO_14755
940 scr_overlay_off (); 874 scr_overlay_off ();
941# endif 875# endif
942# if ISO_14755 876# if ISO_14755
943 // iso14755 part 5.2 handling: release time 877 // iso14755 part 5.2 handling: release time
944 // first: controls 878 // first: controls
… …
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
… …
967 901
968 return; 902 return;
969 } 903 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 904 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 905 {
972# if ENABLE_OVERLAY 906# if ISO_14755
973 scr_overlay_off (); 907 scr_overlay_off ();
974# endif 908# endif
975 if (iso14755buf & ISO_14755_51) 909 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 910 commit_iso14755 ();
977#if ISO_14755 911#if ISO_14755
… …
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 ();
1039 940
1040#ifdef ENABLE_TRANSPARENCY 941#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 942 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 943 {
1043 want_full_refresh = 0; 944 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 945 scr_touch (false);
1046 } 946 }
1047#endif 947#endif
1048 948
1049 if (want_refresh) 949 if (want_refresh)
… …
1085 } 985 }
1086 while (row < end_row); 986 while (row < end_row);
1087 } 987 }
1088 988
1089 scr_refresh (); 989 scr_refresh ();
1090 scrollbar_show (1); 990 scrollBar.show (1);
1091#ifdef USE_XIM 991#ifdef USE_XIM
1092 IMSendSpot (); 992 im_send_spot ();
1093#endif 993#endif
1094 } 994 }
1095 995
1096 display->flush (); 996 display->flush ();
1097} 997}
1098 998
999/* checks whether a refresh is requested and starts the refresh timer */
1099void 1000void
1100rxvt_term::check_cb (check_watcher &w) 1001rxvt_term::refresh_check ()
1101{ 1002{
1102 make_current (); 1003 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1005
1104 display->flush (); 1006 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1007}
1109 1008
1110void 1009void
1111rxvt_term::flush_cb (time_watcher &w) 1010rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1011{
1113 make_current (); 1012 make_current ();
1114 1013
1115 refresh_count = 0; 1014 refresh_count = 0;
1116 flush (); 1015 flush ();
1117} 1016}
1118 1017
1119#ifdef CURSOR_BLINK 1018#ifdef CURSOR_BLINK
1120void 1019void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1021{
1123 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1023 want_refresh = 1;
1125 1024 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1025}
1128#endif 1026#endif
1129 1027
1130#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1131void 1029void
1132rxvt_term::text_blink_cb (time_watcher &w) 1030rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1031{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1033 {
1136 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1137 want_refresh = 1; 1035 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1036 refresh_check ();
1139 } 1037 }
1038 else
1039 w.stop ();
1140} 1040}
1141#endif 1041#endif
1142 1042
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1044void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1046{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1049 {
1150 want_refresh = 1; 1050 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1051 refresh_check ();
1152 } 1052 }
1053 else
1054 w.stop ();
1153} 1055}
1154#endif 1056#endif
1155 1057
1156#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
1157void 1059void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1061{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1063 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1065 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1066 refresh_check ();
1165 } 1067 }
1068 else
1069 w.stop ();
1166} 1070}
1167#endif 1071#endif
1168 1072
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1074void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1076{
1173 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1078 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1079 want_refresh = 1;
1181 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 ();
1182 } 1087 }
1183} 1088}
1184#endif 1089#endif
1185 1090
1186#if LINUX_YIELD_HACK 1091#if LINUX_YIELD_HACK
1187static struct event_handler 1092static struct event_handler
1188{ 1093{
1189 check_watcher yield_ev; 1094 ev::prepare yield_ev;
1190 1095
1191 void yield_cb (check_watcher &w) 1096 void yield_cb (ev::prepare &w, int revents)
1192 { 1097 {
1193 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1196 // 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.
1197 1105
1198 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1200 1108
1201 w.stop (); 1109 w.stop ();
1202 } 1110 }
1203 1111
… …
1206 { 1114 {
1207 } 1115 }
1208} event_handler; 1116} event_handler;
1209#endif 1117#endif
1210 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
1211bool 1152bool
1212rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1213{ 1154{
1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1215 1156
1216 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1217 { 1158
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1219 n = 0;
1220 } 1160 {
1221 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1223 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1224 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1225 1166
1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1227 1168
1228 if (r > 0) 1169 if (r > 0)
1229 { 1170 {
1230 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1231 return true; 1172 return true;
… …
1247 1188
1248 return false; 1189 return false;
1249} 1190}
1250 1191
1251void 1192void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1194{
1254 make_current (); 1195 make_current ();
1255 1196
1256 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1200 cmd_parse ();
1260 break;
1261 1201
1262 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1263 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1264} 1206}
1265 1207
1266void 1208void
1267rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1268{ 1210{
… …
1271 1213
1272#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1215 hidden_pointer = 0;
1274 1216
1275 if (option (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1277#endif 1219#endif
1278} 1220}
1279 1221
1280#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1281void 1223void
… …
1289 1231
1290 hidden_pointer = 1; 1232 hidden_pointer = 1;
1291} 1233}
1292 1234
1293void 1235void
1294rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1237{
1296 make_current (); 1238 make_current ();
1297 1239
1298 pointer_blank (); 1240 pointer_blank ();
1299} 1241}
… …
1302void 1244void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1246{
1305 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1306 int x, y; 1248 int x, y;
1249 int code = 32;
1307 1250
1308 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
1309 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
1310 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 }
1311 1263
1312 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1313 button_number = 3; 1265 button_number = 3;
1314 else 1266 else
1315 { 1267 {
1316 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1318 if (button_number >= 3) 1270 if (button_number >= 3)
1319 button_number += (64 - 3); 1271 button_number += 64 - 3;
1320 } 1272 }
1321 1273
1322 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1323 { 1275 {
1324 /* 1276 /*
… …
1356 fputc ('A', stderr); 1308 fputc ('A', stderr);
1357 if (key_state & 32) 1309 if (key_state & 32)
1358 fputc ('2', stderr); 1310 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1312 button_number,
1361 x + 1, 1313 x,
1362 y + 1); 1314 y);
1363#endif 1315#endif
1364 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
1365 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1331 code + button_number + key_state,
1367 (32 + x + 1), 1332 32 + x,
1368 (32 + y + 1)); 1333 32 + y);
1369} 1334}
1370 1335
1371/*{{{ process an X event */ 1336/*{{{ process an X event */
1372void 1337void
1373rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1475 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1441 focus_out ();
1477 break; 1442 break;
1478 1443
1479 case ConfigureNotify: 1444 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1481 { 1446 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 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
1484 1468
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1470 {
1487 seen_resize = 1; 1471 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND 1473 }
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1474 else
1475 {
1476#ifdef HAVE_BG_PIXMAP
1477 if (moved)
1491 { 1478 {
1479 if (mapped)
1480 update_background ();
1492 resize_pixmap (); 1481 else
1493 scr_touch (true); 1482 bg_invalidate ();
1494 } 1483 }
1495#endif 1484#endif
1496 } 1485 }
1497 1486
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1504 } 1488 }
1505 break; 1489 break;
1506 1490
1507 case PropertyNotify: 1491 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1510 && ev.xproperty.state == PropertyNewValue)
1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1512
1513 break; 1493 break;
1514 1494
1515 case SelectionClear: 1495 case SelectionClear:
1516 selection_clear (); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1517 break;
1518
1519 case SelectionNotify:
1520 if (selection_wait == Sel_normal)
1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1522 break; 1497 break;
1523 1498
1524 case SelectionRequest: 1499 case SelectionRequest:
1525 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1526 break; 1501 break;
1527 1502
1528 case MapNotify: 1503 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a
1506 * non-reparenting window manager. In those cases we never get first
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1509 * reparenting.
1510 * We should not render background immediately, as there could be several
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025);
1519#endif
1529 mapped = 1; 1520 mapped = 1;
1530#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1522 text_blink_ev.start ();
1532#endif 1523#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1525 break;
1535 1526
1536 case UnmapNotify: 1527 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1530 text_blink_ev.stop ();
1540#endif 1531#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1533 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1534
1550 case GraphicsExpose: 1535 case GraphicsExpose:
1551 case Expose: 1536 case Expose:
1552 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1553 { 1538 {
1554 do 1539 do
1540 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1543 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1545
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1547
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1552 }
1564 1553
1565 want_refresh = 1; 1554 want_refresh = 1;
1566 } 1555 }
1567 else 1556 else
1568 { 1557 {
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1561 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1563 ;
1575 1564
1576 if (isScrollbarWindow (ev.xany.window)) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1566 {
1578 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1579 scrollbar_show (0); 1568 scrollBar.show (0);
1580 } 1569 }
1581
1582#ifdef ENABLE_TRANSPARENCY
1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1585#endif
1586 } 1570 }
1587 break; 1571 break;
1588 1572
1589 case MotionNotify: 1573 case MotionNotify:
1590#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1591 if (hidden_pointer) 1575 if (hidden_pointer)
1592 pointer_unblank (); 1576 pointer_unblank ();
1593#endif 1577#endif
1578 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1579 || priv_modes & PrivMode_MouseAnyEvent)
1580 mouse_report (ev.xbutton);
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1582 break;
1596 1583
1597 if (ev.xany.window == vt) 1584 if (ev.xany.window == vt)
1598 { 1585 {
… …
1632 int dist; 1619 int dist;
1633 1620
1634 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1635 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1636 */ 1623 */
1637 if (!sel_scroll_ev.active) 1624 if (!sel_scroll_ev.is_active ())
1638 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1639 1626
1640 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1641 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1642 */ 1629 */
1643 selection_save_x = ev.xbutton.x; 1630 selection_save_x = ev.xbutton.x;
… …
1665 else 1652 else
1666 { 1653 {
1667 /* we are within the text window, so we 1654 /* we are within the text window, so we
1668 * shouldn't be scrolling 1655 * shouldn't be scrolling
1669 */ 1656 */
1670 if (sel_scroll_ev.active)
1671 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1672 } 1658 }
1673#endif 1659#endif
1674#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1675 } 1661 }
1676#endif 1662#endif
1677 } 1663 }
1678 } 1664 }
1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1666 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1683 ; 1669 ;
1684 1670
… …
1686 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1675 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1691 scrollbar_size ()); 1677 scrollBar.size ());
1692 want_refresh = 1; 1678 want_refresh = 1;
1693 scrollbar_show (1); 1679 scrollBar.show (1);
1694 } 1680 }
1695 break; 1681 break;
1696 } 1682 }
1697 1683
1698#if defined(CURSOR_BLINK) 1684#if defined(CURSOR_BLINK)
… …
1702 { 1688 {
1703 hidden_cursor = 0; 1689 hidden_cursor = 0;
1704 want_refresh = 1; 1690 want_refresh = 1;
1705 } 1691 }
1706 1692
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1693 cursor_blink_ev.again ();
1708 } 1694 }
1709#endif 1695#endif
1710 1696
1711#if defined(POINTER_BLANK) 1697#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1719 1705
1720 if (ev.type == KeyPress && hidden_pointer == 0) 1706 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank (); 1707 pointer_blank ();
1722 } 1708 }
1723#endif 1709#endif
1710
1711 refresh_check ();
1724} 1712}
1713
1714#if ENABLE_FRILLS
1715void
1716rxvt_term::set_urgency (bool enable)
1717{
1718 if (enable == urgency_hint)
1719 return;
1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable;
1726 }
1727}
1728#endif
1725 1729
1726void 1730void
1727rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1728{ 1732{
1729 if (!focus) 1733 if (!focus)
1730 { 1734 {
1731 focus = 1; 1735 focus = 1;
1732 want_refresh = 1; 1736 want_refresh = 1;
1733 1737
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735
1736#if USE_XIM 1738#if USE_XIM
1737 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1738 { 1740 {
1739 IMSetPosition (); 1741 im_set_position ();
1740 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1741 } 1743 }
1742#endif 1744#endif
1743#if CURSOR_BLINK 1745#if CURSOR_BLINK
1744 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1747 cursor_blink_ev.again ();
1746#endif 1748#endif
1747#if OFF_FOCUS_FADING 1749#if OFF_FOCUS_FADING
1748 if (rs[Rs_fade]) 1750 if (rs[Rs_fade])
1749 { 1751 {
1750 pix_colors = pix_colors_focused; 1752 pix_colors = pix_colors_focused;
1751 scr_recolour (); 1753 scr_recolour ();
1752 } 1754 }
1753#endif 1755#endif
1754#if ENABLE_FRILLS 1756#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell)) 1757 if (option (Opt_urgentOnBell))
1756 { 1758 set_urgency (0);
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif 1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1762 }
1768} 1763}
1769 1764
1770void 1765void
1771rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1773 if (focus) 1768 if (focus)
1774 { 1769 {
1775 focus = 0; 1770 focus = 0;
1776 want_refresh = 1; 1771 want_refresh = 1;
1777 1772
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1779 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1780#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf) 1778 if (iso14755buf)
1782 { 1779 {
1783 iso14755buf = 0; 1780 iso14755buf = 0;
1784# if ENABLE_OVERLAY 1781# if ISO_14755
1785 scr_overlay_off (); 1782 scr_overlay_off ();
1786# endif 1783# endif
1787 } 1784 }
1788#endif 1785#endif
1789#if USE_XIM 1786#if USE_XIM
… …
1791 XUnsetICFocus (Input_Context); 1788 XUnsetICFocus (Input_Context);
1792#endif 1789#endif
1793#if CURSOR_BLINK 1790#if CURSOR_BLINK
1794 if (option (Opt_cursorBlink)) 1791 if (option (Opt_cursorBlink))
1795 cursor_blink_ev.stop (); 1792 cursor_blink_ev.stop ();
1793
1796 hidden_cursor = 0; 1794 hidden_cursor = 0;
1797#endif 1795#endif
1798#if OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1799 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1800 { 1798 {
1801 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1802 scr_recolour (); 1800 scr_recolour ();
1803 } 1801 }
1804#endif 1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1805 }
1806} 1806}
1807 1807
1808void 1808void
1809rxvt_term::update_fade_color (unsigned int idx) 1809rxvt_term::update_fade_color (unsigned int idx)
… …
1834 case PropertyNotify: 1834 case PropertyNotify:
1835 /* 1835 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1838 */ 1838 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1841 {
1842 bg_set_root_pixmap ();
1843 update_background ();
1844 }
1842 1845
1843 /* FALLTHROUGH */
1844 case ReparentNotify:
1845 if (option (Opt_transparent))
1846 check_our_parents ();
1847 break; 1846 break;
1848 } 1847 }
1849# endif 1848# endif
1849
1850 refresh_check ();
1850} 1851}
1851#endif 1852#endif
1852 1853
1853void 1854void
1854rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
… …
1885 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1886 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1887#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1888 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1889 { 1890 {
1890 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1891 MEvent.clicks++; 1892 MEvent.clicks++;
1892 1893
1893 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1894 { 1895 {
1895 /* only report double clicks */ 1896 /* only report double clicks */
… …
1909 mouse_report (ev); 1910 mouse_report (ev);
1910 } 1911 }
1911#else 1912#else
1912 MEvent.button = ev.button; 1913 MEvent.button = ev.button;
1913 mouse_report (ev); 1914 mouse_report (ev);
1914#endif /* MOUSE_REPORT_DOUBLECLICK */ 1915#endif /* MOUSE_REPORT_DOUBLECLICK */
1915 1916
1916 } 1917 }
1917 else 1918 else
1918 { 1919 {
1919 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
… …
1967 } 1968 }
1968 1969
1969 /* 1970 /*
1970 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1971 */ 1972 */
1972 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1973 { 1974 {
1974 scrollBar.setIdle (); 1975 page_dirn direction = NO_DIR;
1976
1977 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */
1981
1982 scrollBar.state = STATE_IDLE;
1975 /* 1983 /*
1976 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1977 * move up if mouse is above slider 1985 * move up if mouse is above slider
1978 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1979 * 1987 *
… …
1988 /* 1996 /*
1989 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1990 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1991 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1992 */ 2000 */
1993 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1994 && scrollbarnext_upButton (ev.y))
1995 || (scrollBar.style == R_SB_RXVT
1996 && scrollbarrxvt_upButton (ev.y)))
1997 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1998 else if ((scrollBar.style == R_SB_NEXT 2003 else if (direction == DN)
1999 && scrollbarnext_dnButton (ev.y))
2000 || (scrollBar.style == R_SB_RXVT
2001 && scrollbarrxvt_dnButton (ev.y)))
2002 tt_printf ("\033[B"); 2004 tt_printf ("\033[B");
2003 else 2005 else
2004 switch (ev.button) 2006 switch (ev.button)
2005 { 2007 {
2006 case Button2: 2008 case Button2:
… …
2013 tt_printf ("\033[5~"); 2015 tt_printf ("\033[5~");
2014 break; 2016 break;
2015 } 2017 }
2016 } 2018 }
2017 else 2019 else
2018#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
2019
2020 {
2021 char upordown = 0;
2022
2023 if (scrollBar.style == R_SB_NEXT)
2024 { 2021 {
2025 if (scrollbarnext_upButton (ev.y)) 2022 if (direction != NO_DIR)
2026 upordown = -1; /* up */
2027 else if (scrollbarnext_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 else if (scrollBar.style == R_SB_RXVT)
2031 {
2032 if (scrollbarrxvt_upButton (ev.y))
2033 upordown = -1; /* up */
2034 else if (scrollbarrxvt_dnButton (ev.y))
2035 upordown = 1; /* down */
2036 }
2037 if (upordown)
2038 { 2023 {
2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2025 if (!cont_scroll_ev.is_active ())
2040 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2027#endif
2042 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
2043 { 2029 {
2044 if (upordown < 0) 2030 if (direction == UP)
2045 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
2046 else 2032 else
2047 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
2048 } 2034 }
2049 } 2035 }
2050 else 2036 else
2051 switch (ev.button) 2037 switch (ev.button)
2052 { 2038 {
2053 case Button2: 2039 case Button2:
2054 switch (scrollbar_align) 2040 switch (scrollBar.align)
2055 { 2041 {
2056 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
2057 csrO = 0; 2043 csrO = 0;
2058 break; 2044 break;
2059 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
2065 } 2051 }
2066 2052
2067 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
2068 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2071 2057
2072 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2073 break; 2059 break;
2074 2060
2075 case Button1: 2061 case Button1:
2076 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
2079 2065
2080 case Button3: 2066 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
… …
2091 scr_page (DN, nrow - 1); 2077 scr_page (DN, nrow - 1);
2092# else 2078# else
2093 scr_page (DN, nrow / 4); 2079 scr_page (DN, nrow / 4);
2094# endif 2080# endif
2095 else 2081 else
2096 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
2097 } 2083 }
2098 else 2084 else
2099 { 2085 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2087 (nrow
2102 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
2103 / scrollbar_size ())); 2089 / scrollBar.size ()));
2104 } 2090 }
2105 2091
2106 break; 2092 break;
2107 } 2093 }
2108 } 2094 }
… …
2118 2104
2119 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2106 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2108
2123 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2124 { 2110 {
2125 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
2126 scrollbar_show (0); 2112 scrollBar.show (0);
2127 } 2113 }
2128 2114
2129#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
2132#endif 2117#endif
2133 2118
2134 if (ev.window == vt) 2119 if (ev.window == vt)
2135 { 2120 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2121 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2160 mouse_report (ev); 2145 mouse_report (ev);
2161 } 2146 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2147#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2148 MEvent.button = AnyButton;
2164 mouse_report (ev); 2149 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2150#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2151 return;
2167 } 2152 }
2168 2153
2169 /* 2154 /*
2170 * dumb hack to compensate for the failure of click-and-drag 2155 * dumb hack to compensate for the failure of click-and-drag
… …
2182 selection_make (ev.time); 2167 selection_make (ev.time);
2183 break; 2168 break;
2184 2169
2185 case Button2: 2170 case Button2:
2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2173 break;
2189 2174
2190#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2191 case Button4: 2176 case Button4:
2192 case Button5: 2177 case Button5:
… …
2208 { 2193 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2194 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2197
2213 if (slip_wheel_ev.at < NOW) 2198 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216 slip_wheel_ev.start ();
2217 } 2200 }
2218 else 2201 else
2202# endif
2219 { 2203 {
2220# endif
2221 scr_page (v, i); 2204 scr_page (v, i);
2222 scrollbar_show (1); 2205 scrollBar.show (1);
2223# ifdef MOUSE_SLIP_WHEELING
2224 } 2206 }
2225# endif
2226 } 2207 }
2227 break; 2208 break;
2228#endif 2209#endif
2229 } 2210 }
2230 } 2211 }
2231} 2212}
2232 2213
2233/*}}} */ 2214/*}}} */
2234 2215
2235bool 2216void
2236rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2237{ 2218{
2238 bool flag = false;
2239 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2240 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2241 2221
2242 for (;;) 2222 for (;;)
2243 { 2223 {
2244 if (ch == NOCHAR) 2224 if (ecb_unlikely (ch == NOCHAR))
2245 { 2225 {
2246 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2247 ch = next_char (); 2227 ch = next_char ();
2248 2228
2249 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2250 break; 2230 break;
2251 } 2231 }
2252 2232
2253 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2254 { 2234 {
2255 if (!seen_input) 2235 if (ecb_unlikely (!seen_input))
2256 { 2236 {
2257 seen_input = 1; 2237 seen_input = 1;
2258 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2259 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2260 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2273 wchar_t *str = buf; 2253 wchar_t *str = buf;
2274 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2275 2255
2276 for (;;) 2256 for (;;)
2277 { 2257 {
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2279 break; 2259 break;
2280 2260
2281 *str++ = ch; 2261 *str++ = ch;
2282 2262
2283 if (ch == C0_LF || str >= eol) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2284 { 2264 {
2285 if (ch == C0_LF) 2265 if (ch == C0_LF)
2286 nlines++; 2266 nlines++;
2287 2267
2288 refresh_count++; 2268 refresh_count++;
2289 2269
2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2270 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2291 { 2271 {
2292 refresh_count = 0; 2272 refresh_count = 0;
2293 2273
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2274 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2295 { 2275 {
2296 refreshnow = true; 2276 refreshnow = true;
2297 ch = NOCHAR; 2277 ch = NOCHAR;
2298 break; 2278 break;
2299 } 2279 }
… …
2337 * What the heck we'll cheat and only refresh less than every page-full. 2317 * What the heck we'll cheat and only refresh less than every page-full.
2338 * if skipScroll is enabled. 2318 * if skipScroll is enabled.
2339 */ 2319 */
2340 if (refreshnow) 2320 if (refreshnow)
2341 { 2321 {
2342 flag = true;
2343 scr_refresh (); 2322 scr_refresh ();
2344 want_refresh = 1; 2323 want_refresh = 1;
2345 } 2324 }
2346
2347 } 2325 }
2348 else 2326 else
2349 { 2327 {
2350 try 2328 try
2351 { 2329 {
… …
2359 } 2337 }
2360 2338
2361 ch = NOCHAR; 2339 ch = NOCHAR;
2362 } 2340 }
2363 } 2341 }
2364
2365 return flag;
2366} 2342}
2367 2343
2368// read the next character 2344// read the next character
2369wchar_t 2345wchar_t
2370rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2371{ 2347{
2372 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2373 { 2349 {
2374 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2376 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2377 2353
2378 wchar_t wc; 2354 wchar_t wc;
2379 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2380 2356
… …
2384 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2385 break; 2361 break;
2386 } 2362 }
2387 2363
2388 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 }
2390 2369
2391 // assume wchar == unicode 2370 // assume wchar == unicode
2392 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2393 return wc & UNICODE_MASK; 2372 return wc & UNICODE_MASK;
2394 } 2373 }
… …
2405 : NOCHAR; 2384 : NOCHAR;
2406} 2385}
2407 2386
2408static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2409 2388
2410/* rxvt_cmd_getc () - Return next input character */
2411/*
2412 * Return the next input character after first passing any keyboard input
2413 * to the command.
2414 */
2415wchar_t 2389wchar_t
2416rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2417{ 2391{
2418 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2419 2393
… …
2438/*----------------------------------------------------------------------*/ 2412/*----------------------------------------------------------------------*/
2439#ifdef PRINTPIPE 2413#ifdef PRINTPIPE
2440FILE * 2414FILE *
2441rxvt_term::popen_printer () 2415rxvt_term::popen_printer ()
2442{ 2416{
2443 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2444 2418
2445 if (stream == NULL) 2419 if (stream == NULL)
2446 rxvt_warn ("can't open printer pipe, not printing.\n"); 2420 rxvt_warn ("can't open printer pipe, not printing.\n");
2447 2421
2448 return stream; 2422 return stream;
… …
2459 * simulate attached vt100 printer 2433 * simulate attached vt100 printer
2460 */ 2434 */
2461void 2435void
2462rxvt_term::process_print_pipe () 2436rxvt_term::process_print_pipe ()
2463{ 2437{
2464 int done; 2438 FILE *fd = popen_printer ();
2465 FILE *fd;
2466 2439
2467 if ((fd = popen_printer ()) == NULL) 2440 if (!fd)
2468 return; 2441 return;
2469 2442
2470 /* 2443 /*
2471 * Send all input to the printer until either ESC[4i or ESC[?4i 2444 * Send all input to the printer until either ESC[4i or ESC[?4i
2472 * is received. 2445 * is received.
2473 */ 2446 */
2474 for (done = 0; !done;) 2447 for (int done = 0; !done; )
2475 { 2448 {
2476 unsigned char buf[8]; 2449 unsigned char buf[8];
2477 unicode_t ch; 2450 unicode_t ch;
2478 unsigned int i, len; 2451 unsigned int i, len;
2479 2452
… …
2510 } 2483 }
2511 } 2484 }
2512 2485
2513 pclose_printer (fd); 2486 pclose_printer (fd);
2514} 2487}
2515#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2516/*}}} */ 2489/*}}} */
2517 2490
2518/* *INDENT-OFF* */
2519enum { 2491enum {
2520 C1_40 = 0x40, 2492 C1_40 = 0x40,
2521 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2522 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2523 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2524 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2525}; 2497};
2526/* *INDENT-ON* */
2527 2498
2528/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2529void 2500void
2530rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2531{ 2502{
… …
2624 break; 2595 break;
2625 case 'Z': /* identify the terminal type */ 2596 case 'Z': /* identify the terminal type */
2626 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2627 break; 2598 break;
2628 case '<': /* turn off VT52 mode */ 2599 case '<': /* turn off VT52 mode */
2629 PrivMode (0, PrivMode_vt52); 2600 set_privmode (PrivMode_vt52, 0);
2630 break; 2601 break;
2631 case 'F': /* use special graphics character set */ 2602 case 'F': /* use special graphics character set */
2632 case 'G': /* use regular character set */ 2603 case 'G': /* use regular character set */
2633 /* unimplemented */ 2604 /* unimplemented */
2634 break; 2605 break;
… …
2653 return; 2624 return;
2654 } 2625 }
2655 2626
2656 switch (ch) 2627 switch (ch)
2657 { 2628 {
2658 /* case 1: do_tek_mode (); break; */
2659 case '#': 2629 case '#':
2660 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2661 scr_E (); 2631 scr_E ();
2662 break; 2632 break;
2663 case '(': 2633 case '(':
… …
2686#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2687 case '9': 2657 case '9':
2688 scr_forwardindex (); 2658 scr_forwardindex ();
2689 break; 2659 break;
2690#endif 2660#endif
2661 // DECPAM/DECPNM
2691 case '=': 2662 case '=':
2692 case '>': 2663 case '>':
2693 PrivMode ((ch == '='), PrivMode_aplKP); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2694 break; 2665 break;
2695 2666
2696 case C1_40: 2667 case C1_40:
2697 cmd_getc (); 2668 cmd_getc ();
2698 break; 2669 break;
… …
2702 2673
2703 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2705 { 2676 {
2706 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2708 } 2679 }
2709 break; 2680 break;
2710 2681
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
2713 process_graphics (); 2684 // used by original rxvt for rob nations own graphics mode
2685 if (cmd_getc () == 'Q')
2686 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2714 break; 2687 break;
2715 2688
2716 /* 8.3.63: CHARACTER TABULATION SET */ 2689 /* 8.3.63: CHARACTER TABULATION SET */
2717 case C1_HTS: /* ESC H */ 2690 case C1_HTS: /* ESC H */
2718 scr_set_tab (1); 2691 scr_set_tab (1);
… …
2722 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
2723 scr_index (DN); 2696 scr_index (DN);
2724 break; 2697 break;
2725 2698
2726 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
2727 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
2728 2701
2729 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
2730 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
2731 2704
2732 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
2733 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
2734 process_dcs_seq (); 2707 process_dcs_seq ();
2735 break; 2708 break;
… …
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2710 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2711 case C1_SCI: /* ESC Z */
2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2712 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 break; /* steal obsolete ESC [ c */ 2713 break; /* steal obsolete ESC [ c */
2741 2714
2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2715 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2743 case C1_CSI: /* ESC [ */ 2716 case C1_CSI: /* ESC [ */
2744 process_csi_seq (); 2717 process_csi_seq ();
2745 break; 2718 break;
2746 2719
2747 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2720 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2748 case C1_OSC: /* ESC ] */ 2721 case C1_OSC: /* ESC ] */
2749 process_osc_seq (); 2722 process_osc_seq ();
2750 break; 2723 break;
2751 2724
2752 /* 8.3.106: RESET TO INITIAL STATE */ 2725 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2753 case 'c': 2726 case 'c':
2754 mbstate.reset (); 2727 mbstate.reset ();
2755 scr_poweron (); 2728 scr_poweron ();
2756 scrollbar_show (1); 2729 scrollBar.show (1);
2757 break; 2730 break;
2758 2731
2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2732 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2760 case 'n': 2733 case 'n':
2761 scr_charset_choose (2); 2734 scr_charset_choose (2);
… …
2768 } 2741 }
2769} 2742}
2770/*}}} */ 2743/*}}} */
2771 2744
2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2773/* *INDENT-OFF* */
2774enum { 2746enum {
2775 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2776 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2777 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2778 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2781 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2782 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2754 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2783 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2755 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2784}; 2756};
2785 2757
2786#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2758#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2787 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2759 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2788 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2760 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2789#define get_byte_array_bit(array, bit) \ 2761#define get_byte_array_bit(array, bit) \
2790 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2762 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2791 2763
2792const unsigned char csi_defaults[] = 2764static const unsigned char csi_defaults[] =
2793 { 2765 {
2794 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2766 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2795 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2767 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2796 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2768 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2797 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2798 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2799 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2800 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2801 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2802 }; 2774 };
2803/* *INDENT-ON* */
2804 2775
2805void 2776void
2806rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2807{ 2778{
2808 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
2809 unsigned int nargs, p; 2780 unsigned int nargs, p;
2810 int n, ndef; 2781 int n, ndef;
2811 int arg[ESC_ARGS]; 2782 int arg[ESC_ARGS] = { };
2812 2783
2813 memset (arg, 0, sizeof (arg));
2814 nargs = 0; 2784 nargs = 0;
2815 2785
2816 priv = 0; 2786 priv = 0;
2817 ch = cmd_getc (); 2787 ch = cmd_getc ();
2818 if (ch >= '<' && ch <= '?') 2788 if ((ch >= '<' && ch <= '?') || ch == '!')
2789 {
2819 { /* '<' '=' '>' '?' */ 2790 /* '<' '=' '>' '?' '!' */
2820 priv = ch; 2791 priv = ch;
2821 ch = cmd_getc (); 2792 ch = cmd_getc ();
2822 } 2793 }
2823 2794
2824 /* read any numerical arguments */ 2795 /* read any numerical arguments */
… …
2867 { 2838 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 // 2841 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873 // that we do not support xterm mouse reporting (should be 95 when we do). 2844 // versions.
2874 // 2845 //
2875 tt_printf ("\033[>%d;94;0c", 'U'); 2846 tt_printf ("\033[>%d;95;0c", 'U');
2876 } 2847 }
2877 break; 2848 break;
2849
2878 case '?': 2850 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2851 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2852 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 2853 break;
2854
2855 case '!':
2856 if (ch == CSI_70)
2857 {
2858 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2859 scr_soft_reset ();
2860
2861 static const int pm_h[] = { 7, 25 };
2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863
2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2882 } 2866 }
2867 break;
2868 }
2869
2883 return; 2870 return;
2884 } 2871 }
2885 2872
2886 switch (ch) 2873 switch (ch)
2887 { 2874 {
… …
3102 } 3089 }
3103} 3090}
3104/*}}} */ 3091/*}}} */
3105 3092
3106#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3107/* ARGSUSED */
3108void 3094void
3109rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3110{ 3096{
3111 int x, y; 3097 int x, y;
3112 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3121 { 3107 {
3122 /* 3108 /*
3123 * commands 3109 * commands
3124 */ 3110 */
3125 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3126 XMapWindow (dpy, parent[0]); 3112 XMapWindow (dpy, parent);
3127 break; 3113 break;
3128 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3129 XIconifyWindow (dpy, parent[0], display->screen); 3115 XIconifyWindow (dpy, parent, display->screen);
3130 break; 3116 break;
3131 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3132 XMoveWindow (dpy, parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3133 break; 3119 break;
3134 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3136 break; 3122 break;
3137 case 5: /* raise window */ 3123 case 5: /* raise window */
3138 XRaiseWindow (dpy, parent[0]); 3124 XRaiseWindow (dpy, parent);
3139 break; 3125 break;
3140 case 6: /* lower window */ 3126 case 6: /* lower window */
3141 XLowerWindow (dpy, parent[0]); 3127 XLowerWindow (dpy, parent);
3142 break; 3128 break;
3143 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3144 scr_touch (true); 3130 scr_touch (true);
3145 break; 3131 break;
3146 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
… …
3157 3143
3158 /* 3144 /*
3159 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3160 */ 3146 */
3161 case 11: /* report window state */ 3147 case 11: /* report window state */
3162 XGetWindowAttributes (dpy, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3164 break; 3150 break;
3165 case 13: /* report window position */ 3151 case 13: /* report window position */
3166 XGetWindowAttributes (dpy, parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3167 XTranslateCoordinates (dpy, parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3168 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3169 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3170 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3171 break; 3157 break;
3172 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3173 XGetWindowAttributes (dpy, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3175 break; 3161 break;
3176 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3177 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3178 break; 3164 break;
… …
3180 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3181 break; 3167 break;
3182 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3183 { 3169 {
3184 char *s; 3170 char *s;
3185 XGetIconName (dpy, parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3187 XFree (s); 3173 XFree (s);
3188 } 3174 }
3189 break; 3175 break;
3190 case 21: /* report window title */ 3176 case 21: /* report window title */
3191 { 3177 {
3192 char *s; 3178 char *s;
3193 XFetchName (dpy, parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s); 3181 XFree (s);
3196 } 3182 }
3197 break; 3183 break;
3198 } 3184 }
… …
3254 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3240 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3255 */ 3241 */
3256void 3242void
3257rxvt_term::process_dcs_seq () 3243rxvt_term::process_dcs_seq ()
3258{ 3244{
3259 char *s;
3260 unicode_t eh;
3261
3262 /* 3245 /*
3263 * Not handled yet 3246 * Not handled yet
3264 */ 3247 */
3248
3249 unicode_t eh;
3265 s = get_to_st (eh); 3250 char *s = get_to_st (eh);
3266 if (s) 3251 if (s)
3267 free (s); 3252 free (s);
3268 3253
3269 return; 3254 return;
3270} 3255}
… …
3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3259 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3275 */ 3260 */
3276void 3261void
3277rxvt_term::process_osc_seq () 3262rxvt_term::process_osc_seq ()
3278{ 3263{
3279 unicode_t ch, eh;
3280 int arg; 3264 int arg;
3281 3265
3282 ch = cmd_getc (); 3266 unicode_t ch = cmd_getc ();
3283 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3267 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3284 arg = arg * 10 + (ch - '0'); 3268 arg = arg * 10 + (ch - '0');
3285 3269
3286 if (ch == ';') 3270 if (ch == ';')
3287 { 3271 {
3272 unicode_t eh;
3288 char *s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3289 3274
3290 if (s) 3275 if (s)
3291 { 3276 {
3292 process_xterm_seq (arg, s, eh); 3277 process_xterm_seq (arg, s, eh);
… …
3316 3301
3317/* 3302/*
3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3303 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3319 */ 3304 */
3320void 3305void
3321rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3306rxvt_term::process_xterm_seq (int op, char *str, char resp)
3322{ 3307{
3323 int color; 3308 int color;
3324 char *buf, *name; 3309 char *buf, *name;
3325 bool query = str[0] == '?' && !str[1]; 3310 bool query = str[0] == '?' && !str[1];
3326 int saveop = op; 3311 int saveop = op;
… …
3353 unsigned long bytes_after; 3338 unsigned long bytes_after;
3354 unsigned char *value = 0; 3339 unsigned char *value = 0;
3355 const char *str = ""; 3340 const char *str = "";
3356 3341
3357 if (prop 3342 if (prop
3358 && XGetWindowProperty (dpy, parent[0], 3343 && XGetWindowProperty (dpy, parent,
3359 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3360 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3361 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3362 && actual_type != None 3347 && actual_type != None
3363 && actual_format == 8) 3348 && actual_format == 8)
… …
3367 3352
3368 XFree (value); 3353 XFree (value);
3369 } 3354 }
3370 else 3355 else
3371 { 3356 {
3372 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3357 char *eq = strchr (str, '=');
3373 3358
3374 if (eq) 3359 if (eq)
3375 { 3360 {
3376 *eq = 0; 3361 *eq = 0;
3377 set_utf8_property (display->atom (str), eq + 1); 3362 set_utf8_property (display->atom (str), eq + 1);
3378 } 3363 }
3379 else 3364 else
3380 XDeleteProperty (dpy, parent[0], 3365 XDeleteProperty (dpy, parent,
3381 display->atom (str)); 3366 display->atom (str));
3382 } 3367 }
3383 break; 3368 break;
3384 3369
3385 case XTerm_Color: 3370 case XTerm_Color:
… …
3398 *buf++ = '\0'; 3383 *buf++ = '\0';
3399 3384
3400 process_color_seq (op, color, name, resp); 3385 process_color_seq (op, color, name, resp);
3401 } 3386 }
3402 break; 3387 break;
3388 case Rxvt_restoreFG:
3403 case XTerm_Color00: 3389 case XTerm_Color00:
3404 process_color_seq (op, Color_fg, str, resp); 3390 process_color_seq (op, Color_fg, str, resp);
3405 break; 3391 break;
3392 case Rxvt_restoreBG:
3406 case XTerm_Color01: 3393 case XTerm_Color01:
3407 process_color_seq (op, Color_bg, str, resp); 3394 process_color_seq (op, Color_bg, str, resp);
3408 break; 3395 break;
3409#ifndef NO_CURSORCOLOR 3396#ifndef NO_CURSORCOLOR
3410 case XTerm_Color_cursor: 3397 case XTerm_Color_cursor:
… …
3415 process_color_seq (op, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3416 break; 3403 break;
3417 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3418 process_color_seq (op, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3419 break; 3406 break;
3407#ifdef OPTION_HC
3408 case XTerm_Color_HC:
3409 process_color_seq (op, Color_HC, str, resp);
3410 break;
3411 case XTerm_Color_HTC:
3412 process_color_seq (op, Color_HTC, str, resp);
3413 break;
3414#endif
3420#ifndef NO_BOLD_UNDERLINE_REVERSE 3415#ifndef NO_BOLD_UNDERLINE_REVERSE
3421 case XTerm_Color_RV:
3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD: 3416 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp); 3417 process_color_seq (op, Color_BD, str, resp);
3427 break; 3418 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL: 3419 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp); 3420 process_color_seq (op, Color_UL, str, resp);
3431 break; 3421 break;
3432 case URxvt_Color_IT: 3422 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3423 process_color_seq (op, Color_IT, str, resp);
3434 break; 3424 break;
3435#endif 3425#endif
3426 case URxvt_Color_border:
3427 process_color_seq (op, Color_border, str, resp);
3428 break;
3436#if ENABLE_TRANSPARENCY && TINTING 3429#if ENABLE_TRANSPARENCY
3437 case URxvt_Color_tint: 3430 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3431 process_color_seq (op, Color_tint, str, resp);
3432 {
3433 bool changed = false;
3439 3434
3440 check_our_parents (); 3435 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3441 3437
3442 if (am_transparent) 3438 if (changed)
3443 want_full_refresh = want_refresh = 1; 3439 update_background ();
3440 }
3444 3441
3445 break; 3442 break;
3446#endif 3443#endif
3447 3444
3445#if BG_IMAGE_FROM_FILE
3448 case Rxvt_Pixmap: 3446 case Rxvt_Pixmap:
3449 { 3447 if (!strcmp (str, "?"))
3450 if (*str != ';')
3451 { 3448 {
3452#if XPM_BACKGROUND 3449 char str[256];
3453 scale_pixmap (""); /* reset to default scaling */ 3450
3454 set_bgPixmap (str); /* change pixmap */ 3451 sprintf (str, "[%dx%d+%d+%d]",
3455 scr_touch (true); 3452 min (h_scale, 32767), min (v_scale, 32767),
3456#endif 3453 min (h_align, 32767), min (v_align, 32767));
3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3457 } 3455 }
3458 3456 else
3457 {
3459 int changed = 0; 3458 int changed = 0;
3460 3459
3461 while ((str = strchr (str, ';')) != NULL) 3460 if (*str != ';')
3462 { 3461 {
3462 if (bg_set_file (str)) /* change pixmap */
3463 {
3464 changed++;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bg_set_default_geometry ();
3468 else
3469 bg_set_geometry (str+1);
3470 }
3471 }
3472 else
3473 {
3463 str++; 3474 str++;
3464#if XPM_BACKGROUND 3475 if (bg_set_geometry (str, true))
3465 changed += scale_pixmap (str); 3476 changed++;
3466#endif
3467 } 3477 }
3468 3478
3469 if (changed) 3479 if (changed)
3470 { 3480 {
3471#ifdef XPM_BACKGROUND 3481 if (bg_window_position_sensitive ())
3472 resize_pixmap (); 3482 {
3473 scr_touch (true); 3483 int x, y;
3474#endif 3484 get_window_origin (x, y);
3485 bg_set_position (x, y);
3486 }
3487 update_background ();
3475 } 3488 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent))
3478 check_our_parents ();
3479#endif
3480 } 3489 }
3481 break; 3490 break;
3482 3491#endif
3483 case Rxvt_restoreFG:
3484 set_window_color (Color_fg, str);
3485 break;
3486 case Rxvt_restoreBG:
3487 set_window_color (Color_bg, str);
3488 break;
3489 3492
3490 case XTerm_logfile: 3493 case XTerm_logfile:
3491 // TODO, when secure mode? 3494 // TODO, when secure mode?
3492 break; 3495 break;
3493 3496
… …
3560 break; 3563 break;
3561#endif 3564#endif
3562 3565
3563#if ENABLE_PERL 3566#if ENABLE_PERL
3564 case URxvt_perl: 3567 case URxvt_perl:
3565 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3568 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3566 ; // no responses yet
3567 break; 3569 break;
3568#endif 3570#endif
3569 } 3571 }
3570} 3572}
3571/*----------------------------------------------------------------------*/ 3573/*----------------------------------------------------------------------*/
… …
3594 { 3596 {
3595 if (mode == 'r') 3597 if (mode == 'r')
3596 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3597 else 3599 else
3598 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3600 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3599 PrivMode (state, bit); 3601
3602 set_privmode (bit, state);
3600 } 3603 }
3601 3604
3602 return state; 3605 return state;
3603} 3606}
3604 3607
3605/* we're not using priv _yet_ */ 3608/* we're not using priv _yet_ */
3606void 3609void
3607rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3610rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3608{ 3611{
3609 unsigned int i, j; 3612 unsigned int i, j;
3610 int state; 3613 int state;
3611 3614
3612 static const struct 3615 static const struct
3613 { 3616 {
3614 const int argval; 3617 const int argval;
3615 const unsigned long bit; 3618 const unsigned long bit;
3616 }
3617
3618 argtopriv[] = { 3619 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, 3620 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, 3622 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, 3623 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, 3624 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, 3625 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, 3626 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, bi-directional support mode 3627 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
3628 // 18, 19 printing-related 3629 // 18 end FF to printer after print screen
3630 // 19 Print screen prints full screen/scroll region
3629 { 25, PrivMode_VisibleCursor }, 3631 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3630#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3631 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3632#endif 3634#endif
3633 { 35, PrivMode_ShiftKeys }, // rxvt extension 3635 { 35, PrivMode_ShiftKeys }, // rxvt extension
3636 // 38, tektronix mode // DECTEK
3634 { 40, PrivMode_132OK }, 3637 { 40, PrivMode_132OK },
3635 // 41 xterm more fixes NYI 3638 // 41 xterm more fixes NYI
3636 // 45 margin bell NYI 3639 // 45 margin bell NYI
3637 // 46 start logging 3640 // 46 start logging
3638 { 47, PrivMode_Screen }, 3641 { 47, PrivMode_Screen },
3639 { 66, PrivMode_aplKP }, 3642 { 66, PrivMode_aplKP }, // DECNKM
3640#ifndef NO_BACKSPACE_KEY 3643#ifndef NO_BACKSPACE_KEY
3641 { 67, PrivMode_BackSpace }, 3644 { 67, PrivMode_BackSpace }, // DECBKM
3642#endif 3645#endif
3643 { 1000, PrivMode_MouseX11 }, 3646 { 1000, PrivMode_MouseX11 },
3644 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3647 { 1002, PrivMode_MouseBtnEvent },
3645 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3648 { 1003, PrivMode_MouseAnyEvent },
3646 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3649#if ENABLE_FRILLS
3650 { 1005, PrivMode_ExtModeMouse },
3651#endif
3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3652 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3648 { 1011, PrivMode_Keypress }, // rxvt extension 3653 { 1011, PrivMode_Keypress }, // rxvt extension
3654#if ENABLE_FRILLS
3655 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3656#endif
3649 // 1035 enable modifiers for alt, numlock NYI 3657 // 1035 enable modifiers for alt, numlock NYI
3650 // 1036 send ESC for meta keys NYI 3658 // 1036 send ESC for meta keys NYI
3651 // 1037 send DEL for keypad delete NYI 3659 // 1037 send DEL for keypad delete NYI
3652 { 1047, PrivMode_Screen }, 3660 { 1047, PrivMode_Screen },
3653 // 1048 save and restore cursor 3661 // 1048 save and restore cursor, implemented in code
3654 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3662 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3655 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3663 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3664 { 2004, PrivMode_BracketPaste },
3656 }; 3665 };
3657 3666
3658 if (nargs == 0) 3667 if (nargs == 0)
3659 return; 3668 return;
3660 3669
… …
3667 for (i = 0; i < nargs; i++) 3676 for (i = 0; i < nargs; i++)
3668 { 3677 {
3669 state = -1; 3678 state = -1;
3670 3679
3671 /* basic handling */ 3680 /* basic handling */
3672 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3681 for (j = 0; j < ecb_array_length (argtopriv); j++)
3673 if (argtopriv[j].argval == arg[i]) 3682 if (argtopriv[j].argval == arg[i])
3674 { 3683 {
3675 state = privcases (mode, argtopriv[j].bit); 3684 state = privcases (mode, argtopriv[j].bit);
3676 break; 3685 break;
3677 } 3686 }
… …
3685 3694
3686 scr_touch (true); 3695 scr_touch (true);
3687 break; 3696 break;
3688#endif 3697#endif
3689 case 1048: /* alternative cursor save */ 3698 case 1048: /* alternative cursor save */
3690 case 1049:
3691 if (option (Opt_secondaryScreen)) 3699 if (option (Opt_secondaryScreen))
3692 if (mode == 0) 3700 if (mode == 0)
3693 scr_cursor (RESTORE); 3701 scr_cursor (RESTORE);
3694 else if (mode == 1) 3702 else if (mode == 1)
3695 scr_cursor (SAVE); 3703 scr_cursor (SAVE);
… …
3704 case 2: /* VT52 mode */ 3712 case 2: /* VT52 mode */
3705 /* oddball mode. should be set regardless of set/reset 3713 /* oddball mode. should be set regardless of set/reset
3706 * parameter. Return from VT52 mode with an ESC < from 3714 * parameter. Return from VT52 mode with an ESC < from
3707 * within VT52 mode 3715 * within VT52 mode
3708 */ 3716 */
3709 PrivMode (1, PrivMode_vt52); 3717 set_privmode (PrivMode_vt52, 1);
3710 break; 3718 break;
3711 case 3: /* 80/132 */ 3719 case 3: /* 80/132 */
3712 if (priv_modes & PrivMode_132OK) 3720 if (priv_modes & PrivMode_132OK)
3713 set_widthheight (((state ? 132 : 80) * fwidth), height); 3721 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3714 break; 3722 break;
3715 case 4: /* smooth scrolling */ 3723 case 4: /* smooth scrolling */
3716 set_option (Opt_jumpScroll, !state); 3724 set_option (Opt_jumpScroll, !state);
3717 break; 3725 break;
3718 case 5: /* reverse video */ 3726 case 5: /* reverse video */
… …
3725 scr_autowrap (state); 3733 scr_autowrap (state);
3726 break; 3734 break;
3727 /* case 8: - auto repeat, can't do on a per window basis */ 3735 /* case 8: - auto repeat, can't do on a per window basis */
3728 case 9: /* X10 mouse reporting */ 3736 case 9: /* X10 mouse reporting */
3729 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3730 priv_modes &= ~PrivMode_MouseX11; 3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3731 break; 3739 break;
3732#ifdef scrollBar_esc 3740#ifdef scrollBar_esc
3733 case scrollBar_esc: 3741 case scrollBar_esc:
3734 if (scrollbar_mapping (state)) 3742 if (scrollBar.map (state))
3735 { 3743 {
3736 resize_all_windows (0, 0, 0); 3744 resize_all_windows (0, 0, 0);
3737 scr_touch (true); 3745 scr_touch (true);
3738 } 3746 }
3739 break; 3747 break;
… …
3748 break; 3756 break;
3749 /* case 66: - application key pad */ 3757 /* case 66: - application key pad */
3750 /* case 67: - backspace key */ 3758 /* case 67: - backspace key */
3751 case 1000: /* X11 mouse reporting */ 3759 case 1000: /* X11 mouse reporting */
3752 if (state) /* orthogonal */ 3760 if (state) /* orthogonal */
3753 priv_modes &= ~PrivMode_MouseX10; 3761 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3754 break; 3762 break;
3755#if 0
3756 case 1001: 3763 case 1002:
3757 break; /* X11 mouse highlighting */ 3764 case 1003:
3758#endif 3765 if (state)
3766 {
3767 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3768 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3769 mouse_row = mouse_col = 0;
3770 vt_emask_mouse = PointerMotionMask;
3771 }
3772 else
3773 vt_emask_mouse = NoEventMask;
3774
3775 vt_select_input ();
3776 break;
3759 case 1010: /* scroll to bottom on TTY output inhibit */ 3777 case 1010: /* scroll to bottom on TTY output inhibit */
3760 set_option (Opt_scrollTtyOutput, !state); 3778 set_option (Opt_scrollTtyOutput, !state);
3761 break; 3779 break;
3762 case 1011: /* scroll to bottom on key press */ 3780 case 1011: /* scroll to bottom on key press */
3763 set_option (Opt_scrollTtyKeypress, state); 3781 set_option (Opt_scrollTtyKeypress, state);
3764 break; 3782 break;
3765 case 1047: /* secondary screen w/ clearing last */ 3783 case 1047: /* secondary screen w/ clearing last */
3766 if (option (Opt_secondaryScreen)) 3784 if (option (Opt_secondaryScreen))
3767 if (current_screen != PRIMARY) 3785 if (!state)
3768 scr_erase_screen (2); 3786 scr_erase_screen (2);
3787
3769 scr_change_screen (state); 3788 scr_change_screen (state);
3770 break; 3789 break;
3771 case 1049: /* secondary screen w/ clearing first */ 3790 case 1049: /* secondary screen w/ clearing first */
3791 if (option (Opt_secondaryScreen))
3792 if (state)
3793 scr_cursor (SAVE);
3794
3772 scr_change_screen (state); 3795 scr_change_screen (state);
3796
3773 if (option (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
3774 if (current_screen != PRIMARY) 3798 if (state)
3775 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800 else
3801 scr_cursor (RESTORE);
3776 break; 3802 break;
3777 default: 3803 default:
3778 break; 3804 break;
3779 } 3805 }
3780 } 3806 }
… …
3933 } 3959 }
3934 } 3960 }
3935} 3961}
3936/*}}} */ 3962/*}}} */
3937 3963
3938/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3939void
3940rxvt_term::process_graphics ()
3941{
3942 unicode_t ch, cmd = cmd_getc ();
3943
3944 if (cmd == 'Q')
3945 { /* query graphics */
3946 tt_printf ("\033G0\012"); /* no graphics */
3947 return;
3948 }
3949 /* swallow other graphics sequences until terminating ':' */
3950 do
3951 ch = cmd_getc ();
3952 while (ch != ':');
3953}
3954/*}}} */
3955
3956/* ------------------------------------------------------------------------- */ 3964/* ------------------------------------------------------------------------- */
3957 3965
3958/* 3966/*
3959 * Send printf () formatted output to the command. 3967 * Send printf () formatted output to the command.
3960 * Only use for small amounts of data. 3968 * Only use for small amounts of data.
… …
3973 3981
3974/* ---------------------------------------------------------------------- */ 3982/* ---------------------------------------------------------------------- */
3975/* Write data to the pty as typed by the user, pasted with the mouse, 3983/* Write data to the pty as typed by the user, pasted with the mouse,
3976 * or generated by us in response to a query ESC sequence. 3984 * or generated by us in response to a query ESC sequence.
3977 */ 3985 */
3978const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3986static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3979 3987
3980void 3988void
3981rxvt_term::tt_write (const char *data, unsigned int len) 3989rxvt_term::tt_write (const char *data, unsigned int len)
3982{ 3990{
3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3991 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3988 3996
3989 if (v_buflen == 0) 3997 if (v_buflen == 0)
3990 { 3998 {
3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3999 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3992 4000
4001 max_it (written, 0);
4002
3993 if ((unsigned int)written == len) 4003 if (written == len)
3994 return; 4004 return;
3995 4005
3996 data += written; 4006 data += written;
3997 len -= written; 4007 len -= written;
3998 } 4008 }
3999 4009
4000 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4010 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4001 4011
4002 memcpy (v_buffer + v_buflen, data, len); 4012 memcpy (v_buffer + v_buflen, data, len);
4003 v_buflen += len; 4013 v_buflen += len;
4004 4014
4005 pty_ev.set (EVENT_READ | EVENT_WRITE); 4015 pty_ev.set (ev::READ | ev::WRITE);
4006} 4016}
4007 4017
4008void rxvt_term::pty_write () 4018void rxvt_term::pty_write ()
4009{ 4019{
4010 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4015 4025
4016 if (v_buflen == 0) 4026 if (v_buflen == 0)
4017 { 4027 {
4018 free (v_buffer); 4028 free (v_buffer);
4019 v_buffer = 0; 4029 v_buffer = 0;
4020 v_buflen = 0;
4021 4030
4022 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4023 return; 4032 return;
4024 } 4033 }
4025 4034
4026 memmove (v_buffer, v_buffer + written, v_buflen); 4035 memmove (v_buffer, v_buffer + written, v_buflen);
4027 } 4036 }
4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4037 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4029 pty_ev.set (EVENT_READ); 4038 pty_ev.set (ev::READ);
4030} 4039}
4031 4040
4032/*----------------------- end-of-file (C source) -----------------------*/ 4041/*----------------------- end-of-file (C source) -----------------------*/
4033 4042

Diff Legend

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