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.370 by ayin, Fri Nov 30 10:57:04 2007 UTC vs.
Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 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
553 newlen = 1; 655 case XK_BackSpace:
554#ifdef XK_KP_Home 656 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 657 {
556 XK_KP_7, // XK_KP_Home 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 659 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 660 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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
684 newlen = 0;
685 }
686 break;
571 687
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
573 { 768 {
574 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
576 } 774 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 775 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 776 }
794 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
795 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
797 */ 797 */
798#ifdef META8_OPTION 798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
801#endif 801#endif
802 }
802 803
803 } 804 }
804 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
805 { 806 {
806 len = 1; 807 len = 1;
… …
839 if (view_start) 840 if (view_start)
840 { 841 {
841 view_start = 0; 842 view_start = 0;
842 want_refresh = 1; 843 want_refresh = 1;
843 } 844 }
844
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858 845
859 /* escape prefix */ 846 /* escape prefix */
860 if (meta 847 if (meta
861#ifdef META8_OPTION 848#ifdef META8_OPTION
862 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
898 commit_iso14755 (); 885 commit_iso14755 ();
899 886
900 return; 887 return;
901 } 888 }
902 889
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 891 if (i[0] == keysym)
905 { 892 {
906 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 894 commit_iso14755 ();
908 895
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
947#endif 934#endif
948} 935}
949 936
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 937void
984rxvt_term::flush () 938rxvt_term::flush ()
985{ 939{
986 flush_ev.stop (); 940 flush_ev.stop ();
987 941
988#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
990 { 944 {
991// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 946 scr_touch (false);
993 } 947 }
994#endif 948#endif
995 949
996 if (want_refresh) 950 if (want_refresh)
… …
1032 } 986 }
1033 while (row < end_row); 987 while (row < end_row);
1034 } 988 }
1035 989
1036 scr_refresh (); 990 scr_refresh ();
1037 scrollbar_show (1); 991 scrollBar.show (1);
1038#ifdef USE_XIM 992#ifdef USE_XIM
1039 IMSendSpot (); 993 im_send_spot ();
1040#endif 994#endif
1041 } 995 }
1042 996
1043 display->flush (); 997 display->flush ();
1044} 998}
1045 999
1000/* checks whether a refresh is requested and starts the refresh timer */
1046void 1001void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1002rxvt_term::refresh_check ()
1048{ 1003{
1049 make_current (); 1004 if (want_refresh && !flush_ev.is_active ())
1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1006
1051 display->flush (); 1007 display->flush ();
1052
1053 if (want_refresh && !flush_ev.active)
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1008}
1056 1009
1057void 1010void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1011rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1012{
… …
1067void 1020void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1021rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1022{
1070 hidden_cursor = !hidden_cursor; 1023 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1024 want_refresh = 1;
1025 refresh_check ();
1072} 1026}
1073#endif 1027#endif
1074 1028
1075#ifdef TEXT_BLINK 1029#ifdef TEXT_BLINK
1076void 1030void
… …
1078{ 1032{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1033 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1034 {
1081 hidden_text = !hidden_text; 1035 hidden_text = !hidden_text;
1082 want_refresh = 1; 1036 want_refresh = 1;
1037 refresh_check ();
1083 } 1038 }
1084}
1085#endif
1086
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1093 want_refresh = 1;
1094 else 1039 else
1095 w.stop (); 1040 w.stop ();
1096} 1041}
1097#endif 1042#endif
1098 1043
1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1045void
1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1047{
1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1050 {
1051 want_refresh = 1;
1052 refresh_check ();
1053 }
1054 else
1055 w.stop ();
1056}
1057#endif
1058
1099#ifdef SELECTION_SCROLLING 1059#ifdef SELECTION_SCROLLING
1100void 1060void
1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1102{ 1062{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1063 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1064 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1065 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1066 want_refresh = 1;
1067 refresh_check ();
1107 } 1068 }
1108 else 1069 else
1109 w.stop (); 1070 w.stop ();
1110} 1071}
1111#endif 1072#endif
1112 1073
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1074#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1075void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1076rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1077{
1117 if (mouse_slip_wheel_speed == 0 1078 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1079 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1080 want_refresh = 1;
1081 refresh_check ();
1082 }
1083
1084 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1085 {
1126 else 1086 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1087 w.stop ();
1088 }
1128} 1089}
1129#endif 1090#endif
1130 1091
1131#if LINUX_YIELD_HACK 1092#if LINUX_YIELD_HACK
1132static struct event_handler 1093static struct event_handler
… …
1137 { 1098 {
1138 // this should really be sched_yield(), but the linux guys thought 1099 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than 1100 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is 1101 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS. 1102 // allowed by the sus... as is returning ENOSYS.
1103 // since the linux guys additionally thought that breaking the only
1104 // known workaround against their unusable sched_yield hack is cool,
1105 // we just nanosleep a bit and hope for the best.
1142 1106
1143 struct timespec ts = { 0, 0 }; 1107 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0); 1108 nanosleep (&ts, 0);
1145 1109
1146 w.stop (); 1110 w.stop ();
1147 } 1111 }
1148 1112
… …
1151 { 1115 {
1152 } 1116 }
1153} event_handler; 1117} event_handler;
1154#endif 1118#endif
1155 1119
1120/* make sure all the cmd data is at beginning of cmdbuf */
1121void
1122rxvt_term::cmdbuf_reify ()
1123{
1124 if (cmdbuf_ptr == cmdbuf_base)
1125 return;
1126
1127 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1128
1129 memmove (cmdbuf_base, cmdbuf_ptr, used);
1130 cmdbuf_ptr = cmdbuf_base;
1131 cmdbuf_endp = cmdbuf_ptr + used;
1132
1133}
1134
1135#if defined (KEYSYM_RESOURCE)
1136void
1137rxvt_term::cmdbuf_append (const char *str, size_t count)
1138{
1139 cmdbuf_reify ();
1140
1141 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1142
1143 if (count > avail)
1144 return;
1145
1146 memcpy (cmdbuf_endp, str, count);
1147 cmdbuf_endp += count;
1148
1149 cmd_parse ();
1150}
1151#endif
1152
1156bool 1153bool
1157rxvt_term::pty_fill () 1154rxvt_term::pty_fill ()
1158{ 1155{
1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1156 cmdbuf_reify ();
1160 1157
1161 if (CBUFSIZ == n) 1158 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1162 { 1159
1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1160 if (!avail)
1164 n = 0;
1165 } 1161 {
1166 1162 // normally this indicates a "too long" command sequence - just drop the data we have
1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1168 cmdbuf_ptr = cmdbuf_base; 1163 cmdbuf_ptr = cmdbuf_base;
1169 cmdbuf_endp = cmdbuf_ptr + n; 1164 cmdbuf_endp = cmdbuf_ptr;
1165 avail = CBUFSIZ;
1166 }
1170 1167
1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1168 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1172 1169
1173 if (r > 0) 1170 if (r > 0)
1174 { 1171 {
1175 cmdbuf_endp += r; 1172 cmdbuf_endp += r;
1176 return true; 1173 return true;
… …
1198{ 1195{
1199 make_current (); 1196 make_current ();
1200 1197
1201 if (revents & ev::READ) 1198 if (revents & ev::READ)
1202 // loop, but don't allow a single term to monopolize us 1199 // loop, but don't allow a single term to monopolize us
1203 while (pty_fill ()) 1200 for (int i = CBUFCNT; i-- && pty_fill (); )
1204 if (cmd_parse ()) 1201 cmd_parse ();
1205 break;
1206 1202
1207 if (revents & ev::WRITE) 1203 if (revents & ev::WRITE)
1208 pty_write (); 1204 pty_write ();
1205
1206 refresh_check ();
1209} 1207}
1210 1208
1211void 1209void
1212rxvt_term::pointer_unblank () 1210rxvt_term::pointer_unblank ()
1213{ 1211{
… …
1249{ 1247{
1250 int button_number, key_state = 0; 1248 int button_number, key_state = 0;
1251 int x, y; 1249 int x, y;
1252 int code = 32; 1250 int code = 32;
1253 1251
1254 x = Pixel2Col (ev.x); 1252 x = Pixel2Col (ev.x) + 1;
1255 y = Pixel2Row (ev.y); 1253 y = Pixel2Row (ev.y) + 1;
1254
1256 if (ev.type == MotionNotify) 1255 if (ev.type == MotionNotify)
1257 { 1256 {
1258 if (x == mouse_row && y == mouse_col) 1257 if (x == mouse_row && y == mouse_col)
1259 return; 1258 return;
1259
1260 mouse_row = x; 1260 mouse_row = x;
1261 mouse_col = y; 1261 mouse_col = y;
1262 code += 32; 1262 code += 32;
1263 } 1263 }
1264 1264
… …
1267 else 1267 else
1268 { 1268 {
1269 button_number = MEvent.button - Button1; 1269 button_number = MEvent.button - Button1;
1270 /* add 0x3D for wheel events, like xterm does */ 1270 /* add 0x3D for wheel events, like xterm does */
1271 if (button_number >= 3) 1271 if (button_number >= 3)
1272 button_number += (64 - 3); 1272 button_number += 64 - 3;
1273 } 1273 }
1274 1274
1275 if (priv_modes & PrivMode_MouseX10) 1275 if (priv_modes & PrivMode_MouseX10)
1276 { 1276 {
1277 /* 1277 /*
… …
1309 fputc ('A', stderr); 1309 fputc ('A', stderr);
1310 if (key_state & 32) 1310 if (key_state & 32)
1311 fputc ('2', stderr); 1311 fputc ('2', stderr);
1312 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
1313 button_number, 1313 button_number,
1314 x + 1, 1314 x,
1315 y + 1); 1315 y);
1316#endif 1316#endif
1317 1317
1318#if ENABLE_FRILLS
1319 if (priv_modes & PrivMode_ExtMouseRight)
1320 tt_printf ("\033[%d;%d;%dM",
1321 code + button_number + key_state,
1322 x,
1323 y);
1324 else if (priv_modes & PrivMode_ExtModeMouse)
1325 tt_printf ("\033[M%c%lc%lc",
1326 code + button_number + key_state,
1327 wint_t (32 + x),
1328 wint_t (32 + y));
1329 else
1330#endif
1318 tt_printf ("\033[M%c%c%c", 1331 tt_printf ("\033[M%c%c%c",
1319 (code + button_number + key_state), 1332 code + button_number + key_state,
1320 (32 + x + 1), 1333 32 + x,
1321 (32 + y + 1)); 1334 32 + y);
1322} 1335}
1323 1336
1324/*{{{ process an X event */ 1337/*{{{ process an X event */
1325void 1338void
1326rxvt_term::x_cb (XEvent &ev) 1339rxvt_term::x_cb (XEvent &ev)
… …
1428 && ev.xfocus.mode != NotifyGrab) 1441 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1442 focus_out ();
1430 break; 1443 break;
1431 1444
1432 case ConfigureNotify: 1445 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1436 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent)
1437 { 1447 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1449 ;
1450
1451#ifdef HAVE_BG_PIXMAP
1452 bool moved = false;
1453 if (bg_window_position_sensitive ())
1454 {
1455 int x, y;
1456 if (ev.xconfigure.send_event)
1457 {
1458 x = ev.xconfigure.x;
1459 y = ev.xconfigure.y;
1460 }
1461 else
1462 get_window_origin (x, y);
1463
1464 if (bg_set_position (x, y)
1465 || !(bg_flags & BG_IS_VALID))
1466 moved = true;
1467 }
1468#endif
1440 1469
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1471 {
1443 seen_resize = 1; 1472 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1474 }
1446 else 1475 else
1447 { 1476 {
1448#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1478 if (moved)
1450 update_background (); 1479 update_background ();
1451#endif 1480#endif
1452 } 1481 }
1482
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1484 }
1455 break; 1485 break;
1456 1486
1457 case PropertyNotify: 1487 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1488 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1489 break;
1464 1490
1465 case SelectionClear: 1491 case SelectionClear:
1466 selection_clear (); 1492 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1493 break;
1473 1494
1474 case SelectionRequest: 1495 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1496 selection_send (ev.xselectionrequest);
1476 break; 1497 break;
1477 1498
1478 case MapNotify: 1499 case MapNotify:
1500#ifdef HAVE_BG_PIXMAP
1501 /* This is needed specifically to fix the case of no window manager or a
1502 * non-reparenting window manager. In those cases we never get first
1503 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1504 * care of multiplicity of ConfigureNotify events arriving while WM does
1505 * reparenting.
1506 * We should not render background immediately, as there could be several
1507 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1508 * by scheduling background redraw as soon as we can, but giving a short
1509 * bit of time for ConfigureNotifies to arrive.
1510 * We should render background PRIOR to drawing any text, but AFTER all
1511 * of ConfigureNotifys for the best results.
1512 */
1513 if (!(bg_flags & BG_IS_VALID))
1514 update_background_ev.start (0.025);
1515#endif
1479 mapped = 1; 1516 mapped = 1;
1480#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1518 text_blink_ev.start ();
1482#endif 1519#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1521 break;
1485 1522
1486 case UnmapNotify: 1523 case UnmapNotify:
… …
1496 if (ev.xany.window == vt) 1533 if (ev.xany.window == vt)
1497 { 1534 {
1498 do 1535 do
1499 { 1536 {
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, false);
1502 } 1539 }
1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1504 1541
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1542 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1543
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1545 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1511 } 1548 }
1549
1512 want_refresh = 1; 1550 want_refresh = 1;
1513 } 1551 }
1514 else 1552 else
1515 { 1553 {
1516 XEvent unused_event; 1554 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1556 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1557 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1559 ;
1522 1560
1523 if (isScrollbarWindow (ev.xany.window)) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1562 {
1525 scrollBar.setIdle (); 1563 scrollBar.state = SB_STATE_IDLE;
1526 scrollbar_show (0); 1564 scrollBar.show (0);
1527 } 1565 }
1528 } 1566 }
1529 break; 1567 break;
1530 1568
1531 case MotionNotify: 1569 case MotionNotify:
… …
1577 int dist; 1615 int dist;
1578 1616
1579 /* don't clobber the current delay if we are 1617 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1618 * already in the middle of scrolling.
1581 */ 1619 */
1582 if (!sel_scroll_ev.active) 1620 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1621 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1622
1585 /* save the event params so we can highlight 1623 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1624 * the selection in the pending-scroll loop
1587 */ 1625 */
… …
1610 else 1648 else
1611 { 1649 {
1612 /* we are within the text window, so we 1650 /* we are within the text window, so we
1613 * shouldn't be scrolling 1651 * shouldn't be scrolling
1614 */ 1652 */
1615 if (sel_scroll_ev.active)
1616 sel_scroll_ev.stop(); 1653 sel_scroll_ev.stop();
1617 } 1654 }
1618#endif 1655#endif
1619#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1620 } 1657 }
1621#endif 1658#endif
1622 } 1659 }
1623 } 1660 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1625 { 1662 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1628 ; 1665 ;
1629 1666
1630 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1631 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1634 &unused_mask); 1671 &unused_mask);
1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1636 scrollbar_size ()); 1673 scrollBar.size ());
1637 want_refresh = 1; 1674 want_refresh = 1;
1638 scrollbar_show (1); 1675 scrollBar.show (1);
1639 } 1676 }
1640 break; 1677 break;
1641 } 1678 }
1642 1679
1643#if defined(CURSOR_BLINK) 1680#if defined(CURSOR_BLINK)
… …
1664 1701
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1702 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1703 pointer_blank ();
1667 } 1704 }
1668#endif 1705#endif
1706
1707 refresh_check ();
1669} 1708}
1709
1710#if ENABLE_FRILLS
1711void
1712rxvt_term::set_urgency (bool enable)
1713{
1714 if (enable == urgency_hint)
1715 return;
1716
1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1718 {
1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1720 XSetWMHints (dpy, parent, h);
1721 urgency_hint = enable;
1722 XFree (h);
1723 }
1724}
1725#endif
1670 1726
1671void 1727void
1672rxvt_term::focus_in () 1728rxvt_term::focus_in ()
1673{ 1729{
1674 if (!focus) 1730 if (!focus)
1675 { 1731 {
1676 focus = 1; 1732 focus = 1;
1677 want_refresh = 1; 1733 want_refresh = 1;
1678 1734
1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1680
1681#if USE_XIM 1735#if USE_XIM
1682 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1683 { 1737 {
1684 IMSetPosition (); 1738 im_set_position ();
1685 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1686 } 1740 }
1687#endif 1741#endif
1688#if CURSOR_BLINK 1742#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.again ();
1691#endif 1745#endif
1692#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1694 { 1748 {
1695 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1696 scr_recolour (); 1750 scr_recolour ();
1697 } 1751 }
1698#endif 1752#endif
1699#if ENABLE_FRILLS 1753#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell)) 1754 if (option (Opt_urgentOnBell))
1701 { 1755 set_urgency (0);
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif 1756#endif
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1709 } 1759 }
1710} 1760}
1711 1761
1712void 1762void
1713rxvt_term::focus_out () 1763rxvt_term::focus_out ()
… …
1715 if (focus) 1765 if (focus)
1716 { 1766 {
1717 focus = 0; 1767 focus = 0;
1718 want_refresh = 1; 1768 want_refresh = 1;
1719 1769
1720 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1770#if ENABLE_FRILLS
1721 1771 if (option (Opt_urgentOnBell))
1772 set_urgency (0);
1773#endif
1722#if ENABLE_FRILLS || ISO_14755 1774#if ENABLE_FRILLS || ISO_14755
1723 if (iso14755buf) 1775 if (iso14755buf)
1724 { 1776 {
1725 iso14755buf = 0; 1777 iso14755buf = 0;
1726# if ISO_14755 1778# if ISO_14755
… …
1743 { 1795 {
1744 pix_colors = pix_colors_unfocused; 1796 pix_colors = pix_colors_unfocused;
1745 scr_recolour (); 1797 scr_recolour ();
1746 } 1798 }
1747#endif 1799#endif
1800
1801 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1748 } 1802 }
1749} 1803}
1750 1804
1751void 1805void
1752rxvt_term::update_fade_color (unsigned int idx) 1806rxvt_term::update_fade_color (unsigned int idx)
… …
1780 * use the property to determine the pixmap. We use it later on. 1834 * use the property to determine the pixmap. We use it later on.
1781 */ 1835 */
1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1836 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1837 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1838 {
1785 bgPixmap.set_root_pixmap (); 1839 bg_set_root_pixmap ();
1786 update_background (); 1840 update_background ();
1787 } 1841 }
1842
1788 break; 1843 break;
1789 } 1844 }
1790# endif 1845# endif
1846
1847 refresh_check ();
1791} 1848}
1792#endif 1849#endif
1793 1850
1794void 1851void
1795rxvt_term::button_press (XButtonEvent &ev) 1852rxvt_term::button_press (XButtonEvent &ev)
… …
1826 /* save the xbutton state (for ButtonRelease) */ 1883 /* save the xbutton state (for ButtonRelease) */
1827 MEvent.state = ev.state; 1884 MEvent.state = ev.state;
1828#ifdef MOUSE_REPORT_DOUBLECLICK 1885#ifdef MOUSE_REPORT_DOUBLECLICK
1829 if (ev.button == MEvent.button && clickintime) 1886 if (ev.button == MEvent.button && clickintime)
1830 { 1887 {
1831 /* same button, within alloted time */ 1888 /* same button, within allowed time */
1832 MEvent.clicks++; 1889 MEvent.clicks++;
1833 1890
1834 if (MEvent.clicks > 1) 1891 if (MEvent.clicks > 1)
1835 { 1892 {
1836 /* only report double clicks */ 1893 /* only report double clicks */
… …
1908 } 1965 }
1909 1966
1910 /* 1967 /*
1911 * Scrollbar window processing of button press 1968 * Scrollbar window processing of button press
1912 */ 1969 */
1913 if (isScrollbarWindow (ev.window)) 1970 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1971 {
1915 scrollBar.setIdle (); 1972 page_dirn direction = NO_DIR;
1973
1974 if (scrollBar.upButton (ev.y))
1975 direction = UP; /* up */
1976 else if (scrollBar.dnButton (ev.y))
1977 direction = DN; /* down */
1978
1979 scrollBar.state = SB_STATE_IDLE;
1916 /* 1980 /*
1917 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1982 * move up if mouse is above slider
1919 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1920 * 1984 *
… …
1929 /* 1993 /*
1930 * Mouse report disabled scrollbar: 1994 * Mouse report disabled scrollbar:
1931 * arrow buttons - send up/down 1995 * arrow buttons - send up/down
1932 * click on scrollbar - send pageup/down 1996 * click on scrollbar - send pageup/down
1933 */ 1997 */
1934 if ((scrollBar.style == R_SB_NEXT 1998 if (direction == UP)
1935 && scrollbarnext_upButton (ev.y))
1936 || (scrollBar.style == R_SB_RXVT
1937 && scrollbarrxvt_upButton (ev.y)))
1938 tt_printf ("\033[A"); 1999 tt_printf ("\033[A");
1939 else if ((scrollBar.style == R_SB_NEXT 2000 else if (direction == DN)
1940 && scrollbarnext_dnButton (ev.y))
1941 || (scrollBar.style == R_SB_RXVT
1942 && scrollbarrxvt_dnButton (ev.y)))
1943 tt_printf ("\033[B"); 2001 tt_printf ("\033[B");
1944 else 2002 else
1945 switch (ev.button) 2003 switch (ev.button)
1946 { 2004 {
1947 case Button2: 2005 case Button2:
… …
1955 break; 2013 break;
1956 } 2014 }
1957 } 2015 }
1958 else 2016 else
1959#endif /* NO_SCROLLBAR_REPORT */ 2017#endif /* NO_SCROLLBAR_REPORT */
1960
1961 {
1962 char upordown = 0;
1963
1964 if (scrollBar.style == R_SB_NEXT)
1965 { 2018 {
1966 if (scrollbarnext_upButton (ev.y)) 2019 if (direction != NO_DIR)
1967 upordown = -1; /* up */
1968 else if (scrollbarnext_dnButton (ev.y))
1969 upordown = 1; /* down */
1970 }
1971 else if (scrollBar.style == R_SB_RXVT)
1972 {
1973 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */
1977 }
1978 if (upordown)
1979 { 2020 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2022 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2024#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2025 if (scr_page (direction, 1))
1984 { 2026 {
1985 if (upordown < 0) 2027 if (direction == UP)
1986 scrollBar.setUp (); 2028 scrollBar.state = SB_STATE_UP;
1987 else 2029 else
1988 scrollBar.setDn (); 2030 scrollBar.state = SB_STATE_DOWN;
1989 } 2031 }
1990 } 2032 }
1991 else 2033 else
1992 switch (ev.button) 2034 switch (ev.button)
1993 { 2035 {
1994 case Button2: 2036 case Button2:
1995 switch (scrollbar_align) 2037 switch (scrollBar.align)
1996 { 2038 {
1997 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
1998 csrO = 0; 2040 csrO = 0;
1999 break; 2041 break;
2000 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2001 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2002 break; 2044 break;
2003 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2004 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2005 break; 2047 break;
2006 } 2048 }
2007 2049
2008 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2009 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2012 2054
2013 scrollBar.setMotion (); 2055 scrollBar.state = SB_STATE_MOTION;
2014 break; 2056 break;
2015 2057
2016 case Button1: 2058 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2020 2062
2021 case Button3: 2063 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2023 { 2065 {
2024 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2025# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2026 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2027# else 2069# else
2028 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2029# endif 2071# endif
2030 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2031# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2032 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2033# else 2075# else
2034 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2035# endif 2077# endif
2036 else 2078 else
2037 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2038 } 2080 }
2039 else 2081 else
2040 { 2082 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2084 (nrow
2043 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2044 / scrollbar_size ())); 2086 / scrollBar.size ()));
2045 } 2087 }
2046 2088
2047 break; 2089 break;
2048 } 2090 }
2049 } 2091 }
… …
2059 2101
2060 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2103 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2105
2064 if (scrollbar_isUpDn ()) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2065 { 2107 {
2066 scrollBar.setIdle (); 2108 scrollBar.state = SB_STATE_IDLE;
2067 scrollbar_show (0); 2109 scrollBar.show (0);
2068 } 2110 }
2069 2111
2070#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2071 if (sel_scroll_ev.active)
2072 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
2073#endif 2114#endif
2074 2115
2075 if (ev.window == vt) 2116 if (ev.window == vt)
2076 { 2117 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2118 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2123 selection_make (ev.time); 2164 selection_make (ev.time);
2124 break; 2165 break;
2125 2166
2126 case Button2: 2167 case Button2:
2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2170 break;
2130 2171
2131#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2132 case Button4: 2173 case Button4:
2133 case Button5: 2174 case Button5:
… …
2149 { 2190 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2191 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2194
2195 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2196 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2197 }
2156 else 2198 else
2199# endif
2157 { 2200 {
2158# endif
2159 scr_page (v, i); 2201 scr_page (v, i);
2160 scrollbar_show (1); 2202 scrollBar.show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2203 }
2163# endif
2164 } 2204 }
2165 break; 2205 break;
2166#endif 2206#endif
2167 } 2207 }
2168 } 2208 }
2169} 2209}
2170 2210
2171/*}}} */ 2211/*}}} */
2172 2212
2173bool 2213void
2174rxvt_term::cmd_parse () 2214rxvt_term::cmd_parse ()
2175{ 2215{
2176 bool flag = false;
2177 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2178 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2179 2218
2180 for (;;) 2219 for (;;)
2181 { 2220 {
2182 if (ch == NOCHAR) 2221 if (ecb_unlikely (ch == NOCHAR))
2183 { 2222 {
2184 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2185 ch = next_char (); 2224 ch = next_char ();
2186 2225
2187 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2188 break; 2227 break;
2189 } 2228 }
2190 2229
2191 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2230 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2192 { 2231 {
2193 if (!seen_input) 2232 if (ecb_unlikely (!seen_input))
2194 { 2233 {
2195 seen_input = 1; 2234 seen_input = 1;
2196 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2197 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2198 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2211 wchar_t *str = buf; 2250 wchar_t *str = buf;
2212 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2213 2252
2214 for (;;) 2253 for (;;)
2215 { 2254 {
2216 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2255 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2217 break; 2256 break;
2218 2257
2219 *str++ = ch; 2258 *str++ = ch;
2220 2259
2221 if (ch == C0_LF || str >= eol) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2222 { 2261 {
2223 if (ch == C0_LF) 2262 if (ch == C0_LF)
2224 nlines++; 2263 nlines++;
2225 2264
2226 refresh_count++; 2265 refresh_count++;
… …
2275 * What the heck we'll cheat and only refresh less than every page-full. 2314 * What the heck we'll cheat and only refresh less than every page-full.
2276 * if skipScroll is enabled. 2315 * if skipScroll is enabled.
2277 */ 2316 */
2278 if (refreshnow) 2317 if (refreshnow)
2279 { 2318 {
2280 flag = true;
2281 scr_refresh (); 2319 scr_refresh ();
2282 want_refresh = 1; 2320 want_refresh = 1;
2283 } 2321 }
2284
2285 } 2322 }
2286 else 2323 else
2287 { 2324 {
2288 try 2325 try
2289 { 2326 {
… …
2297 } 2334 }
2298 2335
2299 ch = NOCHAR; 2336 ch = NOCHAR;
2300 } 2337 }
2301 } 2338 }
2302
2303 return flag;
2304} 2339}
2305 2340
2306// read the next character 2341// read the next character
2307wchar_t 2342wchar_t
2308rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2309{ 2344{
2310 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2311 { 2346 {
2312 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2314 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2315 2350
2316 wchar_t wc; 2351 wchar_t wc;
2317 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2352 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2318 2353
… …
2322 cmdbuf_ptr = cmdbuf_endp; 2357 cmdbuf_ptr = cmdbuf_endp;
2323 break; 2358 break;
2324 } 2359 }
2325 2360
2326 if (len == (size_t)-1) 2361 if (len == (size_t)-1)
2362 {
2363 mbstate.reset (); // reset now undefined conversion state
2327 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2365 }
2328 2366
2329 // assume wchar == unicode 2367 // assume wchar == unicode
2330 cmdbuf_ptr += len; 2368 cmdbuf_ptr += len;
2331 return wc & UNICODE_MASK; 2369 return wc & UNICODE_MASK;
2332 } 2370 }
… …
2343 : NOCHAR; 2381 : NOCHAR;
2344} 2382}
2345 2383
2346static class out_of_input out_of_input; 2384static class out_of_input out_of_input;
2347 2385
2348/* rxvt_cmd_getc () - Return next input character */
2349/*
2350 * Return the next input character after first passing any keyboard input
2351 * to the command.
2352 */
2353wchar_t 2386wchar_t
2354rxvt_term::cmd_getc () THROW ((class out_of_input)) 2387rxvt_term::cmd_getc () THROW ((class out_of_input))
2355{ 2388{
2356 wchar_t c = next_char (); 2389 wchar_t c = next_char ();
2357 2390
… …
2376/*----------------------------------------------------------------------*/ 2409/*----------------------------------------------------------------------*/
2377#ifdef PRINTPIPE 2410#ifdef PRINTPIPE
2378FILE * 2411FILE *
2379rxvt_term::popen_printer () 2412rxvt_term::popen_printer ()
2380{ 2413{
2381 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2414 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2382 2415
2383 if (stream == NULL) 2416 if (stream == NULL)
2384 rxvt_warn ("can't open printer pipe, not printing.\n"); 2417 rxvt_warn ("can't open printer pipe, not printing.\n");
2385 2418
2386 return stream; 2419 return stream;
… …
2397 * simulate attached vt100 printer 2430 * simulate attached vt100 printer
2398 */ 2431 */
2399void 2432void
2400rxvt_term::process_print_pipe () 2433rxvt_term::process_print_pipe ()
2401{ 2434{
2402 int done; 2435 FILE *fd = popen_printer ();
2403 FILE *fd;
2404 2436
2405 if ((fd = popen_printer ()) == NULL) 2437 if (!fd)
2406 return; 2438 return;
2407 2439
2408 /* 2440 /*
2409 * Send all input to the printer until either ESC[4i or ESC[?4i 2441 * Send all input to the printer until either ESC[4i or ESC[?4i
2410 * is received. 2442 * is received.
2411 */ 2443 */
2412 for (done = 0; !done;) 2444 for (int done = 0; !done; )
2413 { 2445 {
2414 unsigned char buf[8]; 2446 unsigned char buf[8];
2415 unicode_t ch; 2447 unicode_t ch;
2416 unsigned int i, len; 2448 unsigned int i, len;
2417 2449
… …
2451 pclose_printer (fd); 2483 pclose_printer (fd);
2452} 2484}
2453#endif /* PRINTPIPE */ 2485#endif /* PRINTPIPE */
2454/*}}} */ 2486/*}}} */
2455 2487
2456/* *INDENT-OFF* */
2457enum { 2488enum {
2458 C1_40 = 0x40, 2489 C1_40 = 0x40,
2459 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2490 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2460 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2491 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2461 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2492 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2462 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2463}; 2494};
2464/* *INDENT-ON* */
2465 2495
2466/*{{{ process non-printing single characters */ 2496/*{{{ process non-printing single characters */
2467void 2497void
2468rxvt_term::process_nonprinting (unicode_t ch) 2498rxvt_term::process_nonprinting (unicode_t ch)
2469{ 2499{
… …
2562 break; 2592 break;
2563 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2564 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2565 break; 2595 break;
2566 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2567 PrivMode (0, PrivMode_vt52); 2597 priv_modes &= ~PrivMode_vt52;
2568 break; 2598 break;
2569 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2570 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2571 /* unimplemented */ 2601 /* unimplemented */
2572 break; 2602 break;
… …
2591 return; 2621 return;
2592 } 2622 }
2593 2623
2594 switch (ch) 2624 switch (ch)
2595 { 2625 {
2596 /* case 1: do_tek_mode (); break; */
2597 case '#': 2626 case '#':
2598 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
2599 scr_E (); 2628 scr_E ();
2600 break; 2629 break;
2601 case '(': 2630 case '(':
… …
2624#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2625 case '9': 2654 case '9':
2626 scr_forwardindex (); 2655 scr_forwardindex ();
2627 break; 2656 break;
2628#endif 2657#endif
2658 // DECPAM/DECPNM
2629 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2630 case '>': 2662 case '>':
2631 PrivMode ((ch == '='), PrivMode_aplKP); 2663 priv_modes &= ~PrivMode_aplKP;
2632 break; 2664 break;
2633 2665
2634 case C1_40: 2666 case C1_40:
2635 cmd_getc (); 2667 cmd_getc ();
2636 break; 2668 break;
… …
2640 2672
2641 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2642 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2643 { 2675 {
2644 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2645 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2646 } 2678 }
2647 break; 2679 break;
2648 2680
2649 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2650 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2651 process_graphics (); 2683 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q')
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2652 break; 2686 break;
2653 2687
2654 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2655 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2656 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2660 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2661 scr_index (DN); 2695 scr_index (DN);
2662 break; 2696 break;
2663 2697
2664 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2665 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2666 2700
2667 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2668 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2669 2703
2670 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2671 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2672 process_dcs_seq (); 2706 process_dcs_seq ();
2673 break; 2707 break;
… …
2675 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2676 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
2677 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2678 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
2679 2713
2680 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2681 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
2682 process_csi_seq (); 2716 process_csi_seq ();
2683 break; 2717 break;
2684 2718
2685 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2719 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2686 case C1_OSC: /* ESC ] */ 2720 case C1_OSC: /* ESC ] */
2687 process_osc_seq (); 2721 process_osc_seq ();
2688 break; 2722 break;
2689 2723
2690 /* 8.3.106: RESET TO INITIAL STATE */ 2724 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2691 case 'c': 2725 case 'c':
2692 mbstate.reset (); 2726 mbstate.reset ();
2693 scr_poweron (); 2727 scr_poweron ();
2694 scrollbar_show (1); 2728 scrollBar.show (1);
2695 break; 2729 break;
2696 2730
2697 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2698 case 'n': 2732 case 'n':
2699 scr_charset_choose (2); 2733 scr_charset_choose (2);
… …
2706 } 2740 }
2707} 2741}
2708/*}}} */ 2742/*}}} */
2709 2743
2710/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2711/* *INDENT-OFF* */
2712enum { 2745enum {
2713 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2714 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2715 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2716 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2719 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2752 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2720 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2753 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2721 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2754 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2722}; 2755};
2723 2756
2724#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2725 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2726 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2727#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2728 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2729 2762
2730const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2731 { 2764 {
2732 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2765 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2733 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2766 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2734 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2767 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2735 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2768 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2736 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2737 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2738 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2739 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2740 }; 2773 };
2741/* *INDENT-ON* */
2742 2774
2743void 2775void
2744rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2745{ 2777{
2746 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2750 2782
2751 nargs = 0; 2783 nargs = 0;
2752 2784
2753 priv = 0; 2785 priv = 0;
2754 ch = cmd_getc (); 2786 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2787 if ((ch >= '<' && ch <= '?') || ch == '!')
2756 { 2788 {
2757 /* '<' '=' '>' '?' */ 2789 /* '<' '=' '>' '?' '!' */
2758 priv = ch; 2790 priv = ch;
2759 ch = cmd_getc (); 2791 ch = cmd_getc ();
2760 } 2792 }
2761 2793
2762 /* read any numerical arguments */ 2794 /* read any numerical arguments */
… …
2811 // versions. 2843 // versions.
2812 // 2844 //
2813 tt_printf ("\033[>%d;95;0c", 'U'); 2845 tt_printf ("\033[>%d;95;0c", 'U');
2814 } 2846 }
2815 break; 2847 break;
2848
2816 case '?': 2849 case '?':
2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2818 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
2819 break; 2852 break;
2853
2854 case '!':
2855 if (ch == CSI_70)
2856 {
2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2858 scr_soft_reset ();
2859
2860 static const int pm_h[] = { 7, 25 };
2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2862
2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2820 } 2865 }
2866 break;
2867 }
2868
2821 return; 2869 return;
2822 } 2870 }
2823 2871
2824 switch (ch) 2872 switch (ch)
2825 { 2873 {
… …
2839 } 2887 }
2840 break; 2888 break;
2841#endif 2889#endif
2842 2890
2843 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2844 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2845 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2846 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2847 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2848 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2849 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2850 break; 2898 break;
2851 2899
2852 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2853 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3040 } 3088 }
3041} 3089}
3042/*}}} */ 3090/*}}} */
3043 3091
3044#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3045/* ARGSUSED */
3046void 3093void
3047rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3048{ 3095{
3049 int x, y; 3096 int x, y;
3050 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3059 { 3106 {
3060 /* 3107 /*
3061 * commands 3108 * commands
3062 */ 3109 */
3063 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3064 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3065 break; 3112 break;
3066 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3067 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3068 break; 3115 break;
3069 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3070 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3071 break; 3118 break;
3072 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3074 break; 3121 break;
3075 case 5: /* raise window */ 3122 case 5: /* raise window */
3076 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3077 break; 3124 break;
3078 case 6: /* lower window */ 3125 case 6: /* lower window */
3079 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3080 break; 3127 break;
3081 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3082 scr_touch (true); 3129 scr_touch (true);
3083 break; 3130 break;
3084 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3095 3142
3096 /* 3143 /*
3097 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3098 */ 3145 */
3099 case 11: /* report window state */ 3146 case 11: /* report window state */
3100 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3102 break; 3149 break;
3103 case 13: /* report window position */ 3150 case 13: /* report window position */
3104 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3105 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3106 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3107 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3108 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3109 break; 3156 break;
3110 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3111 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3113 break; 3160 break;
3114 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3115 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3116 break; 3163 break;
… …
3118 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3119 break; 3166 break;
3120 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3121 { 3168 {
3122 char *s; 3169 char *s;
3123 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3125 XFree (s); 3172 XFree (s);
3126 } 3173 }
3127 break; 3174 break;
3128 case 21: /* report window title */ 3175 case 21: /* report window title */
3129 { 3176 {
3130 char *s; 3177 char *s;
3131 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3133 XFree (s); 3180 XFree (s);
3134 } 3181 }
3135 break; 3182 break;
3136 } 3183 }
… …
3192 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3239 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3193 */ 3240 */
3194void 3241void
3195rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3196{ 3243{
3197 char *s;
3198 unicode_t eh;
3199
3200 /* 3244 /*
3201 * Not handled yet 3245 * Not handled yet
3202 */ 3246 */
3247
3248 unicode_t eh;
3203 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3204 if (s) 3250 if (s)
3205 free (s); 3251 free (s);
3206 3252
3207 return; 3253 return;
3208} 3254}
… …
3212 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3213 */ 3259 */
3214void 3260void
3215rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3216{ 3262{
3217 unicode_t ch, eh;
3218 int arg; 3263 int arg;
3219 3264
3220 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3221 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3222 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3223 3268
3224 if (ch == ';') 3269 if (ch == ';')
3225 { 3270 {
3271 unicode_t eh;
3226 char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3227 3273
3228 if (s) 3274 if (s)
3229 { 3275 {
3230 process_xterm_seq (arg, s, eh); 3276 process_xterm_seq (arg, s, eh);
… …
3254 3300
3255/* 3301/*
3256 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3302 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3257 */ 3303 */
3258void 3304void
3259rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3305rxvt_term::process_xterm_seq (int op, char *str, char resp)
3260{ 3306{
3261 int color; 3307 int color;
3262 char *buf, *name; 3308 char *buf, *name;
3263 bool query = str[0] == '?' && !str[1]; 3309 bool query = str[0] == '?' && !str[1];
3264 int saveop = op; 3310 int saveop = op;
… …
3291 unsigned long bytes_after; 3337 unsigned long bytes_after;
3292 unsigned char *value = 0; 3338 unsigned char *value = 0;
3293 const char *str = ""; 3339 const char *str = "";
3294 3340
3295 if (prop 3341 if (prop
3296 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3297 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3298 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3299 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3300 && actual_type != None 3346 && actual_type != None
3301 && actual_format == 8) 3347 && actual_format == 8)
… …
3305 3351
3306 XFree (value); 3352 XFree (value);
3307 } 3353 }
3308 else 3354 else
3309 { 3355 {
3310 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3356 char *eq = strchr (str, '=');
3311 3357
3312 if (eq) 3358 if (eq)
3313 { 3359 {
3314 *eq = 0; 3360 *eq = 0;
3315 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3316 } 3362 }
3317 else 3363 else
3318 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3319 display->atom (str)); 3365 display->atom (str));
3320 } 3366 }
3321 break; 3367 break;
3322 3368
3323 case XTerm_Color: 3369 case XTerm_Color:
… …
3336 *buf++ = '\0'; 3382 *buf++ = '\0';
3337 3383
3338 process_color_seq (op, color, name, resp); 3384 process_color_seq (op, color, name, resp);
3339 } 3385 }
3340 break; 3386 break;
3387 case Rxvt_restoreFG:
3341 case XTerm_Color00: 3388 case XTerm_Color00:
3342 process_color_seq (op, Color_fg, str, resp); 3389 process_color_seq (op, Color_fg, str, resp);
3343 break; 3390 break;
3391 case Rxvt_restoreBG:
3344 case XTerm_Color01: 3392 case XTerm_Color01:
3345 process_color_seq (op, Color_bg, str, resp); 3393 process_color_seq (op, Color_bg, str, resp);
3346 break; 3394 break;
3347#ifndef NO_CURSORCOLOR 3395#ifndef NO_CURSORCOLOR
3348 case XTerm_Color_cursor: 3396 case XTerm_Color_cursor:
… …
3353 process_color_seq (op, Color_pointer_fg, str, resp); 3401 process_color_seq (op, Color_pointer_fg, str, resp);
3354 break; 3402 break;
3355 case XTerm_Color_pointer_bg: 3403 case XTerm_Color_pointer_bg:
3356 process_color_seq (op, Color_pointer_bg, str, resp); 3404 process_color_seq (op, Color_pointer_bg, str, resp);
3357 break; 3405 break;
3406#ifdef OPTION_HC
3407 case XTerm_Color_HC:
3408 process_color_seq (op, Color_HC, str, resp);
3409 break;
3410 case XTerm_Color_HTC:
3411 process_color_seq (op, Color_HTC, str, resp);
3412 break;
3413#endif
3358#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3359 case XTerm_Color_RV:
3360 process_color_seq (op, Color_RV, str, resp);
3361 break;
3362 case Rxvt_Color_BD:
3363 case URxvt_Color_BD: 3415 case URxvt_Color_BD:
3364 process_color_seq (op, Color_BD, str, resp); 3416 process_color_seq (op, Color_BD, str, resp);
3365 break; 3417 break;
3366 case Rxvt_Color_UL:
3367 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3368 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3369 break; 3420 break;
3370 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3371 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3372 break; 3423 break;
3373#endif 3424#endif
3425 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp);
3427 break;
3374#if ENABLE_TRANSPARENCY 3428#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3377 { 3431 {
3378 bool changed = false; 3432 bool changed = false;
3433
3379 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3381 else 3436
3382 changed = bgPixmap.unset_tint ();
3383 if (changed) 3437 if (changed)
3384 update_background (); 3438 update_background ();
3385 } 3439 }
3386 3440
3387 break; 3441 break;
… …
3391 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3392 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3393 { 3447 {
3394 char str[256]; 3448 char str[256];
3395 3449
3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3450 sprintf (str, "[%dx%d+%d+%d]",
3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3400 } 3454 }
3401 else 3455 else
3402 { 3456 {
3403 int changed = 0; 3457 bool changed = false;
3404 3458
3405 if (*str != ';') 3459 if (*str != ';')
3406 { 3460 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3410 changed++; 3462 changed = true;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 } 3463 }
3415 while (str) 3464 else
3416 { 3465 {
3417 str++; 3466 str++;
3418 if (bgPixmap.set_geometry (str)) 3467 if (bg_set_geometry (str, true))
3419 changed++; 3468 changed = true;
3420 str = strchr (str, ';');
3421 } 3469 }
3470
3422 if (changed) 3471 if (changed)
3472 {
3473 if (bg_window_position_sensitive ())
3474 {
3475 int x, y;
3476 get_window_origin (x, y);
3477 bg_set_position (x, y);
3478 }
3423 update_background (); 3479 update_background ();
3480 }
3424 } 3481 }
3425 break; 3482 break;
3426#endif 3483#endif
3427
3428 case Rxvt_restoreFG:
3429 set_window_color (Color_fg, str);
3430 break;
3431 case Rxvt_restoreBG:
3432 set_window_color (Color_bg, str);
3433 break;
3434 3484
3435 case XTerm_logfile: 3485 case XTerm_logfile:
3436 // TODO, when secure mode? 3486 // TODO, when secure mode?
3437 break; 3487 break;
3438 3488
… …
3505 break; 3555 break;
3506#endif 3556#endif
3507 3557
3508#if ENABLE_PERL 3558#if ENABLE_PERL
3509 case URxvt_perl: 3559 case URxvt_perl:
3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3560 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3511 ; // no responses yet
3512 break; 3561 break;
3513#endif 3562#endif
3514 } 3563 }
3515} 3564}
3516/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
… …
3539 { 3588 {
3540 if (mode == 'r') 3589 if (mode == 'r')
3541 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3542 else 3591 else
3543 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3544 PrivMode (state, bit); 3593
3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3545 } 3598 }
3546 3599
3547 return state; 3600 return state;
3548} 3601}
3549 3602
3550/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3551void 3604void
3552rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3553{ 3606{
3554 unsigned int i, j; 3607 unsigned int i, j;
3555 int state; 3608 int state;
3556 3609
3557 static const struct 3610 static const struct
3558 { 3611 {
3559 const int argval; 3612 const int argval;
3560 const unsigned long bit; 3613 const unsigned long bit;
3561 } argtopriv[] = { 3614 } argtopriv[] = {
3562 { 1, PrivMode_aplCUR }, 3615 { 1, PrivMode_aplCUR }, // DECCKM
3563 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3564 { 3, PrivMode_132 }, 3617 { 3, PrivMode_132 }, // DECCOLM
3565 { 4, PrivMode_smoothScroll }, 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3566 { 5, PrivMode_rVideo }, 3619 { 5, PrivMode_rVideo }, // DECSCNM
3567 { 6, PrivMode_relOrigin }, 3620 { 6, PrivMode_relOrigin }, // DECOM
3568 { 7, PrivMode_Autowrap }, 3621 { 7, PrivMode_Autowrap }, // DECAWM
3569 // 8, bi-directional support mode 3622 // 8, auto-repeat keys // DECARM
3570 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3571 // 18, 19 printing-related 3624 // 18 end FF to printer after print screen
3625 // 19 Print screen prints full screen/scroll region
3572 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3573#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3574 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3575#endif 3629#endif
3576 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3631 // 38, tektronix mode // DECTEK
3577 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3578 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3579 // 45 margin bell NYI 3634 // 45 margin bell NYI
3580 // 46 start logging 3635 // 46 start logging
3581 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3582 { 66, PrivMode_aplKP }, 3637 { 66, PrivMode_aplKP }, // DECNKM
3583#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3584 { 67, PrivMode_BackSpace }, 3639 { 67, PrivMode_BackSpace }, // DECBKM
3585#endif 3640#endif
3586 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3587 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3643 { 1003, PrivMode_MouseAnyEvent },
3644#if ENABLE_FRILLS
3645 { 1005, PrivMode_ExtModeMouse },
3646#endif
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3648 { 1011, PrivMode_Keypress }, // rxvt extension
3649#if ENABLE_FRILLS
3650 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3651#endif
3591 // 1035 enable modifiers for alt, numlock NYI 3652 // 1035 enable modifiers for alt, numlock NYI
3592 // 1036 send ESC for meta keys NYI 3653 // 1036 send ESC for meta keys NYI
3593 // 1037 send DEL for keypad delete NYI 3654 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3655 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3656 // 1048 save and restore cursor, implemented in code
3596 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3657 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3658 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3659 { 2004, PrivMode_BracketPaste },
3598 }; 3660 };
3599 3661
3600 if (nargs == 0) 3662 if (nargs == 0)
3601 return; 3663 return;
3602 3664
… …
3609 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3610 { 3672 {
3611 state = -1; 3673 state = -1;
3612 3674
3613 /* basic handling */ 3675 /* basic handling */
3614 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3615 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3616 { 3678 {
3617 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3618 break; 3680 break;
3619 } 3681 }
… …
3627 3689
3628 scr_touch (true); 3690 scr_touch (true);
3629 break; 3691 break;
3630#endif 3692#endif
3631 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
3632 case 1049:
3633 if (option (Opt_secondaryScreen)) 3694 if (option (Opt_secondaryScreen))
3634 if (mode == 0) 3695 if (mode == 0)
3635 scr_cursor (RESTORE); 3696 scr_cursor (RESTORE);
3636 else if (mode == 1) 3697 else if (mode == 1)
3637 scr_cursor (SAVE); 3698 scr_cursor (SAVE);
… …
3646 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3647 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3648 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3649 * within VT52 mode 3710 * within VT52 mode
3650 */ 3711 */
3651 PrivMode (1, PrivMode_vt52); 3712 priv_modes |= PrivMode_vt52;
3652 break; 3713 break;
3653 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3656 break; 3717 break;
3657 case 4: /* smooth scrolling */ 3718 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3719 set_option (Opt_jumpScroll, !state);
3659 break; 3720 break;
3660 case 5: /* reverse video */ 3721 case 5: /* reverse video */
… …
3671 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3673 break; 3734 break;
3674#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3675 case scrollBar_esc: 3736 case scrollBar_esc:
3676 if (scrollbar_mapping (state)) 3737 scrollBar.map (state);
3677 {
3678 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3679 scr_touch (true); 3739 scr_touch (true);
3680 }
3681 break; 3740 break;
3682#endif 3741#endif
3683 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3684 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3685 break; 3744 break;
… …
3698 case 1003: 3757 case 1003:
3699 if (state) 3758 if (state)
3700 { 3759 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3760 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3761 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3762 mouse_row = mouse_col = 0;
3703 vt_emask_mouse = PointerMotionMask; 3763 vt_emask_mouse = PointerMotionMask;
3704 } 3764 }
3705 else 3765 else
3706 vt_emask_mouse = NoEventMask; 3766 vt_emask_mouse = NoEventMask;
3767
3707 vt_select_input (); 3768 vt_select_input ();
3708 break; 3769 break;
3709 case 1010: /* scroll to bottom on TTY output inhibit */ 3770 case 1010: /* scroll to bottom on TTY output inhibit */
3710 set_option (Opt_scrollTtyOutput, !state); 3771 set_option (Opt_scrollTtyOutput, !state);
3711 break; 3772 break;
3712 case 1011: /* scroll to bottom on key press */ 3773 case 1011: /* scroll to bottom on key press */
3713 set_option (Opt_scrollTtyKeypress, state); 3774 set_option (Opt_scrollTtyKeypress, state);
3714 break; 3775 break;
3715 case 1047: /* secondary screen w/ clearing last */ 3776 case 1047: /* secondary screen w/ clearing last */
3716 if (option (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
3717 if (current_screen != PRIMARY) 3778 if (!state)
3718 scr_erase_screen (2); 3779 scr_erase_screen (2);
3780
3719 scr_change_screen (state); 3781 scr_change_screen (state);
3720 break; 3782 break;
3721 case 1049: /* secondary screen w/ clearing first */ 3783 case 1049: /* secondary screen w/ clearing first */
3784 if (option (Opt_secondaryScreen))
3785 if (state)
3786 scr_cursor (SAVE);
3787
3722 scr_change_screen (state); 3788 scr_change_screen (state);
3789
3723 if (option (Opt_secondaryScreen)) 3790 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3791 if (state)
3725 scr_erase_screen (2); 3792 scr_erase_screen (2);
3793 else
3794 scr_cursor (RESTORE);
3726 break; 3795 break;
3727 default: 3796 default:
3728 break; 3797 break;
3729 } 3798 }
3730 } 3799 }
… …
3883 } 3952 }
3884 } 3953 }
3885} 3954}
3886/*}}} */ 3955/*}}} */
3887 3956
3888/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3889void
3890rxvt_term::process_graphics ()
3891{
3892 unicode_t ch, cmd = cmd_getc ();
3893
3894 if (cmd == 'Q')
3895 {
3896 /* query graphics */
3897 tt_printf ("\033G0\012"); /* no graphics */
3898 return;
3899 }
3900 /* swallow other graphics sequences until terminating ':' */
3901 do
3902 ch = cmd_getc ();
3903 while (ch != ':');
3904}
3905/*}}} */
3906
3907/* ------------------------------------------------------------------------- */ 3957/* ------------------------------------------------------------------------- */
3908 3958
3909/* 3959/*
3910 * Send printf () formatted output to the command. 3960 * Send printf () formatted output to the command.
3911 * Only use for small amounts of data. 3961 * Only use for small amounts of data.
… …
3924 3974
3925/* ---------------------------------------------------------------------- */ 3975/* ---------------------------------------------------------------------- */
3926/* Write data to the pty as typed by the user, pasted with the mouse, 3976/* Write data to the pty as typed by the user, pasted with the mouse,
3927 * or generated by us in response to a query ESC sequence. 3977 * or generated by us in response to a query ESC sequence.
3928 */ 3978 */
3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3979static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3930 3980
3931void 3981void
3932rxvt_term::tt_write (const char *data, unsigned int len) 3982rxvt_term::tt_write (const char *data, unsigned int len)
3933{ 3983{
3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3939 3989
3940 if (v_buflen == 0) 3990 if (v_buflen == 0)
3941 { 3991 {
3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3992 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3943 3993
3994 max_it (written, 0);
3995
3944 if ((unsigned int)written == len) 3996 if (written == len)
3945 return; 3997 return;
3946 3998
3947 data += written; 3999 data += written;
3948 len -= written; 4000 len -= written;
3949 } 4001 }
3950 4002
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3952 4004
3953 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len; 4006 v_buflen += len;
3955 4007
3956 pty_ev.set (ev::READ | ev::WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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