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.362 by ayin, Sat Nov 10 16:04:49 2007 UTC vs.
Revision 1.495 by sf-exg, Sun Aug 28 18:48:41 2011 UTC

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

Diff Legend

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