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.564 by sf-exg, Fri Mar 27 15:06:09 2015 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 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 - 5 && 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 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
304{ 409{
305 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
306 unsigned int newlen; 411 KeySym keysym = NoSymbol;
307 KeySym keysym;
308 int valid_keysym;
309 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
310 414
311#if ISO_14755 415#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
313 return; 417 return;
314#endif 418#endif
… …
321 */ 425 */
322 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
325 429
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; 430 kbuf[0] = 0;
333 431
334#ifdef USE_XIM 432#if USE_XIM
335 if (Input_Context) 433 if (Input_Context)
336 { 434 {
337 Status status_return; 435 Status status_return;
338 436
339#if 0 437#if 0
… …
377 } 475 }
378 } 476 }
379 else 477 else
380 len = 0; 478 len = 0;
381 } 479 }
382
383 valid_keysym = status_return == XLookupKeySym
384 || status_return == XLookupBoth;
385 } 480 }
386 else 481 else
387#endif 482#endif
388 { 483 {
389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
390 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
391 } 488 {
489 KeySym orig_keysym = keysym;
392 490
393 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
394 { 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 }
457 769
458 if (shft) 770 if (shft)
459 { 771 {
460 /* Shift + F1 - F10 generates F11 - F20 */
461 if (keysym >= XK_F1 && keysym <= XK_F10)
462 {
463 keysym += (XK_F11 - XK_F1);
464 shft = 0; /* turn off Shift */
465 }
466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
467 { 773 {
468 switch (keysym) 774 switch (keysym)
469 { 775 {
470 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
471 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
472 selection_request (ev.time); 778 selection_request (ev.time);
473 return; 779 return;
474#if TODO 780#if TODO
475 /* rxvt extras */ 781 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 783 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 785 return;
482#endif 786#endif
483 } 787 }
484 } 788 }
485 } 789 }
486 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
487#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 807 // ISO 14755 support
489 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 809 {
491 int hv; 810 int hv;
492 811
493 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 843 scr_overlay_off ();
525# endif 844# endif
526 iso14755buf = 0; 845 iso14755buf = 0;
527 } 846 }
528 } 847 }
848 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
532 { 852 {
533 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 854# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 863 {
544 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
545 return; 865 return;
546 } 866 }
547#endif 867#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 } 868 }
831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834 869
835 if (len <= 0) 870 if (len <= 0)
836 return; /* not mapped */ 871 return; /* not mapped */
837 872
838 if (option (Opt_scrollTtyKeypress))
839 if (view_start)
840 {
841 view_start = 0;
842 want_refresh = 1;
843 }
844
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
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); 873 tt_write_user_input (kbuf, (unsigned int)len);
871} 874}
872 875
873void 876void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
875{ 878{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 880 KeySym keysym;
878 881
… …
898 commit_iso14755 (); 901 commit_iso14755 ();
899 902
900 return; 903 return;
901 } 904 }
902 905
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 907 if (i[0] == keysym)
905 { 908 {
906 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 910 commit_iso14755 ();
908 911
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
947#endif 950#endif
948} 951}
949 952
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 953void
984rxvt_term::flush () 954rxvt_term::flush ()
985{ 955{
986 flush_ev.stop (); 956 flush_ev.stop ();
987 957
988#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
990 { 960 {
991// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 962 scr_touch (false);
993 } 963 }
994#endif 964#endif
995 965
996 if (want_refresh) 966 if (want_refresh)
… …
1032 } 1002 }
1033 while (row < end_row); 1003 while (row < end_row);
1034 } 1004 }
1035 1005
1036 scr_refresh (); 1006 scr_refresh ();
1037 scrollbar_show (1); 1007 scrollBar.show (1);
1038#ifdef USE_XIM 1008#if USE_XIM
1039 IMSendSpot (); 1009 im_send_spot ();
1040#endif 1010#endif
1041 } 1011 }
1042 1012
1043 display->flush (); 1013 display->flush ();
1044} 1014}
1045 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1046void 1017void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1018rxvt_term::refresh_check ()
1048{ 1019{
1049 make_current (); 1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1022
1051 display->flush (); 1023 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} 1024}
1056 1025
1057void 1026void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1028{
… …
1063 flush (); 1032 flush ();
1064} 1033}
1065 1034
1066#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1067void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1056{
1070 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1058 want_refresh = 1;
1059 refresh_check ();
1072} 1060}
1073#endif 1061#endif
1074 1062
1075#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1076void 1064void
… …
1078{ 1066{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1068 {
1081 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1082 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1083 } 1072 }
1084 else 1073 else
1085 w.stop (); 1074 w.stop ();
1086} 1075}
1087#endif 1076#endif
1088 1077
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1079void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1081{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1084 {
1095 want_refresh = 1; 1085 want_refresh = 1;
1086 refresh_check ();
1087 }
1096 else 1088 else
1097 w.stop (); 1089 w.stop ();
1098} 1090}
1099#endif 1091#endif
1100 1092
1101#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1102void 1094void
1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1104{ 1096{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1106 { 1098 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1100 want_refresh = 1;
1101 refresh_check ();
1109 } 1102 }
1110 else 1103 else
1111 w.stop (); 1104 w.stop ();
1112} 1105}
1113#endif 1106#endif
1114 1107
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1109void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1111{
1119 if (mouse_slip_wheel_speed == 0 1112 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 { 1113 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1114 want_refresh = 1;
1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1119 {
1128 else 1120 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1121 w.stop ();
1122 }
1130} 1123}
1131#endif 1124#endif
1132 1125
1133#if LINUX_YIELD_HACK 1126#if LINUX_YIELD_HACK
1134static struct event_handler 1127static struct event_handler
… …
1139 { 1132 {
1140 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1134 // 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 1135 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1144 1140
1145 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1147 1143
1148 w.stop (); 1144 w.stop ();
1149 } 1145 }
1150 1146
… …
1153 { 1149 {
1154 } 1150 }
1155} event_handler; 1151} event_handler;
1156#endif 1152#endif
1157 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1158bool 1187bool
1159rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1160{ 1189{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1162 1191
1163 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1193
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1166 n = 0;
1167 } 1195 {
1168 1196 // 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; 1197 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1172 1201
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1203
1175 if (r > 0) 1204 if (r > 0)
1176 { 1205 {
1177 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1178 return true; 1207 return true;
… …
1200{ 1229{
1201 make_current (); 1230 make_current ();
1202 1231
1203 if (revents & ev::READ) 1232 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1235 cmd_parse ();
1207 break;
1208 1236
1209 if (revents & ev::WRITE) 1237 if (revents & ev::WRITE)
1210 pty_write (); 1238 pty_write ();
1211}
1212 1239
1213void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1214rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1215{ 1245{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1247 recolor_cursor ();
1218 1248
1219#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1220 hidden_pointer = 0; 1250 hidden_pointer = 0;
1221 1251
1222 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1223 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1224#endif 1254#endif
1225} 1255}
1226 1256
1227#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1228void 1258void ecb_cold
1229rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1230{ 1260{
1231 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1232 return; 1262 return;
1233 1263
… …
1235 XFlush (dpy); 1265 XFlush (dpy);
1236 1266
1237 hidden_pointer = 1; 1267 hidden_pointer = 1;
1238} 1268}
1239 1269
1240void 1270void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1272{
1243 make_current (); 1273 make_current ();
1244 1274
1245 pointer_blank (); 1275 pointer_blank ();
… …
1251{ 1281{
1252 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1253 int x, y; 1283 int x, y;
1254 int code = 32; 1284 int code = 32;
1255 1285
1256 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1258 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1259 { 1290 {
1260 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1261 return; 1292 return;
1293
1262 mouse_row = x; 1294 mouse_row = x;
1263 mouse_col = y; 1295 mouse_col = y;
1264 code += 32; 1296 code += 32;
1265 } 1297 }
1266 1298
… …
1269 else 1301 else
1270 { 1302 {
1271 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1305 if (button_number >= 3)
1274 button_number += (64 - 3); 1306 button_number += 64 - 3;
1275 } 1307 }
1276 1308
1277 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1278 { 1310 {
1279 /* 1311 /*
… …
1311 fputc ('A', stderr); 1343 fputc ('A', stderr);
1312 if (key_state & 32) 1344 if (key_state & 32)
1313 fputc ('2', stderr); 1345 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1347 button_number,
1316 x + 1, 1348 x,
1317 y + 1); 1349 y);
1318#endif 1350#endif
1319 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1320 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1366 code + button_number + key_state,
1322 (32 + x + 1), 1367 32 + x,
1323 (32 + y + 1)); 1368 32 + y);
1324} 1369}
1325 1370
1326/*{{{ process an X event */ 1371/*{{{ process an X event */
1327void 1372void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1329{ 1374{
1330 make_current (); 1375 make_current ();
1331 1376
1332 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1476 focus_out ();
1432 break; 1477 break;
1433 1478
1434 case ConfigureNotify: 1479 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]) 1480 if (ev.xconfigure.window == parent)
1439 { 1481 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1442 1517
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1519 {
1445 seen_resize = 1; 1520 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1522 }
1448 else 1523 else
1449 { 1524 {
1450#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1526 if (moved)
1452 update_background (); 1527 update_background ();
1453#endif 1528#endif
1454 } 1529 }
1530
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1532 }
1457 break; 1533 break;
1458 1534
1459 case PropertyNotify: 1535 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 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; 1537 break;
1466 1538
1467 case SelectionClear: 1539 case SelectionClear:
1468 selection_clear (); 1540 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; 1541 break;
1475 1542
1476 case SelectionRequest: 1543 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1478 break; 1545 break;
1479 1546
1480 case MapNotify: 1547 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1481 mapped = 1; 1559 mapped = 1;
1482#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1561 text_blink_ev.start ();
1484#endif 1562#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1499 { 1577 {
1500 do 1578 do
1501 { 1579 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1582 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1584
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1586
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1588 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1591 }
1592
1514 want_refresh = 1; 1593 want_refresh = 1;
1515 } 1594 }
1516 else 1595 else
1517 { 1596 {
1518 XEvent unused_event; 1597 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1600 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1602 ;
1524 1603
1525 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1605 {
1527 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1528 scrollbar_show (0); 1607 scrollBar.show (0);
1529 } 1608 }
1530 } 1609 }
1531 break; 1610 break;
1532 1611
1533 case MotionNotify: 1612 case MotionNotify:
… …
1574 1653
1575#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1576 if (ev.xbutton.y < int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1577 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1578 { 1657 {
1658 page_dirn scroll_selection_dir;
1579 int dist; 1659 int dist;
1580 1660
1581 /* don't clobber the current delay if we are 1661 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1662 * already in the middle of scrolling.
1583 */ 1663 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1664 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1665 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1666
1587 /* save the event params so we can highlight 1667 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1668 * the selection in the pending-scroll loop
1589 */ 1669 */
… …
1598 dist = int_bwidth - ev.xbutton.y; 1678 dist = int_bwidth - ev.xbutton.y;
1599 } 1679 }
1600 else 1680 else
1601 { 1681 {
1602 scroll_selection_dir = DN; 1682 scroll_selection_dir = DN;
1603 dist = ev.xbutton.y - (int_bwidth + height); 1683 dist = ev.xbutton.y - (int_bwidth + vt_height);
1604 } 1684 }
1605 1685
1606 scroll_selection_lines = Pixel2Height (dist) 1686 scroll_selection_lines = Pixel2Height (dist)
1607 / SELECTION_SCROLL_LINE_SPEEDUP 1687 / SELECTION_SCROLL_LINE_SPEEDUP
1608 + 1; 1688 + 1;
1609 min_it (scroll_selection_lines, 1689 min_it (scroll_selection_lines,
1610 SELECTION_SCROLL_MAX_LINES); 1690 SELECTION_SCROLL_MAX_LINES);
1691 scroll_selection_lines *= scroll_selection_dir;
1611 } 1692 }
1612 else 1693 else
1613 { 1694 {
1614 /* we are within the text window, so we 1695 /* we are within the text window, so we
1615 * shouldn't be scrolling 1696 * shouldn't be scrolling
1616 */ 1697 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1698 sel_scroll_ev.stop();
1619 } 1699 }
1620#endif 1700#endif
1621#ifdef MOUSE_THRESHOLD 1701#ifdef MOUSE_THRESHOLD
1622 } 1702 }
1623#endif 1703#endif
1624 } 1704 }
1625 } 1705 }
1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1706 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1627 { 1707 {
1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1708 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1629 MotionNotify, &ev)) 1709 MotionNotify, &ev))
1630 ; 1710 ;
1631 1711
1632 XQueryPointer (dpy, scrollBar.win, 1712 XQueryPointer (dpy, scrollBar.win,
1633 &unused_root, &unused_child, 1713 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1636 &unused_mask); 1716 &unused_mask);
1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1638 scrollbar_size ()); 1718 scrollBar.size ());
1639 want_refresh = 1; 1719 want_refresh = 1;
1640 scrollbar_show (1); 1720 scrollBar.show (1);
1641 } 1721 }
1642 break; 1722 break;
1643 } 1723 }
1644 1724
1645#if defined(CURSOR_BLINK) 1725#if defined(CURSOR_BLINK)
1646 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1726 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 (); 1727 cursor_blink_reset ();
1655 }
1656#endif 1728#endif
1657 1729
1658#if defined(POINTER_BLANK) 1730#if defined(POINTER_BLANK)
1659 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1731 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1660 { 1732 {
… …
1666 1738
1667 if (ev.type == KeyPress && hidden_pointer == 0) 1739 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank (); 1740 pointer_blank ();
1669 } 1741 }
1670#endif 1742#endif
1671}
1672 1743
1673void 1744 refresh_check ();
1745}
1746
1747#if ENABLE_FRILLS
1748void ecb_cold
1749rxvt_term::set_urgency (bool enable)
1750{
1751 if (enable == urgency_hint)
1752 return;
1753
1754 if (XWMHints *h = XGetWMHints (dpy, parent))
1755 {
1756 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1757 XSetWMHints (dpy, parent, h);
1758 urgency_hint = enable;
1759 XFree (h);
1760 }
1761}
1762#endif
1763
1764void ecb_cold
1674rxvt_term::focus_in () 1765rxvt_term::focus_in ()
1675{ 1766{
1676 if (!focus) 1767 if (!focus)
1677 { 1768 {
1678 focus = 1; 1769 focus = 1;
1679 want_refresh = 1; 1770 want_refresh = 1;
1680 1771
1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1682
1683#if USE_XIM 1772#if USE_XIM
1684 if (Input_Context != NULL) 1773 if (Input_Context != NULL)
1685 { 1774 {
1686 IMSetPosition (); 1775 im_set_position ();
1687 XSetICFocus (Input_Context); 1776 XSetICFocus (Input_Context);
1688 } 1777 }
1689#endif 1778#endif
1690#if CURSOR_BLINK 1779#if CURSOR_BLINK
1691 if (option (Opt_cursorBlink)) 1780 if (option (Opt_cursorBlink))
… …
1693#endif 1782#endif
1694#if OFF_FOCUS_FADING 1783#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1784 if (rs[Rs_fade])
1696 { 1785 {
1697 pix_colors = pix_colors_focused; 1786 pix_colors = pix_colors_focused;
1698 scr_recolour (); 1787 scr_recolor ();
1699 } 1788 }
1700#endif 1789#endif
1701#if ENABLE_FRILLS 1790#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell)) 1791 if (option (Opt_urgentOnBell))
1703 { 1792 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 1793#endif
1711 }
1712}
1713 1794
1714void 1795 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1796 }
1797}
1798
1799void ecb_cold
1715rxvt_term::focus_out () 1800rxvt_term::focus_out ()
1716{ 1801{
1717 if (focus) 1802 if (focus)
1718 { 1803 {
1719 focus = 0; 1804 focus = 0;
1720 want_refresh = 1; 1805 want_refresh = 1;
1721 1806
1722 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1807#if ENABLE_FRILLS
1723 1808 if (option (Opt_urgentOnBell))
1809 set_urgency (0);
1810#endif
1724#if ENABLE_FRILLS || ISO_14755 1811#if ENABLE_FRILLS || ISO_14755
1725 if (iso14755buf) 1812 if (iso14755buf)
1726 { 1813 {
1727 iso14755buf = 0; 1814 iso14755buf = 0;
1728# if ISO_14755 1815# if ISO_14755
… …
1742#endif 1829#endif
1743#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1745 { 1832 {
1746 pix_colors = pix_colors_unfocused; 1833 pix_colors = pix_colors_unfocused;
1747 scr_recolour (); 1834 scr_recolor ();
1748 } 1835 }
1749#endif 1836#endif
1750 }
1751}
1752 1837
1753void 1838 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1839 }
1840}
1841
1842void ecb_cold
1754rxvt_term::update_fade_color (unsigned int idx) 1843rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1755{ 1844{
1756#if OFF_FOCUS_FADING 1845#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1846 if (rs[Rs_fade])
1758 { 1847 {
1848 if (!first_time)
1849 pix_colors_focused [idx].free (this);
1850
1759 rgba c; 1851 rgba c;
1760 pix_colors [Color_fade].get (c); 1852 pix_colors [Color_fade].get (c);
1761 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1853 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1762 } 1854 }
1763#endif 1855#endif
1764} 1856}
1765 1857
1766#if ENABLE_TRANSPARENCY || ENABLE_PERL 1858#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1767void 1859void ecb_hot
1768rxvt_term::rootwin_cb (XEvent &ev) 1860rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1861{
1770 make_current (); 1862 make_current ();
1771 1863
1772 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1864 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1773 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1865 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1774 return; 1866 return;
1775 1867
1776# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1868 switch (ev.type)
1778 { 1869 {
1779 case PropertyNotify: 1870 case PropertyNotify:
1780 /* 1871 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1872 * 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. 1873 * use the property to determine the pixmap. We use it later on.
1783 */ 1874 */
1784 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1875 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1876 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 { 1877 {
1787 bgPixmap.set_root_pixmap (); 1878#if BG_IMAGE_FROM_ROOT
1879 if (option (Opt_transparent))
1880 {
1881 rxvt_img::new_from_root (this)->replace (root_img);
1788 update_background (); 1882 update_background ();
1883 }
1884#endif
1885 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1789 } 1886 }
1887
1790 break; 1888 break;
1791 } 1889 }
1792# endif 1890
1891 refresh_check ();
1793} 1892}
1794#endif 1893#endif
1795 1894
1796void 1895void
1797rxvt_term::button_press (XButtonEvent &ev) 1896rxvt_term::button_press (XButtonEvent &ev)
… …
1818 iso14755_54 (ev.x, ev.y); 1917 iso14755_54 (ev.x, ev.y);
1819 return; 1918 return;
1820 } 1919 }
1821#endif 1920#endif
1822 1921
1823 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1922 clickintime = ev.time - MEvent.time < multiClickTime;
1824 1923
1825 if (reportmode) 1924 if (reportmode)
1826 { 1925 {
1827 /* mouse report from vt window */ 1926 /* mouse report from vt window */
1828 /* save the xbutton state (for ButtonRelease) */ 1927 /* save the xbutton state (for ButtonRelease) */
1829 MEvent.state = ev.state; 1928 MEvent.state = ev.state;
1830#ifdef MOUSE_REPORT_DOUBLECLICK 1929#ifdef MOUSE_REPORT_DOUBLECLICK
1831 if (ev.button == MEvent.button && clickintime) 1930 if (ev.button == MEvent.button && clickintime)
1832 { 1931 {
1833 /* same button, within alloted time */ 1932 /* same button, within allowed time */
1834 MEvent.clicks++; 1933 MEvent.clicks++;
1835 1934
1836 if (MEvent.clicks > 1) 1935 if (MEvent.clicks > 1)
1837 { 1936 {
1838 /* only report double clicks */ 1937 /* only report double clicks */
… …
1910 } 2009 }
1911 2010
1912 /* 2011 /*
1913 * Scrollbar window processing of button press 2012 * Scrollbar window processing of button press
1914 */ 2013 */
1915 if (isScrollbarWindow (ev.window)) 2014 if (scrollBar.state && ev.window == scrollBar.win)
1916 { 2015 {
1917 scrollBar.setIdle (); 2016 page_dirn direction = NO_DIR;
2017
2018 if (scrollBar.upButton (ev.y))
2019 direction = UP; /* up */
2020 else if (scrollBar.dnButton (ev.y))
2021 direction = DN; /* down */
2022
2023 scrollBar.state = SB_STATE_IDLE;
1918 /* 2024 /*
1919 * Rxvt-style scrollbar: 2025 * Rxvt-style scrollbar:
1920 * move up if mouse is above slider 2026 * move up if mouse is above slider
1921 * move dn if mouse is below slider 2027 * move dn if mouse is below slider
1922 * 2028 *
… …
1931 /* 2037 /*
1932 * Mouse report disabled scrollbar: 2038 * Mouse report disabled scrollbar:
1933 * arrow buttons - send up/down 2039 * arrow buttons - send up/down
1934 * click on scrollbar - send pageup/down 2040 * click on scrollbar - send pageup/down
1935 */ 2041 */
1936 if ((scrollBar.style == R_SB_NEXT 2042 if (direction == UP)
1937 && scrollbarnext_upButton (ev.y))
1938 || (scrollBar.style == R_SB_RXVT
1939 && scrollbarrxvt_upButton (ev.y)))
1940 tt_printf ("\033[A"); 2043 tt_printf ("\033[A");
1941 else if ((scrollBar.style == R_SB_NEXT 2044 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"); 2045 tt_printf ("\033[B");
1946 else 2046 else
1947 switch (ev.button) 2047 switch (ev.button)
1948 { 2048 {
1949 case Button2: 2049 case Button2:
… …
1957 break; 2057 break;
1958 } 2058 }
1959 } 2059 }
1960 else 2060 else
1961#endif /* NO_SCROLLBAR_REPORT */ 2061#endif /* NO_SCROLLBAR_REPORT */
1962
1963 {
1964 char upordown = 0;
1965
1966 if (scrollBar.style == R_SB_NEXT)
1967 { 2062 {
1968 if (scrollbarnext_upButton (ev.y)) 2063 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 { 2064 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2065#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2066 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2067 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 2068#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 2069 if (scr_page (direction, 1))
1986 { 2070 {
1987 if (upordown < 0) 2071 if (direction == UP)
1988 scrollBar.setUp (); 2072 scrollBar.state = SB_STATE_UP;
1989 else 2073 else
1990 scrollBar.setDn (); 2074 scrollBar.state = SB_STATE_DOWN;
1991 } 2075 }
1992 } 2076 }
1993 else 2077 else
1994 switch (ev.button) 2078 switch (ev.button)
1995 { 2079 {
1996 case Button2: 2080 case Button2:
1997 switch (scrollbar_align) 2081 switch (scrollBar.align)
1998 { 2082 {
1999 case R_SB_ALIGN_TOP: 2083 case SB_ALIGN_TOP:
2000 csrO = 0; 2084 csrO = 0;
2001 break; 2085 break;
2002 case R_SB_ALIGN_CENTRE: 2086 case SB_ALIGN_CENTRE:
2003 csrO = (scrollBar.bot - scrollBar.top) / 2; 2087 csrO = (scrollBar.bot - scrollBar.top) / 2;
2004 break; 2088 break;
2005 case R_SB_ALIGN_BOTTOM: 2089 case SB_ALIGN_BOTTOM:
2006 csrO = scrollBar.bot - scrollBar.top; 2090 csrO = scrollBar.bot - scrollBar.top;
2007 break; 2091 break;
2008 } 2092 }
2009 2093
2010 if (scrollBar.style == R_SB_XTERM 2094 if (scrollBar.style == SB_STYLE_XTERM
2011 || scrollbar_above_slider (ev.y) 2095 || scrollBar.above_slider (ev.y)
2012 || scrollbar_below_slider (ev.y)) 2096 || scrollBar.below_slider (ev.y))
2013 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2097 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2014 2098
2015 scrollBar.setMotion (); 2099 scrollBar.state = SB_STATE_MOTION;
2016 break; 2100 break;
2017 2101
2018 case Button1: 2102 case Button1:
2019 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2103 if (scrollBar.align == SB_ALIGN_CENTRE)
2020 csrO = ev.y - scrollBar.top; 2104 csrO = ev.y - scrollBar.top;
2021 /* FALLTHROUGH */ 2105 /* FALLTHROUGH */
2022 2106
2023 case Button3: 2107 case Button3:
2024 if (scrollBar.style != R_SB_XTERM) 2108 if (scrollBar.style != SB_STYLE_XTERM)
2025 { 2109 {
2026 if (scrollbar_above_slider (ev.y)) 2110 if (scrollBar.above_slider (ev.y))
2027# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2028 scr_page (UP, nrow - 1); 2112 scr_page (UP, nrow - 1);
2029# else 2113# else
2030 scr_page (UP, nrow / 4); 2114 scr_page (UP, nrow / 4);
2031# endif 2115# endif
2032 else if (scrollbar_below_slider (ev.y)) 2116 else if (scrollBar.below_slider (ev.y))
2033# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
2034 scr_page (DN, nrow - 1); 2118 scr_page (DN, nrow - 1);
2035# else 2119# else
2036 scr_page (DN, nrow / 4); 2120 scr_page (DN, nrow / 4);
2037# endif 2121# endif
2038 else 2122 else
2039 scrollBar.setMotion (); 2123 scrollBar.state = SB_STATE_MOTION;
2040 } 2124 }
2041 else 2125 else
2042 { 2126 {
2043 scr_page ((ev.button == Button1 ? DN : UP), 2127 scr_page ((ev.button == Button1 ? DN : UP),
2044 (nrow 2128 (nrow
2045 * scrollbar_position (ev.y) 2129 * scrollBar.position (ev.y)
2046 / scrollbar_size ())); 2130 / scrollBar.size ()));
2047 } 2131 }
2048 2132
2049 break; 2133 break;
2050 } 2134 }
2051 } 2135 }
… …
2061 2145
2062 csrO = 0; /* reset csr Offset */ 2146 csrO = 0; /* reset csr Offset */
2063 if (!bypass_keystate) 2147 if (!bypass_keystate)
2064 reportmode = !! (priv_modes & PrivMode_mouse_report); 2148 reportmode = !! (priv_modes & PrivMode_mouse_report);
2065 2149
2066 if (scrollbar_isUpDn ()) 2150 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2067 { 2151 {
2068 scrollBar.setIdle (); 2152 scrollBar.state = SB_STATE_IDLE;
2069 scrollbar_show (0); 2153 scrollBar.show (0);
2070 } 2154 }
2071 2155
2072#ifdef SELECTION_SCROLLING 2156#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2157 sel_scroll_ev.stop();
2075#endif 2158#endif
2076 2159
2077 if (ev.window == vt) 2160 if (ev.window == vt)
2078 { 2161 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2162 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2094#ifdef MOUSE_REPORT_DOUBLECLICK 2177#ifdef MOUSE_REPORT_DOUBLECLICK
2095 /* only report the release of 'slow' single clicks */ 2178 /* only report the release of 'slow' single clicks */
2096 if (MEvent.button != AnyButton 2179 if (MEvent.button != AnyButton
2097 && (ev.button != MEvent.button 2180 && (ev.button != MEvent.button
2098 || (ev.time - MEvent.time 2181 || (ev.time - MEvent.time
2099 > MULTICLICK_TIME / 2))) 2182 > multiClickTime / 2)))
2100 { 2183 {
2101 MEvent.clicks = 0; 2184 MEvent.clicks = 0;
2102 MEvent.button = AnyButton; 2185 MEvent.button = AnyButton;
2103 mouse_report (ev); 2186 mouse_report (ev);
2104 } 2187 }
… …
2124 case Button3: 2207 case Button3:
2125 selection_make (ev.time); 2208 selection_make (ev.time);
2126 break; 2209 break;
2127 2210
2128 case Button2: 2211 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2212 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); 2213 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2214 break;
2132 2215
2133#ifdef MOUSE_WHEEL 2216#ifdef MOUSE_WHEEL
2134 case Button4: 2217 case Button4:
2135 case Button5: 2218 case Button5:
2136 { 2219 {
2137 int i; 2220 int lines;
2138 page_dirn v; 2221 page_dirn dirn;
2139 2222
2140 v = ev.button == Button4 ? UP : DN; 2223 dirn = ev.button == Button4 ? UP : DN;
2141 2224
2142 if (ev.state & ShiftMask) 2225 if (ev.state & ShiftMask)
2143 i = 1; 2226 lines = 1;
2144 else if (option (Opt_mouseWheelScrollPage)) 2227 else if (option (Opt_mouseWheelScrollPage))
2145 i = nrow - 1; 2228 lines = nrow - 1;
2146 else 2229 else
2147 i = 5; 2230 lines = 5;
2148 2231
2149# ifdef MOUSE_SLIP_WHEELING 2232# ifdef MOUSE_SLIP_WHEELING
2150 if (ev.state & ControlMask) 2233 if (ev.state & ControlMask)
2151 { 2234 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2235 mouse_slip_wheel_speed += dirn;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2236 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2237
2238 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2239 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2240 }
2158 else 2241 else
2242# endif
2159 { 2243 {
2160# endif
2161 scr_page (v, i); 2244 scr_page (dirn, lines);
2162 scrollbar_show (1); 2245 scrollBar.show (1);
2163# ifdef MOUSE_SLIP_WHEELING
2164 } 2246 }
2165# endif
2166 } 2247 }
2167 break; 2248 break;
2168#endif 2249#endif
2169 } 2250 }
2170 } 2251 }
2171} 2252}
2172 2253
2173/*}}} */ 2254/*}}} */
2174 2255
2175bool 2256void ecb_hot
2176rxvt_term::cmd_parse () 2257rxvt_term::cmd_parse ()
2177{ 2258{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2259 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2260 char *seq_begin; // remember start of esc-sequence here
2181 2261
2182 for (;;) 2262 for (;;)
2183 { 2263 {
2184 if (ch == NOCHAR) 2264 if (ecb_unlikely (ch == NOCHAR))
2185 { 2265 {
2186 seq_begin = cmdbuf_ptr; 2266 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2267 ch = next_char ();
2188 2268
2189 if (ch == NOCHAR) 2269 if (ch == NOCHAR)
2190 break; 2270 break;
2191 } 2271 }
2192 2272
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2273 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2274 {
2195 if (!seen_input) 2275 if (ecb_unlikely (!seen_input))
2196 { 2276 {
2197 seen_input = 1; 2277 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2278 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2279 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2280 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2293 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2294 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2295
2216 for (;;) 2296 for (;;)
2217 { 2297 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2298 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2299 break;
2220 2300
2221 *str++ = ch; 2301 *str++ = ch;
2222 2302
2223 if (ch == C0_LF || str >= eol) 2303 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2304 {
2225 if (ch == C0_LF) 2305 if (ch == C0_LF)
2226 nlines++; 2306 nlines++;
2227 2307
2228 refresh_count++; 2308 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2357 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2358 * if skipScroll is enabled.
2279 */ 2359 */
2280 if (refreshnow) 2360 if (refreshnow)
2281 { 2361 {
2282 flag = true;
2283 scr_refresh (); 2362 scr_refresh ();
2284 want_refresh = 1; 2363 want_refresh = 1;
2285 } 2364 }
2286
2287 } 2365 }
2288 else 2366 else
2289 { 2367 {
2290 try 2368 try
2291 { 2369 {
… …
2299 } 2377 }
2300 2378
2301 ch = NOCHAR; 2379 ch = NOCHAR;
2302 } 2380 }
2303 } 2381 }
2304
2305 return flag;
2306} 2382}
2307 2383
2308// read the next character 2384// read the next character
2309wchar_t 2385wchar_t ecb_hot
2310rxvt_term::next_char () NOTHROW 2386rxvt_term::next_char () NOTHROW
2311{ 2387{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2388 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2389 {
2314 // assume 7-bit to be ascii ALWAYS 2390 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2391 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2392 return *cmdbuf_ptr++;
2317 2393
2318 wchar_t wc; 2394 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2395 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2396
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2400 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2401 break;
2326 } 2402 }
2327 2403
2328 if (len == (size_t)-1) 2404 if (len == (size_t)-1)
2405 {
2406 mbstate.reset (); // reset now undefined conversion state
2407 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2408 // 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 2409 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2410 }
2330 2411
2331 // assume wchar == unicode 2412 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2413 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2414 return wc & UNICODE_MASK;
2334 } 2415 }
2335 2416
2336 return NOCHAR; 2417 return NOCHAR;
2337} 2418}
2338 2419
2339// read the next octet 2420// read the next octet
2340uint32_t 2421uint32_t ecb_hot
2341rxvt_term::next_octet () NOTHROW 2422rxvt_term::next_octet () NOTHROW
2342{ 2423{
2343 return cmdbuf_ptr < cmdbuf_endp 2424 return cmdbuf_ptr < cmdbuf_endp
2344 ? (unsigned char)*cmdbuf_ptr++ 2425 ? (unsigned char)*cmdbuf_ptr++
2345 : NOCHAR; 2426 : NOCHAR;
2346} 2427}
2347 2428
2348static class out_of_input out_of_input; 2429static class out_of_input out_of_input;
2349 2430
2350/* rxvt_cmd_getc () - Return next input character */ 2431wchar_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)) 2432rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2433{
2358 wchar_t c = next_char (); 2434 wchar_t c = next_char ();
2359 2435
2360 if (c == NOCHAR) 2436 if (c == NOCHAR)
2361 throw out_of_input; 2437 throw out_of_input;
2362 2438
2363 return c; 2439 return c;
2364} 2440}
2365 2441
2366uint32_t 2442uint32_t ecb_hot
2367rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2443rxvt_term::cmd_get8 () THROW ((class out_of_input))
2368{ 2444{
2369 uint32_t c = next_octet (); 2445 uint32_t c = next_octet ();
2370 2446
2371 if (c == NOCHAR) 2447 if (c == NOCHAR)
… …
2375} 2451}
2376 2452
2377/*{{{ print pipe */ 2453/*{{{ print pipe */
2378/*----------------------------------------------------------------------*/ 2454/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2455#ifdef PRINTPIPE
2380FILE * 2456FILE * ecb_cold
2381rxvt_term::popen_printer () 2457rxvt_term::popen_printer ()
2382{ 2458{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2459 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2460
2385 if (stream == NULL) 2461 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2462 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2463
2388 return stream; 2464 return stream;
2389} 2465}
2390 2466
2391int 2467int ecb_cold
2392rxvt_term::pclose_printer (FILE *stream) 2468rxvt_term::pclose_printer (FILE *stream)
2393{ 2469{
2394 fflush (stream); 2470 fflush (stream);
2395 return pclose (stream); 2471 return pclose (stream);
2396} 2472}
2397 2473
2398/* 2474/*
2399 * simulate attached vt100 printer 2475 * simulate attached vt100 printer
2400 */ 2476 */
2401void 2477void ecb_cold
2402rxvt_term::process_print_pipe () 2478rxvt_term::process_print_pipe ()
2403{ 2479{
2404 int done; 2480 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2481
2407 if ((fd = popen_printer ()) == NULL) 2482 if (!fd)
2408 return; 2483 return;
2409 2484
2410 /* 2485 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2486 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2487 * is received.
2413 */ 2488 */
2414 for (done = 0; !done;) 2489 for (int done = 0; !done; )
2415 { 2490 {
2416 unsigned char buf[8]; 2491 unsigned char buf[8];
2417 unicode_t ch; 2492 unicode_t ch;
2418 unsigned int i, len; 2493 unsigned int i, len;
2419 2494
… …
2453 pclose_printer (fd); 2528 pclose_printer (fd);
2454} 2529}
2455#endif /* PRINTPIPE */ 2530#endif /* PRINTPIPE */
2456/*}}} */ 2531/*}}} */
2457 2532
2458/* *INDENT-OFF* */
2459enum { 2533enum {
2460 C1_40 = 0x40, 2534 C1_40 = 0x40,
2461 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2535 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, 2536 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, 2537 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, 2538 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2465}; 2539};
2466/* *INDENT-ON* */
2467 2540
2468/*{{{ process non-printing single characters */ 2541/*{{{ process non-printing single characters */
2469void 2542void ecb_hot
2470rxvt_term::process_nonprinting (unicode_t ch) 2543rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2544{
2472 switch (ch) 2545 switch (ch)
2473 { 2546 {
2474 case C0_ESC: 2547 case C0_ESC:
… …
2504 scr_charset_choose (0); 2577 scr_charset_choose (0);
2505 break; 2578 break;
2506 2579
2507#ifdef EIGHT_BIT_CONTROLS 2580#ifdef EIGHT_BIT_CONTROLS
2508 // 8-bit controls 2581 // 8-bit controls
2509 case 0x90: /* DCS */ 2582 case 0x90: /* DCS */
2510 process_dcs_seq (); 2583 process_dcs_seq ();
2511 break; 2584 break;
2512 case 0x9b: /* CSI */ 2585 case 0x9b: /* CSI */
2513 process_csi_seq (); 2586 process_csi_seq ();
2514 break; 2587 break;
2515 case 0x9d: /* OSC */ 2588 case 0x9d: /* OSC */
2516 process_osc_seq (); 2589 process_osc_seq ();
2517 break; 2590 break;
2518#endif 2591#endif
2519 } 2592 }
2520} 2593}
2521/*}}} */ 2594/*}}} */
2522 2595
2523 2596
2524/*{{{ process VT52 escape sequences */ 2597/*{{{ process VT52 escape sequences */
2525void 2598void ecb_cold
2526rxvt_term::process_escape_vt52 (unicode_t ch) 2599rxvt_term::process_escape_vt52 (unicode_t ch)
2527{ 2600{
2528 int row, col; 2601 int row, col;
2529 2602
2530 switch (ch) 2603 switch (ch)
… …
2564 break; 2637 break;
2565 case 'Z': /* identify the terminal type */ 2638 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2639 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2640 break;
2568 case '<': /* turn off VT52 mode */ 2641 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2642 priv_modes &= ~PrivMode_vt52;
2570 break; 2643 break;
2571 case 'F': /* use special graphics character set */ 2644 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2645 case 'G': /* use regular character set */
2573 /* unimplemented */ 2646 /* unimplemented */
2574 break; 2647 break;
… …
2580} 2653}
2581/*}}} */ 2654/*}}} */
2582 2655
2583 2656
2584/*{{{ process escape sequences */ 2657/*{{{ process escape sequences */
2585void 2658void ecb_hot
2586rxvt_term::process_escape_seq () 2659rxvt_term::process_escape_seq ()
2587{ 2660{
2588 unicode_t ch = cmd_getc (); 2661 unicode_t ch = cmd_getc ();
2589 2662
2590 if (priv_modes & PrivMode_vt52) 2663 if (priv_modes & PrivMode_vt52)
… …
2593 return; 2666 return;
2594 } 2667 }
2595 2668
2596 switch (ch) 2669 switch (ch)
2597 { 2670 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2671 case '#':
2600 if (cmd_getc () == '8') 2672 if (cmd_getc () == '8')
2601 scr_E (); 2673 scr_E ();
2602 break; 2674 break;
2603 case '(': 2675 case '(':
… …
2626#if !ENABLE_MINIMAL 2698#if !ENABLE_MINIMAL
2627 case '9': 2699 case '9':
2628 scr_forwardindex (); 2700 scr_forwardindex ();
2629 break; 2701 break;
2630#endif 2702#endif
2703 // DECPAM/DECPNM
2631 case '=': 2704 case '=':
2705 priv_modes |= PrivMode_aplKP;
2706 break;
2632 case '>': 2707 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2708 priv_modes &= ~PrivMode_aplKP;
2634 break; 2709 break;
2635 2710
2636 case C1_40: 2711 case C1_40:
2637 cmd_getc (); 2712 cmd_getc ();
2638 break; 2713 break;
… …
2642 2717
2643 /* 8.3.87: NEXT LINE */ 2718 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2719 case C1_NEL: /* ESC E */
2645 { 2720 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2721 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2722 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2723 }
2649 break; 2724 break;
2650 2725
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2726 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2727 case C1_ESA: /* ESC G */
2653 process_graphics (); 2728 // used by original rxvt for rob nations own graphics mode
2729 if (cmd_getc () == 'Q')
2730 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2654 break; 2731 break;
2655 2732
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2733 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2734 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2735 scr_set_tab (1);
… …
2662 case C1_RI: /* ESC M */ 2739 case C1_RI: /* ESC M */
2663 scr_index (DN); 2740 scr_index (DN);
2664 break; 2741 break;
2665 2742
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2743 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2744 /* case C1_SS2: break; */
2668 2745
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2746 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2747 /* case C1_SS3: break; */
2671 2748
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2749 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2750 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2751 process_dcs_seq ();
2675 break; 2752 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2754 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2755 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2756 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2757 break; /* steal obsolete ESC [ c */
2681 2758
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2759 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2760 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2761 process_csi_seq ();
2685 break; 2762 break;
2686 2763
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2764 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2765 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2766 process_osc_seq ();
2690 break; 2767 break;
2691 2768
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2769 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2770 case 'c':
2694 mbstate.reset (); 2771 mbstate.reset ();
2695 scr_poweron (); 2772 scr_poweron ();
2696 scrollbar_show (1); 2773 scrollBar.show (1);
2697 break; 2774 break;
2698 2775
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2776 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2777 case 'n':
2701 scr_charset_choose (2); 2778 scr_charset_choose (2);
… …
2708 } 2785 }
2709} 2786}
2710/*}}} */ 2787/*}}} */
2711 2788
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2789/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2790enum {
2715 CSI_ICH = 0x40, 2791 CSI_ICH = 0x40,
2716 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2792 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 , 2793 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, 2794 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, 2797 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 , 2798 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 2799 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2800};
2725 2801
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2802#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2803 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2804 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2805#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2806 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2807
2732const unsigned char csi_defaults[] = 2808static const unsigned char csi_defaults[] =
2733 { 2809 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2810 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, */ 2811 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, */ 2812 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, [, \, ], ^, _, */ 2813 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, */ 2814 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, */ 2815 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, */ 2816 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, {, |, }, ~, */ 2817 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2742 }; 2818 };
2743/* *INDENT-ON* */
2744 2819
2745void 2820void ecb_hot
2746rxvt_term::process_csi_seq () 2821rxvt_term::process_csi_seq ()
2747{ 2822{
2748 unicode_t ch, priv, i; 2823 unicode_t ch, priv, prev_ch, i;
2749 unsigned int nargs, p; 2824 unsigned int nargs, p;
2750 int n, ndef; 2825 int n, ndef;
2751 int arg[ESC_ARGS] = { }; 2826 int arg[ESC_ARGS] = { };
2752 2827
2753 nargs = 0; 2828 nargs = 0;
2754 2829
2755 priv = 0; 2830 priv = 0;
2756 ch = cmd_getc (); 2831 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2832 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2833 {
2759 /* '<' '=' '>' '?' */ 2834 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2835 priv = ch;
2761 ch = cmd_getc (); 2836 ch = cmd_getc ();
2762 } 2837 }
2763 2838
2839 prev_ch = 0;
2764 /* read any numerical arguments */ 2840 /* read any numerical arguments */
2765 for (n = -1; ch < CSI_ICH; ) 2841 for (n = -1; ch < CSI_ICH; )
2766 { 2842 {
2767 if (isdigit (ch)) 2843 if (isdigit (ch))
2768 { 2844 {
… …
2778 n = -1; 2854 n = -1;
2779 } 2855 }
2780 else if (IS_CONTROL (ch)) 2856 else if (IS_CONTROL (ch))
2781 process_nonprinting (ch); 2857 process_nonprinting (ch);
2782 2858
2859 prev_ch = ch;
2783 ch = cmd_getc (); 2860 ch = cmd_getc ();
2784 } 2861 }
2785 2862
2786 if (ch > CSI_7F) 2863 if (ch > CSI_7F)
2787 return; 2864 return;
… …
2813 // versions. 2890 // versions.
2814 // 2891 //
2815 tt_printf ("\033[>%d;95;0c", 'U'); 2892 tt_printf ("\033[>%d;95;0c", 'U');
2816 } 2893 }
2817 break; 2894 break;
2895
2818 case '?': 2896 case '?':
2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2897 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2820 process_terminal_mode (ch, priv, nargs, arg); 2898 process_terminal_mode (ch, priv, nargs, arg);
2821 break; 2899 break;
2900
2901 case '!':
2902 if (ch == CSI_70)
2903 {
2904 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2905 scr_soft_reset ();
2906
2907 static const int pm_h[] = { 7, 25 };
2908 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2909
2910 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2911 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2822 } 2912 }
2913 break;
2914 }
2915
2823 return; 2916 return;
2824 } 2917 }
2825 2918
2826 switch (ch) 2919 switch (ch)
2827 { 2920 {
… …
2841 } 2934 }
2842 break; 2935 break;
2843#endif 2936#endif
2844 2937
2845 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2938 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2846 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2939 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2847 arg[0] = -arg[0]; 2940 arg[0] = -arg[0];
2848 /* FALLTHROUGH */ 2941 /* FALLTHROUGH */
2849 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2942 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2850 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2943 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2851 scr_gotorc (arg[0], 0, RELATIVE); 2944 scr_gotorc (arg[0], 0, RELATIVE);
2852 break; 2945 break;
2853 2946
2854 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2947 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2855 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2948 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3005 scr_insert_mode (1); 3098 scr_insert_mode (1);
3006 else if (arg[0] == 20) 3099 else if (arg[0] == 20)
3007 priv_modes |= PrivMode_LFNL; 3100 priv_modes |= PrivMode_LFNL;
3008 break; 3101 break;
3009 3102
3103 case CSI_71: // DECSCUSR: set cursor style
3104 if (prev_ch == ' ')
3105 set_cursor_style (arg[0]);
3106 break;
3107
3010 /* 3108 /*
3011 * PRIVATE USE beyond this point. All CSI_7? sequences here 3109 * PRIVATE USE beyond this point. All CSI_7? sequences here
3012 */ 3110 */
3013 case CSI_72: /* DECSTBM: set top and bottom margins */ 3111 case CSI_72: /* DECSTBM: set top and bottom margins */
3014 if (nargs == 1) 3112 if (nargs == 1)
… …
3042 } 3140 }
3043} 3141}
3044/*}}} */ 3142/*}}} */
3045 3143
3046#if !ENABLE_MINIMAL 3144#if !ENABLE_MINIMAL
3047/* ARGSUSED */
3048void 3145void
3049rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3146rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3050{ 3147{
3051 int x, y; 3148 int x, y;
3052 XWindowAttributes wattr; 3149 XWindowAttributes wattr;
… …
3061 { 3158 {
3062 /* 3159 /*
3063 * commands 3160 * commands
3064 */ 3161 */
3065 case 1: /* deiconify window */ 3162 case 1: /* deiconify window */
3066 XMapWindow (dpy, parent[0]); 3163 XMapWindow (dpy, parent);
3067 break; 3164 break;
3068 case 2: /* iconify window */ 3165 case 2: /* iconify window */
3069 XIconifyWindow (dpy, parent[0], display->screen); 3166 XIconifyWindow (dpy, parent, display->screen);
3070 break; 3167 break;
3071 case 3: /* set position (pixels) */ 3168 case 3: /* set position (pixels) */
3072 XMoveWindow (dpy, parent[0], args[1], args[2]); 3169 XMoveWindow (dpy, parent, args[1], args[2]);
3073 break; 3170 break;
3074 case 4: /* set size (pixels) */ 3171 case 4: /* set size (pixels) */
3075 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3172 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3076 break; 3173 break;
3077 case 5: /* raise window */ 3174 case 5: /* raise window */
3078 XRaiseWindow (dpy, parent[0]); 3175 XRaiseWindow (dpy, parent);
3079 break; 3176 break;
3080 case 6: /* lower window */ 3177 case 6: /* lower window */
3081 XLowerWindow (dpy, parent[0]); 3178 XLowerWindow (dpy, parent);
3082 break; 3179 break;
3083 case 7: /* refresh window */ 3180 case 7: /* refresh window */
3084 scr_touch (true); 3181 scr_touch (true);
3085 break; 3182 break;
3086 case 8: /* set size (chars) */ 3183 case 8: /* set size (chars) */
… …
3089 break; 3186 break;
3090 3187
3091 //case 9: NYI, TODO, restore maximized window or maximize window 3188 //case 9: NYI, TODO, restore maximized window or maximize window
3092 default: 3189 default:
3093 if (args[0] >= 24) /* set height (chars) */ 3190 if (args[0] >= 24) /* set height (chars) */
3094 set_widthheight ((unsigned int)width, 3191 set_widthheight ((unsigned int)vt_width,
3095 (unsigned int) (args[1] * fheight)); 3192 (unsigned int) (args[1] * fheight));
3096 break; 3193 break;
3097 3194
3098 /* 3195 /*
3099 * reports - some output format copied from XTerm 3196 * reports - some output format copied from XTerm
3100 */ 3197 */
3101 case 11: /* report window state */ 3198 case 11: /* report window state */
3102 XGetWindowAttributes (dpy, parent[0], &wattr); 3199 XGetWindowAttributes (dpy, parent, &wattr);
3103 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3200 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3104 break; 3201 break;
3105 case 13: /* report window position */ 3202 case 13: /* report window position */
3106 XGetWindowAttributes (dpy, parent[0], &wattr); 3203 XGetWindowAttributes (dpy, parent, &wattr);
3107 XTranslateCoordinates (dpy, parent[0], wattr.root, 3204 XTranslateCoordinates (dpy, parent, wattr.root,
3108 -wattr.border_width, -wattr.border_width, 3205 -wattr.border_width, -wattr.border_width,
3109 &x, &y, &wdummy); 3206 &x, &y, &wdummy);
3110 tt_printf ("\033[3;%d;%dt", x, y); 3207 tt_printf ("\033[3;%d;%dt", x, y);
3111 break; 3208 break;
3112 case 14: /* report window size (pixels) */ 3209 case 14: /* report window size (pixels) */
3113 XGetWindowAttributes (dpy, parent[0], &wattr); 3210 XGetWindowAttributes (dpy, parent, &wattr);
3114 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3211 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3115 break; 3212 break;
3116 case 18: /* report text area size (chars) */ 3213 case 18: /* report text area size (chars) */
3117 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3214 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3118 break; 3215 break;
… …
3120 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3121 break; 3218 break;
3122 case 20: /* report icon label */ 3219 case 20: /* report icon label */
3123 { 3220 {
3124 char *s; 3221 char *s;
3125 XGetIconName (dpy, parent[0], &s); 3222 XGetIconName (dpy, parent, &s);
3126 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3127 XFree (s); 3224 XFree (s);
3128 } 3225 }
3129 break; 3226 break;
3130 case 21: /* report window title */ 3227 case 21: /* report window title */
3131 { 3228 {
3132 char *s; 3229 char *s;
3133 XFetchName (dpy, parent[0], &s); 3230 XFetchName (dpy, parent, &s);
3134 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3231 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3135 XFree (s); 3232 XFree (s);
3136 } 3233 }
3137 break; 3234 break;
3138 } 3235 }
… …
3148rxvt_term::get_to_st (unicode_t &ends_how) 3245rxvt_term::get_to_st (unicode_t &ends_how)
3149{ 3246{
3150 unicode_t ch; 3247 unicode_t ch;
3151 bool seen_esc = false; 3248 bool seen_esc = false;
3152 unsigned int n = 0; 3249 unsigned int n = 0;
3153 wchar_t string[STRING_MAX]; 3250 wchar_t string[CBUFSIZ];
3154 3251
3155 while ((ch = cmd_getc ()) != NOCHAR) 3252 while ((ch = cmd_getc ()) != NOCHAR)
3156 { 3253 {
3157 if (seen_esc) 3254 if (seen_esc)
3158 { 3255 {
… …
3173 else if (ch < 0x20) 3270 else if (ch < 0x20)
3174 return NULL; /* other control character - exit */ 3271 return NULL; /* other control character - exit */
3175 3272
3176 seen_esc = false; 3273 seen_esc = false;
3177 3274
3178 if (n >= STRING_MAX - 1) 3275 if (n >= sizeof (string) - 1)
3179 // stop at some sane length 3276 // stop at some sane length
3180 return NULL; 3277 return NULL;
3181 3278
3182 string[n++] = ch; 3279 string[n++] = ch;
3183 } 3280 }
… …
3194 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3291 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3195 */ 3292 */
3196void 3293void
3197rxvt_term::process_dcs_seq () 3294rxvt_term::process_dcs_seq ()
3198{ 3295{
3199 char *s;
3200 unicode_t eh;
3201
3202 /* 3296 /*
3203 * Not handled yet 3297 * Not handled yet
3204 */ 3298 */
3299
3300 unicode_t eh;
3205 s = get_to_st (eh); 3301 char *s = get_to_st (eh);
3206 if (s) 3302 if (s)
3207 free (s); 3303 free (s);
3208 3304
3209 return; 3305 return;
3210} 3306}
… …
3214 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3310 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3215 */ 3311 */
3216void 3312void
3217rxvt_term::process_osc_seq () 3313rxvt_term::process_osc_seq ()
3218{ 3314{
3219 unicode_t ch, eh;
3220 int arg; 3315 int arg;
3221 3316
3222 ch = cmd_getc (); 3317 unicode_t ch = cmd_getc ();
3223 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3318 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3224 arg = arg * 10 + (ch - '0'); 3319 arg = arg * 10 + (ch - '0');
3225 3320
3226 if (ch == ';') 3321 if (ch == ';')
3227 { 3322 {
3323 unicode_t eh;
3228 char *s = get_to_st (eh); 3324 char *s = get_to_st (eh);
3229 3325
3230 if (s) 3326 if (s)
3231 { 3327 {
3232 process_xterm_seq (arg, s, eh); 3328 process_xterm_seq (arg, s, eh);
… …
3256 3352
3257/* 3353/*
3258 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3354 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3259 */ 3355 */
3260void 3356void
3261rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3357rxvt_term::process_xterm_seq (int op, char *str, char resp)
3262{ 3358{
3263 int color; 3359 int color;
3264 char *buf, *name; 3360 char *buf, *name;
3265 bool query = str[0] == '?' && !str[1]; 3361 bool query = str[0] == '?' && !str[1];
3266 int saveop = op; 3362 int saveop = op;
… …
3293 unsigned long bytes_after; 3389 unsigned long bytes_after;
3294 unsigned char *value = 0; 3390 unsigned char *value = 0;
3295 const char *str = ""; 3391 const char *str = "";
3296 3392
3297 if (prop 3393 if (prop
3298 && XGetWindowProperty (dpy, parent[0], 3394 && XGetWindowProperty (dpy, parent,
3299 prop, 0, 1<<16, 0, AnyPropertyType, 3395 prop, 0, 1<<16, 0, AnyPropertyType,
3300 &actual_type, &actual_format, 3396 &actual_type, &actual_format,
3301 &nitems, &bytes_after, &value) == Success 3397 &nitems, &bytes_after, &value) == Success
3302 && actual_type != None 3398 && actual_type != None
3303 && actual_format == 8) 3399 && actual_format == 8)
3304 str = (const char *)(value); 3400 str = (const char *)(value);
3305 3401
3306 tt_printf ("\033]%d;%s%c", op, str, resp); 3402 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3307 3403
3308 XFree (value); 3404 XFree (value);
3309 } 3405 }
3310 else 3406 else
3311 { 3407 {
3312 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3408 char *eq = strchr (str, '=');
3313 3409
3314 if (eq) 3410 if (eq)
3315 { 3411 {
3316 *eq = 0; 3412 *eq = 0;
3317 set_utf8_property (display->atom (str), eq + 1); 3413 set_utf8_property (display->atom (str), eq + 1);
3318 } 3414 }
3319 else 3415 else
3320 XDeleteProperty (dpy, parent[0], 3416 XDeleteProperty (dpy, parent,
3321 display->atom (str)); 3417 display->atom (str));
3322 } 3418 }
3323 break; 3419 break;
3324 3420
3325 case XTerm_Color: 3421 case XTerm_Color:
… …
3338 *buf++ = '\0'; 3434 *buf++ = '\0';
3339 3435
3340 process_color_seq (op, color, name, resp); 3436 process_color_seq (op, color, name, resp);
3341 } 3437 }
3342 break; 3438 break;
3439 case Rxvt_restoreFG:
3343 case XTerm_Color00: 3440 case XTerm_Color00:
3344 process_color_seq (op, Color_fg, str, resp); 3441 process_color_seq (op, Color_fg, str, resp);
3345 break; 3442 break;
3443 case Rxvt_restoreBG:
3346 case XTerm_Color01: 3444 case XTerm_Color01:
3347 process_color_seq (op, Color_bg, str, resp); 3445 process_color_seq (op, Color_bg, str, resp);
3348 break; 3446 break;
3349#ifndef NO_CURSORCOLOR 3447#ifndef NO_CURSORCOLOR
3350 case XTerm_Color_cursor: 3448 case XTerm_Color_cursor:
… …
3355 process_color_seq (op, Color_pointer_fg, str, resp); 3453 process_color_seq (op, Color_pointer_fg, str, resp);
3356 break; 3454 break;
3357 case XTerm_Color_pointer_bg: 3455 case XTerm_Color_pointer_bg:
3358 process_color_seq (op, Color_pointer_bg, str, resp); 3456 process_color_seq (op, Color_pointer_bg, str, resp);
3359 break; 3457 break;
3458#ifdef OPTION_HC
3459 case XTerm_Color_HC:
3460 process_color_seq (op, Color_HC, str, resp);
3461 break;
3462 case XTerm_Color_HTC:
3463 process_color_seq (op, Color_HTC, str, resp);
3464 break;
3465#endif
3360#ifndef NO_BOLD_UNDERLINE_REVERSE 3466#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: 3467 case URxvt_Color_BD:
3366 process_color_seq (op, Color_BD, str, resp); 3468 process_color_seq (op, Color_BD, str, resp);
3367 break; 3469 break;
3368 case Rxvt_Color_UL:
3369 case URxvt_Color_UL: 3470 case URxvt_Color_UL:
3370 process_color_seq (op, Color_UL, str, resp); 3471 process_color_seq (op, Color_UL, str, resp);
3371 break; 3472 break;
3372 case URxvt_Color_IT: 3473 case URxvt_Color_IT:
3373 process_color_seq (op, Color_IT, str, resp); 3474 process_color_seq (op, Color_IT, str, resp);
3374 break; 3475 break;
3375#endif 3476#endif
3376#if ENABLE_TRANSPARENCY 3477 case URxvt_Color_border:
3478 process_color_seq (op, Color_border, str, resp);
3479 break;
3480
3481#if BG_IMAGE_FROM_ROOT
3377 case URxvt_Color_tint: 3482 case URxvt_Color_tint:
3378 process_color_seq (op, Color_tint, str, resp); 3483 process_color_seq (op, Color_tint, str, resp);
3379 { 3484 {
3380 bool changed = false; 3485 bool changed = false;
3486
3381 if (ISSET_PIXCOLOR (Color_tint)) 3487 if (ISSET_PIXCOLOR (Color_tint))
3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3488 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3383 else 3489
3384 changed = bgPixmap.unset_tint ();
3385 if (changed) 3490 if (changed)
3386 update_background (); 3491 update_background ();
3387 } 3492 }
3388 3493
3389 break; 3494 break;
… …
3392#if BG_IMAGE_FROM_FILE 3497#if BG_IMAGE_FROM_FILE
3393 case Rxvt_Pixmap: 3498 case Rxvt_Pixmap:
3394 if (!strcmp (str, "?")) 3499 if (!strcmp (str, "?"))
3395 { 3500 {
3396 char str[256]; 3501 char str[256];
3502 int h_scale = fimage.h_scale;
3503 int v_scale = fimage.v_scale;
3504 int h_align = fimage.h_align;
3505 int v_align = fimage.v_align;
3397 3506
3398 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3507 sprintf (str, "[%dx%d+%d+%d]",
3399 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3508 h_scale, v_scale,
3400 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3509 h_align, v_align);
3401 process_xterm_seq (XTerm_title, str, CHAR_ST); 3510 process_xterm_seq (XTerm_title, str, CHAR_ST);
3402 } 3511 }
3403 else 3512 else
3404 { 3513 {
3405 int changed = 0; 3514 bool changed = false;
3406 3515
3407 if (*str != ';') 3516 if (*str != ';')
3408 { 3517 {
3409 /* reset to default scaling :*/ 3518 try
3410 bgPixmap.unset_geometry (); 3519 {
3411 if (bgPixmap.set_file (str)) /* change pixmap */ 3520 fimage.set_file_geometry (this, str);
3412 changed++; 3521 changed = true;
3413 str = strchr (str, ';'); 3522 }
3414 if (str == NULL) 3523 catch (const class rxvt_failure_exception &e)
3415 bgPixmap.set_defaultGeometry (); 3524 {
3525 }
3416 } 3526 }
3417 while (str) 3527 else
3418 { 3528 {
3419 str++; 3529 str++;
3420 if (bgPixmap.set_geometry (str)) 3530 if (fimage.set_geometry (str, true))
3421 changed++; 3531 changed = true;
3422 str = strchr (str, ';');
3423 } 3532 }
3533
3424 if (changed) 3534 if (changed)
3535 {
3536 if (bg_window_position_sensitive ())
3537 {
3538 int x, y;
3539 get_window_origin (x, y);
3540 parent_x = x;
3541 parent_y = y;
3542 }
3425 update_background (); 3543 update_background ();
3544 }
3426 } 3545 }
3427 break; 3546 break;
3428#endif 3547#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 3548
3437 case XTerm_logfile: 3549 case XTerm_logfile:
3438 // TODO, when secure mode? 3550 // TODO, when secure mode?
3439 break; 3551 break;
3440 3552
… …
3507 break; 3619 break;
3508#endif 3620#endif
3509 3621
3510#if ENABLE_PERL 3622#if ENABLE_PERL
3511 case URxvt_perl: 3623 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3624 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3625 break;
3515#endif 3626#endif
3516 } 3627 }
3517} 3628}
3518/*----------------------------------------------------------------------*/ 3629/*----------------------------------------------------------------------*/
… …
3525 * 's' = save 3636 * 's' = save
3526 * 'r' = restore 3637 * 'r' = restore
3527 * 't' = toggle 3638 * 't' = toggle
3528 * so no need for fancy checking 3639 * so no need for fancy checking
3529 */ 3640 */
3530int 3641int ecb_cold
3531rxvt_term::privcases (int mode, unsigned long bit) 3642rxvt_term::privcases (int mode, unsigned long bit)
3532{ 3643{
3533 int state; 3644 int state;
3534 3645
3535 if (mode == 's') 3646 if (mode == 's')
3536 { 3647 {
3537 SavedModes |= (priv_modes & bit); 3648 if (priv_modes & bit)
3649 SavedModes |= bit;
3650 else
3651 SavedModes &= ~bit;
3538 return -1; 3652 return -1;
3539 } 3653 }
3540 else 3654 else
3541 { 3655 {
3542 if (mode == 'r') 3656 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3657 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3658 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3659 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3660
3661 if (state)
3662 priv_modes |= bit;
3663 else
3664 priv_modes &= ~bit;
3547 } 3665 }
3548 3666
3549 return state; 3667 return state;
3550} 3668}
3551 3669
3552/* we're not using priv _yet_ */ 3670/* we're not using priv _yet_ */
3553void 3671void
3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3672rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3555{ 3673{
3556 unsigned int i, j; 3674 unsigned int i, j;
3557 int state; 3675 int state;
3558 3676
3559 static const struct 3677 static const struct
3560 { 3678 {
3561 const int argval; 3679 const int argval;
3562 const unsigned long bit; 3680 const unsigned long bit;
3563 } argtopriv[] = { 3681 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3682 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3683 { 2, PrivMode_vt52 }, // DECANM
3566 { 3, PrivMode_132 }, 3684 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3685 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3686 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3687 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3688 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3689 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3690 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related
3574 { 25, PrivMode_VisibleCursor }, 3691 { 12, PrivMode_BlinkingCursor },
3692 // 18 end FF to printer after print screen
3693 // 19 Print screen prints full screen/scroll region
3694 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3696 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3697#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3698 { 35, PrivMode_ShiftKeys }, // rxvt extension
3699 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3700 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3701 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3702 // 45 margin bell NYI
3582 // 46 start logging 3703 // 46 start logging
3583 { 47, PrivMode_Screen }, 3704 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3705 { 66, PrivMode_aplKP }, // DECNKM
3585#ifndef NO_BACKSPACE_KEY 3706#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3707 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3708#endif
3588 { 1000, PrivMode_MouseX11 }, 3709 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3710 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3711 { 1003, PrivMode_MouseAnyEvent },
3712#if ENABLE_FRILLS
3713 { 1005, PrivMode_ExtModeMouse },
3714#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3715 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3716 { 1011, PrivMode_Keypress }, // rxvt extension
3717#if ENABLE_FRILLS
3718 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3719#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3720 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3721 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3722 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3723 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3724 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3725 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3726 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3727 { 2004, PrivMode_BracketPaste },
3600 }; 3728 };
3601 3729
3602 if (nargs == 0) 3730 if (nargs == 0)
3603 return; 3731 return;
3604 3732
… …
3611 for (i = 0; i < nargs; i++) 3739 for (i = 0; i < nargs; i++)
3612 { 3740 {
3613 state = -1; 3741 state = -1;
3614 3742
3615 /* basic handling */ 3743 /* basic handling */
3616 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3744 for (j = 0; j < ecb_array_length (argtopriv); j++)
3617 if (argtopriv[j].argval == arg[i]) 3745 if (argtopriv[j].argval == arg[i])
3618 { 3746 {
3619 state = privcases (mode, argtopriv[j].bit); 3747 state = privcases (mode, argtopriv[j].bit);
3620 break; 3748 break;
3621 } 3749 }
… …
3629 3757
3630 scr_touch (true); 3758 scr_touch (true);
3631 break; 3759 break;
3632#endif 3760#endif
3633 case 1048: /* alternative cursor save */ 3761 case 1048: /* alternative cursor save */
3634 case 1049:
3635 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3636 if (mode == 0) 3763 if (mode == 0)
3637 scr_cursor (RESTORE); 3764 scr_cursor (RESTORE);
3638 else if (mode == 1) 3765 else if (mode == 1)
3639 scr_cursor (SAVE); 3766 scr_cursor (SAVE);
… …
3648 case 2: /* VT52 mode */ 3775 case 2: /* VT52 mode */
3649 /* oddball mode. should be set regardless of set/reset 3776 /* oddball mode. should be set regardless of set/reset
3650 * parameter. Return from VT52 mode with an ESC < from 3777 * parameter. Return from VT52 mode with an ESC < from
3651 * within VT52 mode 3778 * within VT52 mode
3652 */ 3779 */
3653 PrivMode (1, PrivMode_vt52); 3780 priv_modes |= PrivMode_vt52;
3654 break; 3781 break;
3655 case 3: /* 80/132 */ 3782 case 3: /* 80/132 */
3656 if (priv_modes & PrivMode_132OK) 3783 if (priv_modes & PrivMode_132OK)
3657 set_widthheight (((state ? 132 : 80) * fwidth), height); 3784 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3658 break; 3785 break;
3659 case 4: /* smooth scrolling */ 3786 case 4: /* smooth scrolling */
3660 set_option (Opt_jumpScroll, !state); 3787 set_option (Opt_jumpScroll, !state);
3661 break; 3788 break;
3662 case 5: /* reverse video */ 3789 case 5: /* reverse video */
… …
3673 if (state) /* orthogonal */ 3800 if (state) /* orthogonal */
3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3801 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3675 break; 3802 break;
3676#ifdef scrollBar_esc 3803#ifdef scrollBar_esc
3677 case scrollBar_esc: 3804 case scrollBar_esc:
3678 if (scrollbar_mapping (state)) 3805 scrollBar.map (state);
3679 {
3680 resize_all_windows (0, 0, 0); 3806 resize_all_windows (0, 0, 0);
3681 scr_touch (true); 3807 scr_touch (true);
3682 } 3808 break;
3809#endif
3810#ifdef CURSOR_BLINK
3811 case 12:
3812 cursor_blink_reset ();
3683 break; 3813 break;
3684#endif 3814#endif
3685 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3686 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3687 break; 3817 break;
… …
3700 case 1003: 3830 case 1003:
3701 if (state) 3831 if (state)
3702 { 3832 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3833 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3834 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3835 mouse_row = mouse_col = 0;
3705 vt_emask_mouse = PointerMotionMask; 3836 vt_emask_mouse = PointerMotionMask;
3706 } 3837 }
3707 else 3838 else
3708 vt_emask_mouse = NoEventMask; 3839 vt_emask_mouse = NoEventMask;
3840
3709 vt_select_input (); 3841 vt_select_input ();
3710 break; 3842 break;
3711 case 1010: /* scroll to bottom on TTY output inhibit */ 3843 case 1010: /* scroll to bottom on TTY output inhibit */
3712 set_option (Opt_scrollTtyOutput, !state); 3844 set_option (Opt_scrollTtyOutput, !state);
3713 break; 3845 break;
3714 case 1011: /* scroll to bottom on key press */ 3846 case 1011: /* scroll to bottom on key press */
3715 set_option (Opt_scrollTtyKeypress, state); 3847 set_option (Opt_scrollTtyKeypress, state);
3716 break; 3848 break;
3717 case 1047: /* secondary screen w/ clearing last */ 3849 case 1047: /* secondary screen w/ clearing last */
3718 if (option (Opt_secondaryScreen)) 3850 if (option (Opt_secondaryScreen))
3719 if (current_screen != PRIMARY) 3851 if (!state)
3720 scr_erase_screen (2); 3852 scr_erase_screen (2);
3853
3721 scr_change_screen (state); 3854 scr_change_screen (state);
3722 break; 3855 break;
3723 case 1049: /* secondary screen w/ clearing first */ 3856 case 1049: /* secondary screen w/ clearing first */
3857 if (option (Opt_secondaryScreen))
3858 if (state)
3859 scr_cursor (SAVE);
3860
3724 scr_change_screen (state); 3861 scr_change_screen (state);
3862
3725 if (option (Opt_secondaryScreen)) 3863 if (option (Opt_secondaryScreen))
3726 if (current_screen != PRIMARY) 3864 if (state)
3727 scr_erase_screen (2); 3865 scr_erase_screen (2);
3866 else
3867 scr_cursor (RESTORE);
3728 break; 3868 break;
3729 default: 3869 default:
3730 break; 3870 break;
3731 } 3871 }
3732 } 3872 }
3733} 3873}
3734/*}}} */ 3874/*}}} */
3735 3875
3736/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3737void 3877void ecb_hot
3738rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3739{ 3879{
3740 unsigned int i; 3880 unsigned int i;
3741 short rendset; 3881 short rendset;
3742 int rendstyle; 3882 int rendstyle;
… …
3784 //case 19: // ninth alt font 3924 //case 19: // ninth alt font
3785 //case 20: // gothic 3925 //case 20: // gothic
3786 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3926 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3787 rendset = 0, rendstyle = RS_Bold; 3927 rendset = 0, rendstyle = RS_Bold;
3788 break; 3928 break;
3789 case 22: // normal intensity 3929 case 22: // bold off (vt220)
3790 rendset = 0, rendstyle = RS_Bold; 3930 rendset = 0, rendstyle = RS_Bold;
3791 break; 3931 break;
3792 case 23: // disable italic 3932 case 23: // disable italic
3793 rendset = 0, rendstyle = RS_Italic; 3933 rendset = 0, rendstyle = RS_Italic;
3794 break; 3934 break;
3795 case 24: 3935 case 24: // underline off (vt220)
3796 rendset = 0, rendstyle = RS_Uline; 3936 rendset = 0, rendstyle = RS_Uline;
3797 break; 3937 break;
3798 case 25: 3938 case 25: // blink off (vt220)
3799 rendset = 0, rendstyle = RS_Blink; 3939 rendset = 0, rendstyle = RS_Blink;
3800 break; 3940 break;
3801 case 26: // variable spacing (iso 8613) 3941 case 26: // variable spacing (iso 8613)
3802 rendset = 0, rendstyle = RS_Blink; 3942 rendset = 0, rendstyle = RS_Blink;
3803 break; 3943 break;
3804 case 27: 3944 case 27: // reverse off (vt220)
3805 rendset = 0, rendstyle = RS_RVid; 3945 rendset = 0, rendstyle = RS_RVid;
3806 break; 3946 break;
3807 //case 28: // visible. NYI 3947 //case 28: // visible. NYI
3808 //case 29: // not crossed-out 3948 //case 29: // not crossed-out
3809 } 3949 }
… …
3883 break; 4023 break;
3884#endif 4024#endif
3885 } 4025 }
3886 } 4026 }
3887} 4027}
4028
4029void
4030rxvt_term::set_cursor_style (int style)
4031{
4032 if (!IN_RANGE_INC (style, 0, 6))
4033 return;
4034
4035 if (style == 0)
4036 style = 1;
4037
4038 cursor_type = (style - 1) / 2;
4039 set_option (Opt_cursorUnderline, cursor_type == 1);
4040
4041#ifdef CURSOR_BLINK
4042 set_option (Opt_cursorBlink, style & 1);
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
4047}
3888/*}}} */ 4048/*}}} */
3889 4049
3890/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3891void
3892rxvt_term::process_graphics ()
3893{
3894 unicode_t ch, cmd = cmd_getc ();
3895
3896 if (cmd == 'Q')
3897 {
3898 /* query graphics */
3899 tt_printf ("\033G0\012"); /* no graphics */
3900 return;
3901 }
3902 /* swallow other graphics sequences until terminating ':' */
3903 do
3904 ch = cmd_getc ();
3905 while (ch != ':');
3906}
3907/*}}} */
3908
3909/* ------------------------------------------------------------------------- */ 4050/* ---------------------------------------------------------------------- */
4051/* Write data to the pty as typed by the user, pasted with the mouse,
4052 * or generated by us in response to a query ESC sequence.
4053 */
3910 4054
3911/* 4055/*
3912 * Send printf () formatted output to the command. 4056 * Send printf () formatted output to the command.
3913 * Only use for small amounts of data. 4057 * Only use for small amounts of data.
3914 */ 4058 */
… …
3922 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4066 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3923 va_end (arg_ptr); 4067 va_end (arg_ptr);
3924 tt_write (buf, strlen (buf)); 4068 tt_write (buf, strlen (buf));
3925} 4069}
3926 4070
3927/* ---------------------------------------------------------------------- */
3928/* Write data to the pty as typed by the user, pasted with the mouse, 4071/* Write data to the pty as typed by the user. */
3929 * or generated by us in response to a query ESC sequence. 4072void
3930 */ 4073rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3931const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4074{
4075 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4076 return;
4077
4078 if (option (Opt_scrollTtyKeypress))
4079 if (view_start)
4080 {
4081 view_start = 0;
4082 want_refresh = 1;
4083 }
4084
4085 tt_write_ (data, len);
4086}
3932 4087
3933void 4088void
3934rxvt_term::tt_write (const char *data, unsigned int len) 4089rxvt_term::tt_write (const char *data, unsigned int len)
3935{ 4090{
3936 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4091 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3937 return; 4092 return;
3938 4093
4094 tt_write_ (data, len);
4095}
4096
4097static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4098
4099void
4100rxvt_term::tt_write_ (const char *data, unsigned int len)
4101{
3939 if (pty->pty < 0) 4102 if (pty->pty < 0)
3940 return; 4103 return;
3941 4104
3942 if (v_buflen == 0) 4105 if (v_buflen == 0)
3943 { 4106 {
3944 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4107 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3945 4108
4109 max_it (written, 0);
4110
3946 if ((unsigned int)written == len) 4111 if (written == len)
3947 return; 4112 return;
3948 4113
3949 data += written; 4114 data += written;
3950 len -= written; 4115 len -= written;
3951 } 4116 }
3952 4117
3953 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4118 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3954 4119
3955 memcpy (v_buffer + v_buflen, data, len); 4120 memcpy (v_buffer + v_buflen, data, len);
3956 v_buflen += len; 4121 v_buflen += len;
3957 4122
3958 pty_ev.set (ev::READ | ev::WRITE); 4123 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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