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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.546 by sf-exg, Tue Apr 29 07:50:53 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2014 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.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
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, int y2)
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);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
304{ 416{
305 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 418 KeySym keysym;
308 int valid_keysym; 419 int valid_keysym;
309 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
310 422
311#if ISO_14755 423#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
313 return; 425 return;
314#endif 426#endif
… …
321 */ 433 */
322 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
325 437
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 438 kbuf[0] = 0;
333 439
334#ifdef USE_XIM 440#if USE_XIM
335 if (Input_Context) 441 if (Input_Context)
336 { 442 {
337 Status status_return; 443 Status status_return;
338 444
339#if 0 445#if 0
… …
390 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
391 } 497 }
392 498
393 if (valid_keysym) 499 if (valid_keysym)
394 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (valid_keysym)
704 {
395#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 707 return;
398#endif 708#endif
399 709
400 if (saveLines) 710 if (saveLines)
401 { 711 {
… …
410#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 722#else
413 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
414#endif 724#endif
725 max_it (lnsppg, 1);
726
415 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
416 { 728 {
417 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
418 return; 730 return;
419 } 731 }
420 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
421 { 733 {
422 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
423 return; 735 return;
424 } 736 }
425 } 737 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
428 { 740 {
429 if (keysym == XK_Up) 741 if (keysym == XK_Up)
430 { 742 {
431 scr_page (UP, 1); 743 scr_page (1);
432 return; 744 return;
433 } 745 }
434 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
435 { 747 {
436 scr_page (DN, 1); 748 scr_page (-1);
437 return; 749 return;
438 } 750 }
439 } 751 }
440#endif 752#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
443 { 755 {
444 if (keysym == XK_Home) 756 if (keysym == XK_Home)
445 { 757 {
446 scr_move_to (0, 1); 758 scr_changeview (top_row);
447 return; 759 return;
448 } 760 }
449 else if (keysym == XK_End) 761 else if (keysym == XK_End)
450 { 762 {
451 scr_move_to (1, 1); 763 scr_changeview (0);
452 return; 764 return;
453 } 765 }
454 } 766 }
455#endif 767#endif
456 } 768 }
… …
472 selection_request (ev.time); 784 selection_request (ev.time);
473 return; 785 return;
474#if TODO 786#if TODO
475 /* rxvt extras */ 787 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 788 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 789 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 790 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 791 return;
482#endif 792#endif
483 } 793 }
484 } 794 }
485 } 795 }
486 796
797 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
798 {
799 if (keysym == XK_v)
800 selection_request (ev.time, Sel_Clipboard);
801 else if (selection.len > 0)
802 {
803 free (selection.clip_text);
804 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
805 selection.clip_len = selection.len;
806 selection_grab (CurrentTime, true);
807 }
808
809 return;
810 }
811
487#if ENABLE_FRILLS || ISO_14755 812#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 813 // ISO 14755 support
489 if (shft && ctrl) 814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 815 {
491 int hv; 816 int hv;
492 817
493 if (iso14755buf & ISO_14755_51 818 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 819 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 849 scr_overlay_off ();
525# endif 850# endif
526 iso14755buf = 0; 851 iso14755buf = 0;
527 } 852 }
528 } 853 }
854 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 855 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 856 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 857 if (!(iso14755buf & ISO_14755_STARTED))
532 { 858 {
533 iso14755buf |= ISO_14755_STARTED; 859 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 860# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 861 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 869 {
544 scr_printscreen (ctrl | shft); 870 scr_printscreen (ctrl | shft);
545 return; 871 return;
546 } 872 }
547#endif 873#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
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 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
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;
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 }
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0)
800 kbuf[len - 1] |= 0x80;
801#endif
802
803 }
804 else if (ctrl && keysym == XK_minus)
805 {
806 len = 1;
807 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
808 }
809 else if (keysym == XK_ISO_Left_Tab)
810 {
811 strcpy (kbuf, "\033[Z");
812 len = 3;
813 }
814 else
815 {
816#ifdef META8_OPTION
817 /* set 8-bit on */
818 if (meta && (meta_char == 0x80))
819 {
820 char *ch;
821
822 for (ch = kbuf; ch < kbuf + len; ch++)
823 *ch |= 0x80;
824
825 meta = 0;
826 }
827#endif
828 /* nil */ ;
829 }
830 } 874 }
831 875
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return; 877 return;
834 878
… …
840 { 884 {
841 view_start = 0; 885 view_start = 0;
842 want_refresh = 1; 886 want_refresh = 1;
843 } 887 }
844 888
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
859 /* escape prefix */
860 if (meta
861#ifdef META8_OPTION
862 && meta_char == C0_ESC
863#endif
864 )
865 {
866 const char ch = C0_ESC;
867 tt_write (&ch, 1);
868 }
869
870 tt_write (kbuf, (unsigned int)len); 889 tt_write (kbuf, (unsigned int)len);
871} 890}
872 891
873void 892void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 893rxvt_term::key_release (XKeyEvent &ev)
875{ 894{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 895#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 896 KeySym keysym;
878 897
… …
898 commit_iso14755 (); 917 commit_iso14755 ();
899 918
900 return; 919 return;
901 } 920 }
902 921
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 922 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 923 if (i[0] == keysym)
905 { 924 {
906 iso14755buf = ISO_14755_51 | i[1]; 925 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 926 commit_iso14755 ();
908 927
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 964 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 965 mouse_slip_wheel_speed = 0;
947#endif 966#endif
948} 967}
949 968
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 969void
984rxvt_term::flush () 970rxvt_term::flush ()
985{ 971{
986 flush_ev.stop (); 972 flush_ev.stop ();
987 973
988#ifdef HAVE_BG_PIXMAP 974#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 975 if (bg_flags & BG_NEEDS_REFRESH)
990 { 976 {
991// scr_clear (true); This needs to be researched further! 977 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 978 scr_touch (false);
993 } 979 }
994#endif 980#endif
995 981
996 if (want_refresh) 982 if (want_refresh)
… …
1032 } 1018 }
1033 while (row < end_row); 1019 while (row < end_row);
1034 } 1020 }
1035 1021
1036 scr_refresh (); 1022 scr_refresh ();
1037 scrollbar_show (1); 1023 scrollBar.show (1);
1038#ifdef USE_XIM 1024#if USE_XIM
1039 IMSendSpot (); 1025 im_send_spot ();
1040#endif 1026#endif
1041 } 1027 }
1042 1028
1043 display->flush (); 1029 display->flush ();
1044} 1030}
1045 1031
1032/* checks whether a refresh is requested and starts the refresh timer */
1046void 1033void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1034rxvt_term::refresh_check ()
1048{ 1035{
1049 make_current (); 1036 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1038
1051 display->flush (); 1039 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1040}
1056 1041
1057void 1042void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1043rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1044{
… …
1063 flush (); 1048 flush ();
1064} 1049}
1065 1050
1066#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1067void 1052void
1053rxvt_term::cursor_blink_reset ()
1054{
1055 if (hidden_cursor)
1056 {
1057 hidden_cursor = 0;
1058 want_refresh = 1;
1059 }
1060
1061 if (option (Opt_cursorBlink))
1062 cursor_blink_ev.again ();
1063 else
1064 cursor_blink_ev.stop ();
1065}
1066
1067void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1069{
1070 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1071 want_refresh = 1;
1072 refresh_check ();
1072} 1073}
1073#endif 1074#endif
1074 1075
1075#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1076void 1077void
… …
1078{ 1079{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1081 {
1081 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1082 want_refresh = 1; 1083 want_refresh = 1;
1084 refresh_check ();
1083 } 1085 }
1084 else 1086 else
1085 w.stop (); 1087 w.stop ();
1086} 1088}
1087#endif 1089#endif
1088 1090
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1092void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1094{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1097 {
1095 want_refresh = 1; 1098 want_refresh = 1;
1099 refresh_check ();
1100 }
1096 else 1101 else
1097 w.stop (); 1102 w.stop ();
1098} 1103}
1099#endif 1104#endif
1100 1105
1101#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1102void 1107void
1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1104{ 1109{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1106 { 1111 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1113 want_refresh = 1;
1114 refresh_check ();
1109 } 1115 }
1110 else 1116 else
1111 w.stop (); 1117 w.stop ();
1112} 1118}
1113#endif 1119#endif
1114 1120
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1122void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1124{
1119 if (mouse_slip_wheel_speed == 0 1125 if (scr_page (mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1126 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1127 want_refresh = 1;
1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1132 {
1128 else 1133 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1134 w.stop ();
1135 }
1130} 1136}
1131#endif 1137#endif
1132 1138
1133#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1134static struct event_handler 1140static struct event_handler
… …
1139 { 1145 {
1140 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1147 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is 1148 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS. 1149 // allowed by the sus... as is returning ENOSYS.
1150 // since the linux guys additionally thought that breaking the only
1151 // known workaround against their unusable sched_yield hack is cool,
1152 // we just nanosleep a bit and hope for the best.
1144 1153
1145 struct timespec ts = { 0, 0 }; 1154 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1155 nanosleep (&ts, 0);
1147 1156
1148 w.stop (); 1157 w.stop ();
1149 } 1158 }
1150 1159
… …
1153 { 1162 {
1154 } 1163 }
1155} event_handler; 1164} event_handler;
1156#endif 1165#endif
1157 1166
1167/* make sure all the cmd data is at beginning of cmdbuf */
1168void
1169rxvt_term::cmdbuf_reify ()
1170{
1171 if (cmdbuf_ptr == cmdbuf_base)
1172 return;
1173
1174 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1175
1176 memmove (cmdbuf_base, cmdbuf_ptr, used);
1177 cmdbuf_ptr = cmdbuf_base;
1178 cmdbuf_endp = cmdbuf_ptr + used;
1179
1180}
1181
1182#if defined (KEYSYM_RESOURCE)
1183void
1184rxvt_term::cmdbuf_append (const char *str, size_t count)
1185{
1186 cmdbuf_reify ();
1187
1188 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1189
1190 if (count > avail)
1191 return;
1192
1193 memcpy (cmdbuf_endp, str, count);
1194 cmdbuf_endp += count;
1195
1196 cmd_parse ();
1197}
1198#endif
1199
1158bool 1200bool
1159rxvt_term::pty_fill () 1201rxvt_term::pty_fill ()
1160{ 1202{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1203 cmdbuf_reify ();
1162 1204
1163 if (CBUFSIZ == n) 1205 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1206
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1207 if (!avail)
1166 n = 0;
1167 } 1208 {
1168 1209 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1210 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1211 cmdbuf_endp = cmdbuf_ptr;
1212 avail = CBUFSIZ;
1213 }
1172 1214
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1215 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1216
1175 if (r > 0) 1217 if (r > 0)
1176 { 1218 {
1177 cmdbuf_endp += r; 1219 cmdbuf_endp += r;
1178 return true; 1220 return true;
… …
1200{ 1242{
1201 make_current (); 1243 make_current ();
1202 1244
1203 if (revents & ev::READ) 1245 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1246 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1247 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1248 cmd_parse ();
1207 break;
1208 1249
1209 if (revents & ev::WRITE) 1250 if (revents & ev::WRITE)
1210 pty_write (); 1251 pty_write ();
1211}
1212 1252
1213void 1253 refresh_check ();
1254}
1255
1256void ecb_cold
1214rxvt_term::pointer_unblank () 1257rxvt_term::pointer_unblank ()
1215{ 1258{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1259 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1260 recolour_cursor ();
1218 1261
… …
1223 pointer_ev.start (pointerBlankDelay); 1266 pointer_ev.start (pointerBlankDelay);
1224#endif 1267#endif
1225} 1268}
1226 1269
1227#ifdef POINTER_BLANK 1270#ifdef POINTER_BLANK
1228void 1271void ecb_cold
1229rxvt_term::pointer_blank () 1272rxvt_term::pointer_blank ()
1230{ 1273{
1231 if (!option (Opt_pointerBlank)) 1274 if (!option (Opt_pointerBlank))
1232 return; 1275 return;
1233 1276
… …
1235 XFlush (dpy); 1278 XFlush (dpy);
1236 1279
1237 hidden_pointer = 1; 1280 hidden_pointer = 1;
1238} 1281}
1239 1282
1240void 1283void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1284rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1285{
1243 make_current (); 1286 make_current ();
1244 1287
1245 pointer_blank (); 1288 pointer_blank ();
… …
1251{ 1294{
1252 int button_number, key_state = 0; 1295 int button_number, key_state = 0;
1253 int x, y; 1296 int x, y;
1254 int code = 32; 1297 int code = 32;
1255 1298
1256 x = Pixel2Col (ev.x); 1299 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1300 y = Pixel2Row (ev.y) + 1;
1301
1258 if (ev.type == MotionNotify) 1302 if (ev.type == MotionNotify)
1259 { 1303 {
1260 if (x == mouse_row && y == mouse_col) 1304 if (x == mouse_row && y == mouse_col)
1261 return; 1305 return;
1306
1262 mouse_row = x; 1307 mouse_row = x;
1263 mouse_col = y; 1308 mouse_col = y;
1264 code += 32; 1309 code += 32;
1265 } 1310 }
1266 1311
… …
1269 else 1314 else
1270 { 1315 {
1271 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1318 if (button_number >= 3)
1274 button_number += (64 - 3); 1319 button_number += 64 - 3;
1275 } 1320 }
1276 1321
1277 if (priv_modes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
1278 { 1323 {
1279 /* 1324 /*
… …
1311 fputc ('A', stderr); 1356 fputc ('A', stderr);
1312 if (key_state & 32) 1357 if (key_state & 32)
1313 fputc ('2', stderr); 1358 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1360 button_number,
1316 x + 1, 1361 x,
1317 y + 1); 1362 y);
1318#endif 1363#endif
1319 1364
1365#if ENABLE_FRILLS
1366 if (priv_modes & PrivMode_ExtMouseRight)
1367 tt_printf ("\033[%d;%d;%dM",
1368 code + button_number + key_state,
1369 x,
1370 y);
1371 else if (priv_modes & PrivMode_ExtModeMouse)
1372 tt_printf ("\033[M%c%lc%lc",
1373 code + button_number + key_state,
1374 wint_t (32 + x),
1375 wint_t (32 + y));
1376 else
1377#endif
1320 tt_printf ("\033[M%c%c%c", 1378 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1379 code + button_number + key_state,
1322 (32 + x + 1), 1380 32 + x,
1323 (32 + y + 1)); 1381 32 + y);
1324} 1382}
1325 1383
1326/*{{{ process an X event */ 1384/*{{{ process an X event */
1327void 1385void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1386rxvt_term::x_cb (XEvent &ev)
1329{ 1387{
1330 make_current (); 1388 make_current ();
1331 1389
1332 dLocal (Display *, dpy); 1390 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1488 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1489 focus_out ();
1432 break; 1490 break;
1433 1491
1434 case ConfigureNotify: 1492 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1493 if (ev.xconfigure.window == parent)
1439 { 1494 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1495 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1496 ;
1497
1498 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1499
1500 bool moved = false;
1501#ifdef HAVE_BG_PIXMAP
1502 if (bg_window_position_sensitive ())
1503 {
1504 want_position_change = true;
1505 if (bg_img == 0)
1506 moved = true;
1507 }
1508#endif
1509
1510 if (want_position_change)
1511 {
1512 int x, y;
1513
1514 if (ev.xconfigure.send_event)
1515 {
1516 x = ev.xconfigure.x;
1517 y = ev.xconfigure.y;
1518 }
1519 else
1520 get_window_origin (x, y);
1521
1522 if (x != parent_x || y != parent_y)
1523 {
1524 parent_x = x;
1525 parent_y = y;
1526 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1527 moved = true;
1528 }
1529 }
1442 1530
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1531 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1532 {
1445 seen_resize = 1; 1533 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1534 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1535 }
1448 else 1536 else
1449 { 1537 {
1450#ifdef HAVE_BG_PIXMAP 1538#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1539 if (moved)
1452 update_background (); 1540 update_background ();
1453#endif 1541#endif
1454 } 1542 }
1543
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1545 }
1457 break; 1546 break;
1458 1547
1459 case PropertyNotify: 1548 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1549 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break; 1550 break;
1466 1551
1467 case SelectionClear: 1552 case SelectionClear:
1468 selection_clear (); 1553 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break;
1470
1471 case SelectionNotify:
1472 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 break; 1554 break;
1475 1555
1476 case SelectionRequest: 1556 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1478 break; 1558 break;
1479 1559
1480 case MapNotify: 1560 case MapNotify:
1561#ifdef HAVE_BG_PIXMAP
1562 // This is needed at startup for the case of no window manager
1563 // or a non-reparenting window manager and also because we
1564 // defer bg image updates if the window is not mapped. The
1565 // short delay is to optimize for multiple ConfigureNotify
1566 // events at startup when the window manager reparents the
1567 // window, so as to perform the computation after we have
1568 // received all of them.
1569 if (bg_img == 0)
1570 update_background_ev.start (0.025);
1571#endif
1481 mapped = 1; 1572 mapped = 1;
1482#ifdef TEXT_BLINK 1573#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1574 text_blink_ev.start ();
1484#endif 1575#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1576 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1499 { 1590 {
1500 do 1591 do
1501 { 1592 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1593 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1594 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1595 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1597
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1599
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1601 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1602 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1603 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1604 }
1605
1514 want_refresh = 1; 1606 want_refresh = 1;
1515 } 1607 }
1516 else 1608 else
1517 { 1609 {
1518 XEvent unused_event; 1610 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1612 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1613 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1614 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1615 ;
1524 1616
1525 if (isScrollbarWindow (ev.xany.window)) 1617 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1618 {
1527 scrollBar.setIdle (); 1619 scrollBar.state = SB_STATE_IDLE;
1528 scrollbar_show (0); 1620 scrollBar.show (0);
1529 } 1621 }
1530 } 1622 }
1531 break; 1623 break;
1532 1624
1533 case MotionNotify: 1625 case MotionNotify:
… …
1574 1666
1575#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1576 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1577 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1578 { 1670 {
1671 page_dirn scroll_selection_dir;
1579 int dist; 1672 int dist;
1580 1673
1581 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1583 */ 1676 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1677 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1678 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1679
1587 /* save the event params so we can highlight 1680 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1681 * the selection in the pending-scroll loop
1589 */ 1682 */
… …
1598 dist = int_bwidth - ev.xbutton.y; 1691 dist = int_bwidth - ev.xbutton.y;
1599 } 1692 }
1600 else 1693 else
1601 { 1694 {
1602 scroll_selection_dir = DN; 1695 scroll_selection_dir = DN;
1603 dist = ev.xbutton.y - (int_bwidth + height); 1696 dist = ev.xbutton.y - (int_bwidth + vt_height);
1604 } 1697 }
1605 1698
1606 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1607 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1608 + 1; 1701 + 1;
1609 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1610 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1611 } 1705 }
1612 else 1706 else
1613 { 1707 {
1614 /* we are within the text window, so we 1708 /* we are within the text window, so we
1615 * shouldn't be scrolling 1709 * shouldn't be scrolling
1616 */ 1710 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1711 sel_scroll_ev.stop();
1619 } 1712 }
1620#endif 1713#endif
1621#ifdef MOUSE_THRESHOLD 1714#ifdef MOUSE_THRESHOLD
1622 } 1715 }
1623#endif 1716#endif
1624 } 1717 }
1625 } 1718 }
1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1719 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1627 { 1720 {
1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1721 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1629 MotionNotify, &ev)) 1722 MotionNotify, &ev))
1630 ; 1723 ;
1631 1724
1632 XQueryPointer (dpy, scrollBar.win, 1725 XQueryPointer (dpy, scrollBar.win,
1633 &unused_root, &unused_child, 1726 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1727 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1728 &ev.xbutton.x, &ev.xbutton.y,
1636 &unused_mask); 1729 &unused_mask);
1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1730 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1638 scrollbar_size ()); 1731 scrollBar.size ());
1639 want_refresh = 1; 1732 want_refresh = 1;
1640 scrollbar_show (1); 1733 scrollBar.show (1);
1641 } 1734 }
1642 break; 1735 break;
1643 } 1736 }
1644 1737
1645#if defined(CURSOR_BLINK) 1738#if defined(CURSOR_BLINK)
1646 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1739 if (ev.type == KeyPress)
1647 {
1648 if (hidden_cursor)
1649 {
1650 hidden_cursor = 0;
1651 want_refresh = 1;
1652 }
1653
1654 cursor_blink_ev.again (); 1740 cursor_blink_reset ();
1655 }
1656#endif 1741#endif
1657 1742
1658#if defined(POINTER_BLANK) 1743#if defined(POINTER_BLANK)
1659 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1744 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1660 { 1745 {
… …
1666 1751
1667 if (ev.type == KeyPress && hidden_pointer == 0) 1752 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank (); 1753 pointer_blank ();
1669 } 1754 }
1670#endif 1755#endif
1671}
1672 1756
1673void 1757 refresh_check ();
1758}
1759
1760#if ENABLE_FRILLS
1761void ecb_cold
1762rxvt_term::set_urgency (bool enable)
1763{
1764 if (enable == urgency_hint)
1765 return;
1766
1767 if (XWMHints *h = XGetWMHints (dpy, parent))
1768 {
1769 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1770 XSetWMHints (dpy, parent, h);
1771 urgency_hint = enable;
1772 XFree (h);
1773 }
1774}
1775#endif
1776
1777void ecb_cold
1674rxvt_term::focus_in () 1778rxvt_term::focus_in ()
1675{ 1779{
1676 if (!focus) 1780 if (!focus)
1677 { 1781 {
1678 focus = 1; 1782 focus = 1;
1679 want_refresh = 1; 1783 want_refresh = 1;
1680 1784
1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1682
1683#if USE_XIM 1785#if USE_XIM
1684 if (Input_Context != NULL) 1786 if (Input_Context != NULL)
1685 { 1787 {
1686 IMSetPosition (); 1788 im_set_position ();
1687 XSetICFocus (Input_Context); 1789 XSetICFocus (Input_Context);
1688 } 1790 }
1689#endif 1791#endif
1690#if CURSOR_BLINK 1792#if CURSOR_BLINK
1691 if (option (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
… …
1698 scr_recolour (); 1800 scr_recolour ();
1699 } 1801 }
1700#endif 1802#endif
1701#if ENABLE_FRILLS 1803#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell)) 1804 if (option (Opt_urgentOnBell))
1703 { 1805 set_urgency (0);
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif 1806#endif
1711 }
1712}
1713 1807
1714void 1808 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1809 }
1810}
1811
1812void ecb_cold
1715rxvt_term::focus_out () 1813rxvt_term::focus_out ()
1716{ 1814{
1717 if (focus) 1815 if (focus)
1718 { 1816 {
1719 focus = 0; 1817 focus = 0;
1720 want_refresh = 1; 1818 want_refresh = 1;
1721 1819
1722 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1820#if ENABLE_FRILLS
1723 1821 if (option (Opt_urgentOnBell))
1822 set_urgency (0);
1823#endif
1724#if ENABLE_FRILLS || ISO_14755 1824#if ENABLE_FRILLS || ISO_14755
1725 if (iso14755buf) 1825 if (iso14755buf)
1726 { 1826 {
1727 iso14755buf = 0; 1827 iso14755buf = 0;
1728# if ISO_14755 1828# if ISO_14755
… …
1745 { 1845 {
1746 pix_colors = pix_colors_unfocused; 1846 pix_colors = pix_colors_unfocused;
1747 scr_recolour (); 1847 scr_recolour ();
1748 } 1848 }
1749#endif 1849#endif
1750 }
1751}
1752 1850
1753void 1851 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1852 }
1853}
1854
1855void ecb_cold
1754rxvt_term::update_fade_color (unsigned int idx) 1856rxvt_term::update_fade_color (unsigned int idx)
1755{ 1857{
1756#if OFF_FOCUS_FADING 1858#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1859 if (rs[Rs_fade])
1758 { 1860 {
… …
1761 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1863 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1762 } 1864 }
1763#endif 1865#endif
1764} 1866}
1765 1867
1766#if ENABLE_TRANSPARENCY || ENABLE_PERL 1868#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1767void 1869void ecb_hot
1768rxvt_term::rootwin_cb (XEvent &ev) 1870rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1871{
1770 make_current (); 1872 make_current ();
1771 1873
1772 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1874 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1773 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1875 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1774 return; 1876 return;
1775 1877
1776# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1878 switch (ev.type)
1778 { 1879 {
1779 case PropertyNotify: 1880 case PropertyNotify:
1780 /* 1881 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1882 * if user used some Esetroot compatible prog to set the root bg,
1782 * use the property to determine the pixmap. We use it later on. 1883 * use the property to determine the pixmap. We use it later on.
1783 */ 1884 */
1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1885 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1886 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 { 1887 {
1787 bgPixmap.set_root_pixmap (); 1888#if BG_IMAGE_FROM_ROOT
1889 if (option (Opt_transparent))
1890 {
1891 rxvt_img::new_from_root (this)->replace (root_img);
1788 update_background (); 1892 update_background ();
1893 }
1894#endif
1895 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1789 } 1896 }
1897
1790 break; 1898 break;
1791 } 1899 }
1792# endif 1900
1901 refresh_check ();
1793} 1902}
1794#endif 1903#endif
1795 1904
1796void 1905void
1797rxvt_term::button_press (XButtonEvent &ev) 1906rxvt_term::button_press (XButtonEvent &ev)
… …
1828 /* save the xbutton state (for ButtonRelease) */ 1937 /* save the xbutton state (for ButtonRelease) */
1829 MEvent.state = ev.state; 1938 MEvent.state = ev.state;
1830#ifdef MOUSE_REPORT_DOUBLECLICK 1939#ifdef MOUSE_REPORT_DOUBLECLICK
1831 if (ev.button == MEvent.button && clickintime) 1940 if (ev.button == MEvent.button && clickintime)
1832 { 1941 {
1833 /* same button, within alloted time */ 1942 /* same button, within allowed time */
1834 MEvent.clicks++; 1943 MEvent.clicks++;
1835 1944
1836 if (MEvent.clicks > 1) 1945 if (MEvent.clicks > 1)
1837 { 1946 {
1838 /* only report double clicks */ 1947 /* only report double clicks */
… …
1910 } 2019 }
1911 2020
1912 /* 2021 /*
1913 * Scrollbar window processing of button press 2022 * Scrollbar window processing of button press
1914 */ 2023 */
1915 if (isScrollbarWindow (ev.window)) 2024 if (scrollBar.state && ev.window == scrollBar.win)
1916 { 2025 {
1917 scrollBar.setIdle (); 2026 page_dirn direction = NO_DIR;
2027
2028 if (scrollBar.upButton (ev.y))
2029 direction = UP; /* up */
2030 else if (scrollBar.dnButton (ev.y))
2031 direction = DN; /* down */
2032
2033 scrollBar.state = SB_STATE_IDLE;
1918 /* 2034 /*
1919 * Rxvt-style scrollbar: 2035 * Rxvt-style scrollbar:
1920 * move up if mouse is above slider 2036 * move up if mouse is above slider
1921 * move dn if mouse is below slider 2037 * move dn if mouse is below slider
1922 * 2038 *
… …
1931 /* 2047 /*
1932 * Mouse report disabled scrollbar: 2048 * Mouse report disabled scrollbar:
1933 * arrow buttons - send up/down 2049 * arrow buttons - send up/down
1934 * click on scrollbar - send pageup/down 2050 * click on scrollbar - send pageup/down
1935 */ 2051 */
1936 if ((scrollBar.style == R_SB_NEXT 2052 if (direction == UP)
1937 && scrollbarnext_upButton (ev.y))
1938 || (scrollBar.style == R_SB_RXVT
1939 && scrollbarrxvt_upButton (ev.y)))
1940 tt_printf ("\033[A"); 2053 tt_printf ("\033[A");
1941 else if ((scrollBar.style == R_SB_NEXT 2054 else if (direction == DN)
1942 && scrollbarnext_dnButton (ev.y))
1943 || (scrollBar.style == R_SB_RXVT
1944 && scrollbarrxvt_dnButton (ev.y)))
1945 tt_printf ("\033[B"); 2055 tt_printf ("\033[B");
1946 else 2056 else
1947 switch (ev.button) 2057 switch (ev.button)
1948 { 2058 {
1949 case Button2: 2059 case Button2:
… …
1957 break; 2067 break;
1958 } 2068 }
1959 } 2069 }
1960 else 2070 else
1961#endif /* NO_SCROLLBAR_REPORT */ 2071#endif /* NO_SCROLLBAR_REPORT */
1962
1963 {
1964 char upordown = 0;
1965
1966 if (scrollBar.style == R_SB_NEXT)
1967 { 2072 {
1968 if (scrollbarnext_upButton (ev.y)) 2073 if (direction != NO_DIR)
1969 upordown = -1; /* up */
1970 else if (scrollbarnext_dnButton (ev.y))
1971 upordown = 1; /* down */
1972 }
1973 else if (scrollBar.style == R_SB_RXVT)
1974 {
1975 if (scrollbarrxvt_upButton (ev.y))
1976 upordown = -1; /* up */
1977 else if (scrollbarrxvt_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 if (upordown)
1981 { 2074 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2076 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2077 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 2078#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 2079 if (scr_page (direction, 1))
1986 { 2080 {
1987 if (upordown < 0) 2081 if (direction == UP)
1988 scrollBar.setUp (); 2082 scrollBar.state = SB_STATE_UP;
1989 else 2083 else
1990 scrollBar.setDn (); 2084 scrollBar.state = SB_STATE_DOWN;
1991 } 2085 }
1992 } 2086 }
1993 else 2087 else
1994 switch (ev.button) 2088 switch (ev.button)
1995 { 2089 {
1996 case Button2: 2090 case Button2:
1997 switch (scrollbar_align) 2091 switch (scrollBar.align)
1998 { 2092 {
1999 case R_SB_ALIGN_TOP: 2093 case SB_ALIGN_TOP:
2000 csrO = 0; 2094 csrO = 0;
2001 break; 2095 break;
2002 case R_SB_ALIGN_CENTRE: 2096 case SB_ALIGN_CENTRE:
2003 csrO = (scrollBar.bot - scrollBar.top) / 2; 2097 csrO = (scrollBar.bot - scrollBar.top) / 2;
2004 break; 2098 break;
2005 case R_SB_ALIGN_BOTTOM: 2099 case SB_ALIGN_BOTTOM:
2006 csrO = scrollBar.bot - scrollBar.top; 2100 csrO = scrollBar.bot - scrollBar.top;
2007 break; 2101 break;
2008 } 2102 }
2009 2103
2010 if (scrollBar.style == R_SB_XTERM 2104 if (scrollBar.style == SB_STYLE_XTERM
2011 || scrollbar_above_slider (ev.y) 2105 || scrollBar.above_slider (ev.y)
2012 || scrollbar_below_slider (ev.y)) 2106 || scrollBar.below_slider (ev.y))
2013 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2107 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2014 2108
2015 scrollBar.setMotion (); 2109 scrollBar.state = SB_STATE_MOTION;
2016 break; 2110 break;
2017 2111
2018 case Button1: 2112 case Button1:
2019 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2113 if (scrollBar.align == SB_ALIGN_CENTRE)
2020 csrO = ev.y - scrollBar.top; 2114 csrO = ev.y - scrollBar.top;
2021 /* FALLTHROUGH */ 2115 /* FALLTHROUGH */
2022 2116
2023 case Button3: 2117 case Button3:
2024 if (scrollBar.style != R_SB_XTERM) 2118 if (scrollBar.style != SB_STYLE_XTERM)
2025 { 2119 {
2026 if (scrollbar_above_slider (ev.y)) 2120 if (scrollBar.above_slider (ev.y))
2027# ifdef RXVT_SCROLL_FULL 2121# ifdef RXVT_SCROLL_FULL
2028 scr_page (UP, nrow - 1); 2122 scr_page (UP, nrow - 1);
2029# else 2123# else
2030 scr_page (UP, nrow / 4); 2124 scr_page (UP, nrow / 4);
2031# endif 2125# endif
2032 else if (scrollbar_below_slider (ev.y)) 2126 else if (scrollBar.below_slider (ev.y))
2033# ifdef RXVT_SCROLL_FULL 2127# ifdef RXVT_SCROLL_FULL
2034 scr_page (DN, nrow - 1); 2128 scr_page (DN, nrow - 1);
2035# else 2129# else
2036 scr_page (DN, nrow / 4); 2130 scr_page (DN, nrow / 4);
2037# endif 2131# endif
2038 else 2132 else
2039 scrollBar.setMotion (); 2133 scrollBar.state = SB_STATE_MOTION;
2040 } 2134 }
2041 else 2135 else
2042 { 2136 {
2043 scr_page ((ev.button == Button1 ? DN : UP), 2137 scr_page ((ev.button == Button1 ? DN : UP),
2044 (nrow 2138 (nrow
2045 * scrollbar_position (ev.y) 2139 * scrollBar.position (ev.y)
2046 / scrollbar_size ())); 2140 / scrollBar.size ()));
2047 } 2141 }
2048 2142
2049 break; 2143 break;
2050 } 2144 }
2051 } 2145 }
… …
2061 2155
2062 csrO = 0; /* reset csr Offset */ 2156 csrO = 0; /* reset csr Offset */
2063 if (!bypass_keystate) 2157 if (!bypass_keystate)
2064 reportmode = !! (priv_modes & PrivMode_mouse_report); 2158 reportmode = !! (priv_modes & PrivMode_mouse_report);
2065 2159
2066 if (scrollbar_isUpDn ()) 2160 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2067 { 2161 {
2068 scrollBar.setIdle (); 2162 scrollBar.state = SB_STATE_IDLE;
2069 scrollbar_show (0); 2163 scrollBar.show (0);
2070 } 2164 }
2071 2165
2072#ifdef SELECTION_SCROLLING 2166#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2167 sel_scroll_ev.stop();
2075#endif 2168#endif
2076 2169
2077 if (ev.window == vt) 2170 if (ev.window == vt)
2078 { 2171 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2172 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2124 case Button3: 2217 case Button3:
2125 selection_make (ev.time); 2218 selection_make (ev.time);
2126 break; 2219 break;
2127 2220
2128 case Button2: 2221 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2222 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2223 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2224 break;
2132 2225
2133#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2134 case Button4: 2227 case Button4:
2135 case Button5: 2228 case Button5:
2136 { 2229 {
2137 int i; 2230 int lines;
2138 page_dirn v; 2231 page_dirn dirn;
2139 2232
2140 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2141 2234
2142 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2143 i = 1; 2236 lines = 1;
2144 else if (option (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2145 i = nrow - 1; 2238 lines = nrow - 1;
2146 else 2239 else
2147 i = 5; 2240 lines = 5;
2148 2241
2149# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2150 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2151 { 2244 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2245 mouse_slip_wheel_speed += dirn;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2247
2248 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2250 }
2158 else 2251 else
2252# endif
2159 { 2253 {
2160# endif
2161 scr_page (v, i); 2254 scr_page (dirn, lines);
2162 scrollbar_show (1); 2255 scrollBar.show (1);
2163# ifdef MOUSE_SLIP_WHEELING
2164 } 2256 }
2165# endif
2166 } 2257 }
2167 break; 2258 break;
2168#endif 2259#endif
2169 } 2260 }
2170 } 2261 }
2171} 2262}
2172 2263
2173/*}}} */ 2264/*}}} */
2174 2265
2175bool 2266void ecb_hot
2176rxvt_term::cmd_parse () 2267rxvt_term::cmd_parse ()
2177{ 2268{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2269 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2270 char *seq_begin; // remember start of esc-sequence here
2181 2271
2182 for (;;) 2272 for (;;)
2183 { 2273 {
2184 if (ch == NOCHAR) 2274 if (ecb_unlikely (ch == NOCHAR))
2185 { 2275 {
2186 seq_begin = cmdbuf_ptr; 2276 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2277 ch = next_char ();
2188 2278
2189 if (ch == NOCHAR) 2279 if (ch == NOCHAR)
2190 break; 2280 break;
2191 } 2281 }
2192 2282
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2283 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2284 {
2195 if (!seen_input) 2285 if (ecb_unlikely (!seen_input))
2196 { 2286 {
2197 seen_input = 1; 2287 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2288 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2289 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2290 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2303 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2304 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2305
2216 for (;;) 2306 for (;;)
2217 { 2307 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2308 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2309 break;
2220 2310
2221 *str++ = ch; 2311 *str++ = ch;
2222 2312
2223 if (ch == C0_LF || str >= eol) 2313 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2314 {
2225 if (ch == C0_LF) 2315 if (ch == C0_LF)
2226 nlines++; 2316 nlines++;
2227 2317
2228 refresh_count++; 2318 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2367 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2368 * if skipScroll is enabled.
2279 */ 2369 */
2280 if (refreshnow) 2370 if (refreshnow)
2281 { 2371 {
2282 flag = true;
2283 scr_refresh (); 2372 scr_refresh ();
2284 want_refresh = 1; 2373 want_refresh = 1;
2285 } 2374 }
2286
2287 } 2375 }
2288 else 2376 else
2289 { 2377 {
2290 try 2378 try
2291 { 2379 {
… …
2299 } 2387 }
2300 2388
2301 ch = NOCHAR; 2389 ch = NOCHAR;
2302 } 2390 }
2303 } 2391 }
2304
2305 return flag;
2306} 2392}
2307 2393
2308// read the next character 2394// read the next character
2309wchar_t 2395wchar_t ecb_hot
2310rxvt_term::next_char () NOTHROW 2396rxvt_term::next_char () NOTHROW
2311{ 2397{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2398 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2399 {
2314 // assume 7-bit to be ascii ALWAYS 2400 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2401 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2402 return *cmdbuf_ptr++;
2317 2403
2318 wchar_t wc; 2404 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2405 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2406
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2410 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2411 break;
2326 } 2412 }
2327 2413
2328 if (len == (size_t)-1) 2414 if (len == (size_t)-1)
2415 {
2416 mbstate.reset (); // reset now undefined conversion state
2417 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2418 // in which case we "erroneously" return the next byte which might be valid.
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2419 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2420 }
2330 2421
2331 // assume wchar == unicode 2422 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2423 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2424 return wc & UNICODE_MASK;
2334 } 2425 }
2335 2426
2336 return NOCHAR; 2427 return NOCHAR;
2337} 2428}
2338 2429
2339// read the next octet 2430// read the next octet
2340uint32_t 2431uint32_t ecb_hot
2341rxvt_term::next_octet () NOTHROW 2432rxvt_term::next_octet () NOTHROW
2342{ 2433{
2343 return cmdbuf_ptr < cmdbuf_endp 2434 return cmdbuf_ptr < cmdbuf_endp
2344 ? (unsigned char)*cmdbuf_ptr++ 2435 ? (unsigned char)*cmdbuf_ptr++
2345 : NOCHAR; 2436 : NOCHAR;
2346} 2437}
2347 2438
2348static class out_of_input out_of_input; 2439static class out_of_input out_of_input;
2349 2440
2350/* rxvt_cmd_getc () - Return next input character */ 2441wchar_t ecb_hot
2351/*
2352 * Return the next input character after first passing any keyboard input
2353 * to the command.
2354 */
2355wchar_t
2356rxvt_term::cmd_getc () THROW ((class out_of_input)) 2442rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2443{
2358 wchar_t c = next_char (); 2444 wchar_t c = next_char ();
2359 2445
2360 if (c == NOCHAR) 2446 if (c == NOCHAR)
2361 throw out_of_input; 2447 throw out_of_input;
2362 2448
2363 return c; 2449 return c;
2364} 2450}
2365 2451
2366uint32_t 2452uint32_t ecb_hot
2367rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2453rxvt_term::cmd_get8 () THROW ((class out_of_input))
2368{ 2454{
2369 uint32_t c = next_octet (); 2455 uint32_t c = next_octet ();
2370 2456
2371 if (c == NOCHAR) 2457 if (c == NOCHAR)
… …
2375} 2461}
2376 2462
2377/*{{{ print pipe */ 2463/*{{{ print pipe */
2378/*----------------------------------------------------------------------*/ 2464/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2465#ifdef PRINTPIPE
2380FILE * 2466FILE * ecb_cold
2381rxvt_term::popen_printer () 2467rxvt_term::popen_printer ()
2382{ 2468{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2469 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2470
2385 if (stream == NULL) 2471 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2472 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2473
2388 return stream; 2474 return stream;
2389} 2475}
2390 2476
2391int 2477int ecb_cold
2392rxvt_term::pclose_printer (FILE *stream) 2478rxvt_term::pclose_printer (FILE *stream)
2393{ 2479{
2394 fflush (stream); 2480 fflush (stream);
2395 return pclose (stream); 2481 return pclose (stream);
2396} 2482}
2397 2483
2398/* 2484/*
2399 * simulate attached vt100 printer 2485 * simulate attached vt100 printer
2400 */ 2486 */
2401void 2487void ecb_cold
2402rxvt_term::process_print_pipe () 2488rxvt_term::process_print_pipe ()
2403{ 2489{
2404 int done; 2490 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2491
2407 if ((fd = popen_printer ()) == NULL) 2492 if (!fd)
2408 return; 2493 return;
2409 2494
2410 /* 2495 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2496 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2497 * is received.
2413 */ 2498 */
2414 for (done = 0; !done;) 2499 for (int done = 0; !done; )
2415 { 2500 {
2416 unsigned char buf[8]; 2501 unsigned char buf[8];
2417 unicode_t ch; 2502 unicode_t ch;
2418 unsigned int i, len; 2503 unsigned int i, len;
2419 2504
… …
2453 pclose_printer (fd); 2538 pclose_printer (fd);
2454} 2539}
2455#endif /* PRINTPIPE */ 2540#endif /* PRINTPIPE */
2456/*}}} */ 2541/*}}} */
2457 2542
2458/* *INDENT-OFF* */
2459enum { 2543enum {
2460 C1_40 = 0x40, 2544 C1_40 = 0x40,
2461 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2545 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2462 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2546 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2463 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2547 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2464 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2548 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2465}; 2549};
2466/* *INDENT-ON* */
2467 2550
2468/*{{{ process non-printing single characters */ 2551/*{{{ process non-printing single characters */
2469void 2552void ecb_hot
2470rxvt_term::process_nonprinting (unicode_t ch) 2553rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2554{
2472 switch (ch) 2555 switch (ch)
2473 { 2556 {
2474 case C0_ESC: 2557 case C0_ESC:
… …
2520} 2603}
2521/*}}} */ 2604/*}}} */
2522 2605
2523 2606
2524/*{{{ process VT52 escape sequences */ 2607/*{{{ process VT52 escape sequences */
2525void 2608void ecb_cold
2526rxvt_term::process_escape_vt52 (unicode_t ch) 2609rxvt_term::process_escape_vt52 (unicode_t ch)
2527{ 2610{
2528 int row, col; 2611 int row, col;
2529 2612
2530 switch (ch) 2613 switch (ch)
… …
2564 break; 2647 break;
2565 case 'Z': /* identify the terminal type */ 2648 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2649 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2650 break;
2568 case '<': /* turn off VT52 mode */ 2651 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2652 priv_modes &= ~PrivMode_vt52;
2570 break; 2653 break;
2571 case 'F': /* use special graphics character set */ 2654 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2655 case 'G': /* use regular character set */
2573 /* unimplemented */ 2656 /* unimplemented */
2574 break; 2657 break;
… …
2580} 2663}
2581/*}}} */ 2664/*}}} */
2582 2665
2583 2666
2584/*{{{ process escape sequences */ 2667/*{{{ process escape sequences */
2585void 2668void ecb_hot
2586rxvt_term::process_escape_seq () 2669rxvt_term::process_escape_seq ()
2587{ 2670{
2588 unicode_t ch = cmd_getc (); 2671 unicode_t ch = cmd_getc ();
2589 2672
2590 if (priv_modes & PrivMode_vt52) 2673 if (priv_modes & PrivMode_vt52)
… …
2593 return; 2676 return;
2594 } 2677 }
2595 2678
2596 switch (ch) 2679 switch (ch)
2597 { 2680 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2681 case '#':
2600 if (cmd_getc () == '8') 2682 if (cmd_getc () == '8')
2601 scr_E (); 2683 scr_E ();
2602 break; 2684 break;
2603 case '(': 2685 case '(':
… …
2626#if !ENABLE_MINIMAL 2708#if !ENABLE_MINIMAL
2627 case '9': 2709 case '9':
2628 scr_forwardindex (); 2710 scr_forwardindex ();
2629 break; 2711 break;
2630#endif 2712#endif
2713 // DECPAM/DECPNM
2631 case '=': 2714 case '=':
2715 priv_modes |= PrivMode_aplKP;
2716 break;
2632 case '>': 2717 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2718 priv_modes &= ~PrivMode_aplKP;
2634 break; 2719 break;
2635 2720
2636 case C1_40: 2721 case C1_40:
2637 cmd_getc (); 2722 cmd_getc ();
2638 break; 2723 break;
… …
2642 2727
2643 /* 8.3.87: NEXT LINE */ 2728 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2729 case C1_NEL: /* ESC E */
2645 { 2730 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2731 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2732 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2733 }
2649 break; 2734 break;
2650 2735
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2736 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2737 case C1_ESA: /* ESC G */
2653 process_graphics (); 2738 // used by original rxvt for rob nations own graphics mode
2739 if (cmd_getc () == 'Q')
2740 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2654 break; 2741 break;
2655 2742
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2743 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2744 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2745 scr_set_tab (1);
… …
2662 case C1_RI: /* ESC M */ 2749 case C1_RI: /* ESC M */
2663 scr_index (DN); 2750 scr_index (DN);
2664 break; 2751 break;
2665 2752
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2753 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2754 /* case C1_SS2: break; */
2668 2755
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2756 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2757 /* case C1_SS3: break; */
2671 2758
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2759 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2760 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2761 process_dcs_seq ();
2675 break; 2762 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2764 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2765 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2766 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2767 break; /* steal obsolete ESC [ c */
2681 2768
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2769 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2770 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2771 process_csi_seq ();
2685 break; 2772 break;
2686 2773
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2774 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2775 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2776 process_osc_seq ();
2690 break; 2777 break;
2691 2778
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2779 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2780 case 'c':
2694 mbstate.reset (); 2781 mbstate.reset ();
2695 scr_poweron (); 2782 scr_poweron ();
2696 scrollbar_show (1); 2783 scrollBar.show (1);
2697 break; 2784 break;
2698 2785
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2786 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2787 case 'n':
2701 scr_charset_choose (2); 2788 scr_charset_choose (2);
… …
2708 } 2795 }
2709} 2796}
2710/*}}} */ 2797/*}}} */
2711 2798
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2799/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2800enum {
2715 CSI_ICH = 0x40, 2801 CSI_ICH = 0x40,
2716 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2802 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2717 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2803 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2718 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2804 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2721 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2807 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2722 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2808 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2723 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2809 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2810};
2725 2811
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2812#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2813 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2814 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2815#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2816 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2817
2732const unsigned char csi_defaults[] = 2818static const unsigned char csi_defaults[] =
2733 { 2819 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2820 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2735 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2821 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2736 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2822 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2737 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2823 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2738 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2824 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2739 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2825 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2740 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2826 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2741 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2827 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2742 }; 2828 };
2743/* *INDENT-ON* */
2744 2829
2745void 2830void ecb_hot
2746rxvt_term::process_csi_seq () 2831rxvt_term::process_csi_seq ()
2747{ 2832{
2748 unicode_t ch, priv, i; 2833 unicode_t ch, priv, prev_ch, i;
2749 unsigned int nargs, p; 2834 unsigned int nargs, p;
2750 int n, ndef; 2835 int n, ndef;
2751 int arg[ESC_ARGS] = { }; 2836 int arg[ESC_ARGS] = { };
2752 2837
2753 nargs = 0; 2838 nargs = 0;
2754 2839
2755 priv = 0; 2840 priv = 0;
2756 ch = cmd_getc (); 2841 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2842 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2843 {
2759 /* '<' '=' '>' '?' */ 2844 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2845 priv = ch;
2761 ch = cmd_getc (); 2846 ch = cmd_getc ();
2762 } 2847 }
2763 2848
2849 prev_ch = 0;
2764 /* read any numerical arguments */ 2850 /* read any numerical arguments */
2765 for (n = -1; ch < CSI_ICH; ) 2851 for (n = -1; ch < CSI_ICH; )
2766 { 2852 {
2767 if (isdigit (ch)) 2853 if (isdigit (ch))
2768 { 2854 {
… …
2778 n = -1; 2864 n = -1;
2779 } 2865 }
2780 else if (IS_CONTROL (ch)) 2866 else if (IS_CONTROL (ch))
2781 process_nonprinting (ch); 2867 process_nonprinting (ch);
2782 2868
2869 prev_ch = ch;
2783 ch = cmd_getc (); 2870 ch = cmd_getc ();
2784 } 2871 }
2785 2872
2786 if (ch > CSI_7F) 2873 if (ch > CSI_7F)
2787 return; 2874 return;
… …
2813 // versions. 2900 // versions.
2814 // 2901 //
2815 tt_printf ("\033[>%d;95;0c", 'U'); 2902 tt_printf ("\033[>%d;95;0c", 'U');
2816 } 2903 }
2817 break; 2904 break;
2905
2818 case '?': 2906 case '?':
2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2907 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2820 process_terminal_mode (ch, priv, nargs, arg); 2908 process_terminal_mode (ch, priv, nargs, arg);
2821 break; 2909 break;
2910
2911 case '!':
2912 if (ch == CSI_70)
2913 {
2914 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2915 scr_soft_reset ();
2916
2917 static const int pm_h[] = { 7, 25 };
2918 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2919
2920 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2921 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2822 } 2922 }
2923 break;
2924 }
2925
2823 return; 2926 return;
2824 } 2927 }
2825 2928
2826 switch (ch) 2929 switch (ch)
2827 { 2930 {
… …
2841 } 2944 }
2842 break; 2945 break;
2843#endif 2946#endif
2844 2947
2845 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2948 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2846 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2949 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2847 arg[0] = -arg[0]; 2950 arg[0] = -arg[0];
2848 /* FALLTHROUGH */ 2951 /* FALLTHROUGH */
2849 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2952 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2850 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2953 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2851 scr_gotorc (arg[0], 0, RELATIVE); 2954 scr_gotorc (arg[0], 0, RELATIVE);
2852 break; 2955 break;
2853 2956
2854 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2957 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2855 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2958 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3005 scr_insert_mode (1); 3108 scr_insert_mode (1);
3006 else if (arg[0] == 20) 3109 else if (arg[0] == 20)
3007 priv_modes |= PrivMode_LFNL; 3110 priv_modes |= PrivMode_LFNL;
3008 break; 3111 break;
3009 3112
3113 case CSI_71: // DESCUSR: set cursor style
3114 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]);
3116 break;
3117
3010 /* 3118 /*
3011 * PRIVATE USE beyond this point. All CSI_7? sequences here 3119 * PRIVATE USE beyond this point. All CSI_7? sequences here
3012 */ 3120 */
3013 case CSI_72: /* DECSTBM: set top and bottom margins */ 3121 case CSI_72: /* DECSTBM: set top and bottom margins */
3014 if (nargs == 1) 3122 if (nargs == 1)
… …
3042 } 3150 }
3043} 3151}
3044/*}}} */ 3152/*}}} */
3045 3153
3046#if !ENABLE_MINIMAL 3154#if !ENABLE_MINIMAL
3047/* ARGSUSED */
3048void 3155void
3049rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3156rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3050{ 3157{
3051 int x, y; 3158 int x, y;
3052 XWindowAttributes wattr; 3159 XWindowAttributes wattr;
… …
3061 { 3168 {
3062 /* 3169 /*
3063 * commands 3170 * commands
3064 */ 3171 */
3065 case 1: /* deiconify window */ 3172 case 1: /* deiconify window */
3066 XMapWindow (dpy, parent[0]); 3173 XMapWindow (dpy, parent);
3067 break; 3174 break;
3068 case 2: /* iconify window */ 3175 case 2: /* iconify window */
3069 XIconifyWindow (dpy, parent[0], display->screen); 3176 XIconifyWindow (dpy, parent, display->screen);
3070 break; 3177 break;
3071 case 3: /* set position (pixels) */ 3178 case 3: /* set position (pixels) */
3072 XMoveWindow (dpy, parent[0], args[1], args[2]); 3179 XMoveWindow (dpy, parent, args[1], args[2]);
3073 break; 3180 break;
3074 case 4: /* set size (pixels) */ 3181 case 4: /* set size (pixels) */
3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3182 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3076 break; 3183 break;
3077 case 5: /* raise window */ 3184 case 5: /* raise window */
3078 XRaiseWindow (dpy, parent[0]); 3185 XRaiseWindow (dpy, parent);
3079 break; 3186 break;
3080 case 6: /* lower window */ 3187 case 6: /* lower window */
3081 XLowerWindow (dpy, parent[0]); 3188 XLowerWindow (dpy, parent);
3082 break; 3189 break;
3083 case 7: /* refresh window */ 3190 case 7: /* refresh window */
3084 scr_touch (true); 3191 scr_touch (true);
3085 break; 3192 break;
3086 case 8: /* set size (chars) */ 3193 case 8: /* set size (chars) */
… …
3089 break; 3196 break;
3090 3197
3091 //case 9: NYI, TODO, restore maximized window or maximize window 3198 //case 9: NYI, TODO, restore maximized window or maximize window
3092 default: 3199 default:
3093 if (args[0] >= 24) /* set height (chars) */ 3200 if (args[0] >= 24) /* set height (chars) */
3094 set_widthheight ((unsigned int)width, 3201 set_widthheight ((unsigned int)vt_width,
3095 (unsigned int) (args[1] * fheight)); 3202 (unsigned int) (args[1] * fheight));
3096 break; 3203 break;
3097 3204
3098 /* 3205 /*
3099 * reports - some output format copied from XTerm 3206 * reports - some output format copied from XTerm
3100 */ 3207 */
3101 case 11: /* report window state */ 3208 case 11: /* report window state */
3102 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3210 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3104 break; 3211 break;
3105 case 13: /* report window position */ 3212 case 13: /* report window position */
3106 XGetWindowAttributes (dpy, parent[0], &wattr); 3213 XGetWindowAttributes (dpy, parent, &wattr);
3107 XTranslateCoordinates (dpy, parent[0], wattr.root, 3214 XTranslateCoordinates (dpy, parent, wattr.root,
3108 -wattr.border_width, -wattr.border_width, 3215 -wattr.border_width, -wattr.border_width,
3109 &x, &y, &wdummy); 3216 &x, &y, &wdummy);
3110 tt_printf ("\033[3;%d;%dt", x, y); 3217 tt_printf ("\033[3;%d;%dt", x, y);
3111 break; 3218 break;
3112 case 14: /* report window size (pixels) */ 3219 case 14: /* report window size (pixels) */
3113 XGetWindowAttributes (dpy, parent[0], &wattr); 3220 XGetWindowAttributes (dpy, parent, &wattr);
3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3221 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3115 break; 3222 break;
3116 case 18: /* report text area size (chars) */ 3223 case 18: /* report text area size (chars) */
3117 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3118 break; 3225 break;
… …
3120 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3227 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3121 break; 3228 break;
3122 case 20: /* report icon label */ 3229 case 20: /* report icon label */
3123 { 3230 {
3124 char *s; 3231 char *s;
3125 XGetIconName (dpy, parent[0], &s); 3232 XGetIconName (dpy, parent, &s);
3126 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3233 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3127 XFree (s); 3234 XFree (s);
3128 } 3235 }
3129 break; 3236 break;
3130 case 21: /* report window title */ 3237 case 21: /* report window title */
3131 { 3238 {
3132 char *s; 3239 char *s;
3133 XFetchName (dpy, parent[0], &s); 3240 XFetchName (dpy, parent, &s);
3134 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3241 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3135 XFree (s); 3242 XFree (s);
3136 } 3243 }
3137 break; 3244 break;
3138 } 3245 }
… …
3148rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3149{ 3256{
3150 unicode_t ch; 3257 unicode_t ch;
3151 bool seen_esc = false; 3258 bool seen_esc = false;
3152 unsigned int n = 0; 3259 unsigned int n = 0;
3153 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3154 3261
3155 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3156 { 3263 {
3157 if (seen_esc) 3264 if (seen_esc)
3158 { 3265 {
… …
3173 else if (ch < 0x20) 3280 else if (ch < 0x20)
3174 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3175 3282
3176 seen_esc = false; 3283 seen_esc = false;
3177 3284
3178 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3179 // stop at some sane length 3286 // stop at some sane length
3180 return NULL; 3287 return NULL;
3181 3288
3182 string[n++] = ch; 3289 string[n++] = ch;
3183 } 3290 }
… …
3194 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3301 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3195 */ 3302 */
3196void 3303void
3197rxvt_term::process_dcs_seq () 3304rxvt_term::process_dcs_seq ()
3198{ 3305{
3199 char *s;
3200 unicode_t eh;
3201
3202 /* 3306 /*
3203 * Not handled yet 3307 * Not handled yet
3204 */ 3308 */
3309
3310 unicode_t eh;
3205 s = get_to_st (eh); 3311 char *s = get_to_st (eh);
3206 if (s) 3312 if (s)
3207 free (s); 3313 free (s);
3208 3314
3209 return; 3315 return;
3210} 3316}
… …
3214 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3320 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3215 */ 3321 */
3216void 3322void
3217rxvt_term::process_osc_seq () 3323rxvt_term::process_osc_seq ()
3218{ 3324{
3219 unicode_t ch, eh;
3220 int arg; 3325 int arg;
3221 3326
3222 ch = cmd_getc (); 3327 unicode_t ch = cmd_getc ();
3223 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3328 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3224 arg = arg * 10 + (ch - '0'); 3329 arg = arg * 10 + (ch - '0');
3225 3330
3226 if (ch == ';') 3331 if (ch == ';')
3227 { 3332 {
3333 unicode_t eh;
3228 char *s = get_to_st (eh); 3334 char *s = get_to_st (eh);
3229 3335
3230 if (s) 3336 if (s)
3231 { 3337 {
3232 process_xterm_seq (arg, s, eh); 3338 process_xterm_seq (arg, s, eh);
… …
3256 3362
3257/* 3363/*
3258 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3364 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3259 */ 3365 */
3260void 3366void
3261rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3367rxvt_term::process_xterm_seq (int op, char *str, char resp)
3262{ 3368{
3263 int color; 3369 int color;
3264 char *buf, *name; 3370 char *buf, *name;
3265 bool query = str[0] == '?' && !str[1]; 3371 bool query = str[0] == '?' && !str[1];
3266 int saveop = op; 3372 int saveop = op;
… …
3293 unsigned long bytes_after; 3399 unsigned long bytes_after;
3294 unsigned char *value = 0; 3400 unsigned char *value = 0;
3295 const char *str = ""; 3401 const char *str = "";
3296 3402
3297 if (prop 3403 if (prop
3298 && XGetWindowProperty (dpy, parent[0], 3404 && XGetWindowProperty (dpy, parent,
3299 prop, 0, 1<<16, 0, AnyPropertyType, 3405 prop, 0, 1<<16, 0, AnyPropertyType,
3300 &actual_type, &actual_format, 3406 &actual_type, &actual_format,
3301 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3302 && actual_type != None 3408 && actual_type != None
3303 && actual_format == 8) 3409 && actual_format == 8)
3304 str = (const char *)(value); 3410 str = (const char *)(value);
3305 3411
3306 tt_printf ("\033]%d;%s%c", op, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3307 3413
3308 XFree (value); 3414 XFree (value);
3309 } 3415 }
3310 else 3416 else
3311 { 3417 {
3312 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3418 char *eq = strchr (str, '=');
3313 3419
3314 if (eq) 3420 if (eq)
3315 { 3421 {
3316 *eq = 0; 3422 *eq = 0;
3317 set_utf8_property (display->atom (str), eq + 1); 3423 set_utf8_property (display->atom (str), eq + 1);
3318 } 3424 }
3319 else 3425 else
3320 XDeleteProperty (dpy, parent[0], 3426 XDeleteProperty (dpy, parent,
3321 display->atom (str)); 3427 display->atom (str));
3322 } 3428 }
3323 break; 3429 break;
3324 3430
3325 case XTerm_Color: 3431 case XTerm_Color:
… …
3338 *buf++ = '\0'; 3444 *buf++ = '\0';
3339 3445
3340 process_color_seq (op, color, name, resp); 3446 process_color_seq (op, color, name, resp);
3341 } 3447 }
3342 break; 3448 break;
3449 case Rxvt_restoreFG:
3343 case XTerm_Color00: 3450 case XTerm_Color00:
3344 process_color_seq (op, Color_fg, str, resp); 3451 process_color_seq (op, Color_fg, str, resp);
3345 break; 3452 break;
3453 case Rxvt_restoreBG:
3346 case XTerm_Color01: 3454 case XTerm_Color01:
3347 process_color_seq (op, Color_bg, str, resp); 3455 process_color_seq (op, Color_bg, str, resp);
3348 break; 3456 break;
3349#ifndef NO_CURSORCOLOR 3457#ifndef NO_CURSORCOLOR
3350 case XTerm_Color_cursor: 3458 case XTerm_Color_cursor:
… …
3355 process_color_seq (op, Color_pointer_fg, str, resp); 3463 process_color_seq (op, Color_pointer_fg, str, resp);
3356 break; 3464 break;
3357 case XTerm_Color_pointer_bg: 3465 case XTerm_Color_pointer_bg:
3358 process_color_seq (op, Color_pointer_bg, str, resp); 3466 process_color_seq (op, Color_pointer_bg, str, resp);
3359 break; 3467 break;
3468#ifdef OPTION_HC
3469 case XTerm_Color_HC:
3470 process_color_seq (op, Color_HC, str, resp);
3471 break;
3472 case XTerm_Color_HTC:
3473 process_color_seq (op, Color_HTC, str, resp);
3474 break;
3475#endif
3360#ifndef NO_BOLD_UNDERLINE_REVERSE 3476#ifndef NO_BOLD_UNDERLINE_REVERSE
3361 case XTerm_Color_RV:
3362 process_color_seq (op, Color_RV, str, resp);
3363 break;
3364 case Rxvt_Color_BD:
3365 case URxvt_Color_BD: 3477 case URxvt_Color_BD:
3366 process_color_seq (op, Color_BD, str, resp); 3478 process_color_seq (op, Color_BD, str, resp);
3367 break; 3479 break;
3368 case Rxvt_Color_UL:
3369 case URxvt_Color_UL: 3480 case URxvt_Color_UL:
3370 process_color_seq (op, Color_UL, str, resp); 3481 process_color_seq (op, Color_UL, str, resp);
3371 break; 3482 break;
3372 case URxvt_Color_IT: 3483 case URxvt_Color_IT:
3373 process_color_seq (op, Color_IT, str, resp); 3484 process_color_seq (op, Color_IT, str, resp);
3374 break; 3485 break;
3375#endif 3486#endif
3376#if ENABLE_TRANSPARENCY 3487 case URxvt_Color_border:
3488 process_color_seq (op, Color_border, str, resp);
3489 break;
3490
3491#if BG_IMAGE_FROM_ROOT
3377 case URxvt_Color_tint: 3492 case URxvt_Color_tint:
3378 process_color_seq (op, Color_tint, str, resp); 3493 process_color_seq (op, Color_tint, str, resp);
3379 { 3494 {
3380 bool changed = false; 3495 bool changed = false;
3496
3381 if (ISSET_PIXCOLOR (Color_tint)) 3497 if (ISSET_PIXCOLOR (Color_tint))
3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3498 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3383 else 3499
3384 changed = bgPixmap.unset_tint ();
3385 if (changed) 3500 if (changed)
3386 update_background (); 3501 update_background ();
3387 } 3502 }
3388 3503
3389 break; 3504 break;
… …
3392#if BG_IMAGE_FROM_FILE 3507#if BG_IMAGE_FROM_FILE
3393 case Rxvt_Pixmap: 3508 case Rxvt_Pixmap:
3394 if (!strcmp (str, "?")) 3509 if (!strcmp (str, "?"))
3395 { 3510 {
3396 char str[256]; 3511 char str[256];
3512 int h_scale = fimage.h_scale;
3513 int v_scale = fimage.v_scale;
3514 int h_align = fimage.h_align;
3515 int v_align = fimage.v_align;
3397 3516
3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3517 sprintf (str, "[%dx%d+%d+%d]",
3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3518 h_scale, v_scale,
3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3519 h_align, v_align);
3401 process_xterm_seq (XTerm_title, str, CHAR_ST); 3520 process_xterm_seq (XTerm_title, str, CHAR_ST);
3402 } 3521 }
3403 else 3522 else
3404 { 3523 {
3405 int changed = 0; 3524 bool changed = false;
3406 3525
3407 if (*str != ';') 3526 if (*str != ';')
3408 { 3527 {
3409 /* reset to default scaling :*/ 3528 try
3410 bgPixmap.unset_geometry (); 3529 {
3411 if (bgPixmap.set_file (str)) /* change pixmap */ 3530 fimage.set_file_geometry (this, str);
3412 changed++; 3531 changed = true;
3413 str = strchr (str, ';'); 3532 }
3414 if (str == NULL) 3533 catch (const class rxvt_failure_exception &e)
3415 bgPixmap.set_defaultGeometry (); 3534 {
3535 }
3416 } 3536 }
3417 while (str) 3537 else
3418 { 3538 {
3419 str++; 3539 str++;
3420 if (bgPixmap.set_geometry (str)) 3540 if (fimage.set_geometry (str, true))
3421 changed++; 3541 changed = true;
3422 str = strchr (str, ';');
3423 } 3542 }
3543
3424 if (changed) 3544 if (changed)
3545 {
3546 if (bg_window_position_sensitive ())
3547 {
3548 int x, y;
3549 get_window_origin (x, y);
3550 parent_x = x;
3551 parent_y = y;
3552 }
3425 update_background (); 3553 update_background ();
3554 }
3426 } 3555 }
3427 break; 3556 break;
3428#endif 3557#endif
3429
3430 case Rxvt_restoreFG:
3431 set_window_color (Color_fg, str);
3432 break;
3433 case Rxvt_restoreBG:
3434 set_window_color (Color_bg, str);
3435 break;
3436 3558
3437 case XTerm_logfile: 3559 case XTerm_logfile:
3438 // TODO, when secure mode? 3560 // TODO, when secure mode?
3439 break; 3561 break;
3440 3562
… …
3507 break; 3629 break;
3508#endif 3630#endif
3509 3631
3510#if ENABLE_PERL 3632#if ENABLE_PERL
3511 case URxvt_perl: 3633 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3634 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3635 break;
3515#endif 3636#endif
3516 } 3637 }
3517} 3638}
3518/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
… …
3525 * 's' = save 3646 * 's' = save
3526 * 'r' = restore 3647 * 'r' = restore
3527 * 't' = toggle 3648 * 't' = toggle
3528 * so no need for fancy checking 3649 * so no need for fancy checking
3529 */ 3650 */
3530int 3651int ecb_cold
3531rxvt_term::privcases (int mode, unsigned long bit) 3652rxvt_term::privcases (int mode, unsigned long bit)
3532{ 3653{
3533 int state; 3654 int state;
3534 3655
3535 if (mode == 's') 3656 if (mode == 's')
3536 { 3657 {
3537 SavedModes |= (priv_modes & bit); 3658 if (priv_modes & bit)
3659 SavedModes |= bit;
3660 else
3661 SavedModes &= ~bit;
3538 return -1; 3662 return -1;
3539 } 3663 }
3540 else 3664 else
3541 { 3665 {
3542 if (mode == 'r') 3666 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3667 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3668 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3669 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3670
3671 if (state)
3672 priv_modes |= bit;
3673 else
3674 priv_modes &= ~bit;
3547 } 3675 }
3548 3676
3549 return state; 3677 return state;
3550} 3678}
3551 3679
3552/* we're not using priv _yet_ */ 3680/* we're not using priv _yet_ */
3553void 3681void
3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3682rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3555{ 3683{
3556 unsigned int i, j; 3684 unsigned int i, j;
3557 int state; 3685 int state;
3558 3686
3559 static const struct 3687 static const struct
3560 { 3688 {
3561 const int argval; 3689 const int argval;
3562 const unsigned long bit; 3690 const unsigned long bit;
3563 } argtopriv[] = { 3691 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3692 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3693 { 2, PrivMode_vt52 }, // DECANM
3566 { 3, PrivMode_132 }, 3694 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3695 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3696 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3697 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3698 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3699 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3700 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3701 // 18 end FF to printer after print screen
3702 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3703 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3705 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3706#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3707 { 35, PrivMode_ShiftKeys }, // rxvt extension
3708 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3709 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3710 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3711 // 45 margin bell NYI
3582 // 46 start logging 3712 // 46 start logging
3583 { 47, PrivMode_Screen }, 3713 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3714 { 66, PrivMode_aplKP }, // DECNKM
3585#ifndef NO_BACKSPACE_KEY 3715#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3716 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3717#endif
3588 { 1000, PrivMode_MouseX11 }, 3718 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3719 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3720 { 1003, PrivMode_MouseAnyEvent },
3721#if ENABLE_FRILLS
3722 { 1005, PrivMode_ExtModeMouse },
3723#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3724 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3725 { 1011, PrivMode_Keypress }, // rxvt extension
3726#if ENABLE_FRILLS
3727 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3728#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3729 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3730 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3731 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3732 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3733 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3734 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3735 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3736 { 2004, PrivMode_BracketPaste },
3600 }; 3737 };
3601 3738
3602 if (nargs == 0) 3739 if (nargs == 0)
3603 return; 3740 return;
3604 3741
… …
3611 for (i = 0; i < nargs; i++) 3748 for (i = 0; i < nargs; i++)
3612 { 3749 {
3613 state = -1; 3750 state = -1;
3614 3751
3615 /* basic handling */ 3752 /* basic handling */
3616 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3753 for (j = 0; j < ecb_array_length (argtopriv); j++)
3617 if (argtopriv[j].argval == arg[i]) 3754 if (argtopriv[j].argval == arg[i])
3618 { 3755 {
3619 state = privcases (mode, argtopriv[j].bit); 3756 state = privcases (mode, argtopriv[j].bit);
3620 break; 3757 break;
3621 } 3758 }
… …
3629 3766
3630 scr_touch (true); 3767 scr_touch (true);
3631 break; 3768 break;
3632#endif 3769#endif
3633 case 1048: /* alternative cursor save */ 3770 case 1048: /* alternative cursor save */
3634 case 1049:
3635 if (option (Opt_secondaryScreen)) 3771 if (option (Opt_secondaryScreen))
3636 if (mode == 0) 3772 if (mode == 0)
3637 scr_cursor (RESTORE); 3773 scr_cursor (RESTORE);
3638 else if (mode == 1) 3774 else if (mode == 1)
3639 scr_cursor (SAVE); 3775 scr_cursor (SAVE);
… …
3648 case 2: /* VT52 mode */ 3784 case 2: /* VT52 mode */
3649 /* oddball mode. should be set regardless of set/reset 3785 /* oddball mode. should be set regardless of set/reset
3650 * parameter. Return from VT52 mode with an ESC < from 3786 * parameter. Return from VT52 mode with an ESC < from
3651 * within VT52 mode 3787 * within VT52 mode
3652 */ 3788 */
3653 PrivMode (1, PrivMode_vt52); 3789 priv_modes |= PrivMode_vt52;
3654 break; 3790 break;
3655 case 3: /* 80/132 */ 3791 case 3: /* 80/132 */
3656 if (priv_modes & PrivMode_132OK) 3792 if (priv_modes & PrivMode_132OK)
3657 set_widthheight (((state ? 132 : 80) * fwidth), height); 3793 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3658 break; 3794 break;
3659 case 4: /* smooth scrolling */ 3795 case 4: /* smooth scrolling */
3660 set_option (Opt_jumpScroll, !state); 3796 set_option (Opt_jumpScroll, !state);
3661 break; 3797 break;
3662 case 5: /* reverse video */ 3798 case 5: /* reverse video */
… …
3673 if (state) /* orthogonal */ 3809 if (state) /* orthogonal */
3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3810 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3675 break; 3811 break;
3676#ifdef scrollBar_esc 3812#ifdef scrollBar_esc
3677 case scrollBar_esc: 3813 case scrollBar_esc:
3678 if (scrollbar_mapping (state)) 3814 scrollBar.map (state);
3679 {
3680 resize_all_windows (0, 0, 0); 3815 resize_all_windows (0, 0, 0);
3681 scr_touch (true); 3816 scr_touch (true);
3682 }
3683 break; 3817 break;
3684#endif 3818#endif
3685 case 25: /* visible/invisible cursor */ 3819 case 25: /* visible/invisible cursor */
3686 scr_cursor_visible (state); 3820 scr_cursor_visible (state);
3687 break; 3821 break;
… …
3700 case 1003: 3834 case 1003:
3701 if (state) 3835 if (state)
3702 { 3836 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3837 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3838 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3839 mouse_row = mouse_col = 0;
3705 vt_emask_mouse = PointerMotionMask; 3840 vt_emask_mouse = PointerMotionMask;
3706 } 3841 }
3707 else 3842 else
3708 vt_emask_mouse = NoEventMask; 3843 vt_emask_mouse = NoEventMask;
3844
3709 vt_select_input (); 3845 vt_select_input ();
3710 break; 3846 break;
3711 case 1010: /* scroll to bottom on TTY output inhibit */ 3847 case 1010: /* scroll to bottom on TTY output inhibit */
3712 set_option (Opt_scrollTtyOutput, !state); 3848 set_option (Opt_scrollTtyOutput, !state);
3713 break; 3849 break;
3714 case 1011: /* scroll to bottom on key press */ 3850 case 1011: /* scroll to bottom on key press */
3715 set_option (Opt_scrollTtyKeypress, state); 3851 set_option (Opt_scrollTtyKeypress, state);
3716 break; 3852 break;
3717 case 1047: /* secondary screen w/ clearing last */ 3853 case 1047: /* secondary screen w/ clearing last */
3718 if (option (Opt_secondaryScreen)) 3854 if (option (Opt_secondaryScreen))
3719 if (current_screen != PRIMARY) 3855 if (!state)
3720 scr_erase_screen (2); 3856 scr_erase_screen (2);
3857
3721 scr_change_screen (state); 3858 scr_change_screen (state);
3722 break; 3859 break;
3723 case 1049: /* secondary screen w/ clearing first */ 3860 case 1049: /* secondary screen w/ clearing first */
3861 if (option (Opt_secondaryScreen))
3862 if (state)
3863 scr_cursor (SAVE);
3864
3724 scr_change_screen (state); 3865 scr_change_screen (state);
3866
3725 if (option (Opt_secondaryScreen)) 3867 if (option (Opt_secondaryScreen))
3726 if (current_screen != PRIMARY) 3868 if (state)
3727 scr_erase_screen (2); 3869 scr_erase_screen (2);
3870 else
3871 scr_cursor (RESTORE);
3728 break; 3872 break;
3729 default: 3873 default:
3730 break; 3874 break;
3731 } 3875 }
3732 } 3876 }
3733} 3877}
3734/*}}} */ 3878/*}}} */
3735 3879
3736/*{{{ process sgr sequences */ 3880/*{{{ process sgr sequences */
3737void 3881void ecb_hot
3738rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3882rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3739{ 3883{
3740 unsigned int i; 3884 unsigned int i;
3741 short rendset; 3885 short rendset;
3742 int rendstyle; 3886 int rendstyle;
… …
3883 break; 4027 break;
3884#endif 4028#endif
3885 } 4029 }
3886 } 4030 }
3887} 4031}
3888/*}}} */
3889 4032
3890/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3891void 4033void
3892rxvt_term::process_graphics () 4034rxvt_term::set_cursor_style (int style)
3893{ 4035{
3894 unicode_t ch, cmd = cmd_getc (); 4036 if (!IN_RANGE_INC (style, 0, 4))
3895
3896 if (cmd == 'Q')
3897 {
3898 /* query graphics */
3899 tt_printf ("\033G0\012"); /* no graphics */
3900 return; 4037 return;
3901 } 4038
3902 /* swallow other graphics sequences until terminating ':' */ 4039 set_option (Opt_cursorUnderline, style >= 3);
3903 do 4040
3904 ch = cmd_getc (); 4041#ifdef CURSOR_BLINK
3905 while (ch != ':'); 4042 set_option (Opt_cursorBlink, !style || (style & 1));
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
3906} 4047}
3907/*}}} */ 4048/*}}} */
3908 4049
3909/* ------------------------------------------------------------------------- */ 4050/* ------------------------------------------------------------------------- */
3910 4051
… …
3926 4067
3927/* ---------------------------------------------------------------------- */ 4068/* ---------------------------------------------------------------------- */
3928/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user, pasted with the mouse,
3929 * or generated by us in response to a query ESC sequence. 4070 * or generated by us in response to a query ESC sequence.
3930 */ 4071 */
3931const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3932 4073
3933void 4074void
3934rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
3935{ 4076{
3936 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3941 4082
3942 if (v_buflen == 0) 4083 if (v_buflen == 0)
3943 { 4084 {
3944 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4085 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3945 4086
4087 max_it (written, 0);
4088
3946 if ((unsigned int)written == len) 4089 if (written == len)
3947 return; 4090 return;
3948 4091
3949 data += written; 4092 data += written;
3950 len -= written; 4093 len -= written;
3951 } 4094 }
3952 4095
3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4096 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3954 4097
3955 memcpy (v_buffer + v_buflen, data, len); 4098 memcpy (v_buffer + v_buflen, data, len);
3956 v_buflen += len; 4099 v_buflen += len;
3957 4100
3958 pty_ev.set (ev::READ | ev::WRITE); 4101 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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