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.402 by ayin, Fri Feb 1 14:13:52 2008 UTC vs.
Revision 1.583 by root, Thu May 18 02:43:18 2017 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-2007 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 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * 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,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 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",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 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);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 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);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 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
304rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
305{ 409{
306 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
307 unsigned int newlen; 411 KeySym keysym = NoSymbol;
308 KeySym keysym;
309 int valid_keysym;
310 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
311 414
312#if ISO_14755 415#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
314 return; 417 return;
315#endif 418#endif
… …
322 */ 425 */
323 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
326 429
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 430 kbuf[0] = 0;
334 431
335#ifdef USE_XIM 432#if USE_XIM
336 if (Input_Context) 433 if (Input_Context)
337 { 434 {
338 Status status_return; 435 Status status_return;
339 436
340#if 0 437#if 0
… …
378 } 475 }
379 } 476 }
380 else 477 else
381 len = 0; 478 len = 0;
382 } 479 }
383
384 valid_keysym = status_return == XLookupKeySym
385 || status_return == XLookupBoth;
386 } 480 }
387 else 481 else
388#endif 482#endif
389 { 483 {
390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
391 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
392 } 488 {
489 KeySym orig_keysym = keysym;
393 490
394 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)
395 { 704 {
396#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 707 return;
399#endif 708#endif
400 709
401 if (saveLines) 710 if (saveLines)
402 { 711 {
… …
411#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 722#else
414 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
415#endif 724#endif
725 max_it (lnsppg, 1);
726
416 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
417 { 728 {
418 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
419 return; 730 return;
420 } 731 }
421 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
422 { 733 {
423 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
424 return; 735 return;
425 } 736 }
426 } 737 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
429 { 740 {
430 if (keysym == XK_Up) 741 if (keysym == XK_Up)
431 { 742 {
432 scr_page (UP, 1); 743 scr_page (1);
433 return; 744 return;
434 } 745 }
435 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
436 { 747 {
437 scr_page (DN, 1); 748 scr_page (-1);
438 return; 749 return;
439 } 750 }
440 } 751 }
441#endif 752#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
444 { 755 {
445 if (keysym == XK_Home) 756 if (keysym == XK_Home)
446 { 757 {
447 scr_move_to (0, 1); 758 scr_changeview (top_row);
448 return; 759 return;
449 } 760 }
450 else if (keysym == XK_End) 761 else if (keysym == XK_End)
451 { 762 {
452 scr_move_to (1, 1); 763 scr_changeview (0);
453 return; 764 return;
454 } 765 }
455 } 766 }
456#endif 767#endif
457 } 768 }
458 769
459 if (shft) 770 if (shft)
460 { 771 {
461 /* Shift + F1 - F10 generates F11 - F20 */
462 if (keysym >= XK_F1 && keysym <= XK_F10)
463 {
464 keysym += (XK_F11 - XK_F1);
465 shft = 0; /* turn off Shift */
466 }
467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 773 {
469 switch (keysym) 774 switch (keysym)
470 { 775 {
471 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 778 selection_request (ev.time);
474 return; 779 return;
475#if TODO 780#if TODO
476 /* rxvt extras */ 781 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 783 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 785 return;
483#endif 786#endif
484 } 787 }
485 } 788 }
486 } 789 }
487 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
488#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 807 // ISO 14755 support
490 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 809 {
492 int hv; 810 int hv;
493 811
494 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 843 scr_overlay_off ();
526# endif 844# endif
527 iso14755buf = 0; 845 iso14755buf = 0;
528 } 846 }
529 } 847 }
848 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
533 { 852 {
534 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 854# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
544 { 863 {
545 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
546 return; 865 return;
547 } 866 }
548#endif 867#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 }
795
796 /*
797 * Pass meta for all function keys, if 'meta' option set
798 */
799#ifdef META8_OPTION
800 if (meta && (meta_char == 0x80) && len > 0)
801 kbuf[len - 1] |= 0x80;
802#endif
803
804 }
805 else if (ctrl && keysym == XK_minus)
806 {
807 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 }
810 else if (keysym == XK_ISO_Left_Tab)
811 {
812 strcpy (kbuf, "\033[Z");
813 len = 3;
814 }
815 else
816 {
817#ifdef META8_OPTION
818 /* set 8-bit on */
819 if (meta && (meta_char == 0x80))
820 {
821 char *ch;
822
823 for (ch = kbuf; ch < kbuf + len; ch++)
824 *ch |= 0x80;
825
826 meta = 0;
827 }
828#endif
829 /* nil */ ;
830 }
831 } 868 }
832
833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834 return;
835 869
836 if (len <= 0) 870 if (len <= 0)
837 return; /* not mapped */ 871 return; /* not mapped */
838 872
839 if (option (Opt_scrollTtyKeypress))
840 if (view_start)
841 {
842 view_start = 0;
843 want_refresh = 1;
844 }
845
846 /*
847 * these modifications only affect the static keybuffer
848 * pass Shift/Control indicators for function keys ending with `~'
849 *
850 * eg,
851 * Prior = "ESC[5~"
852 * Shift+Prior = "ESC[5$"
853 * Ctrl+Prior = "ESC[5^"
854 * Ctrl+Shift+Prior = "ESC[5@"
855 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
856 */
857 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
858 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
859
860 /* escape prefix */
861 if (meta
862#ifdef META8_OPTION
863 && meta_char == C0_ESC
864#endif
865 )
866 {
867 const char ch = C0_ESC;
868 tt_write (&ch, 1);
869 }
870
871 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
872} 874}
873 875
874void 876void ecb_cold
875rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
876{ 878{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym; 880 KeySym keysym;
879 881
… …
899 commit_iso14755 (); 901 commit_iso14755 ();
900 902
901 return; 903 return;
902 } 904 }
903 905
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
905 if (i[0] == keysym) 907 if (i[0] == keysym)
906 { 908 {
907 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 (); 910 commit_iso14755 ();
909 911
… …
946 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
948#endif 950#endif
949} 951}
950 952
951#if defined (KEYSYM_RESOURCE)
952unsigned int
953rxvt_term::cmd_write (const char *str, unsigned int count)
954{
955 unsigned int n, s;
956
957 n = cmdbuf_ptr - cmdbuf_base;
958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
959
960 if (n > 0 && s < count)
961 {
962 memmove (cmdbuf_base, cmdbuf_ptr,
963 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
964 cmdbuf_ptr = cmdbuf_base;
965 cmdbuf_endp -= n;
966 s += n;
967 }
968
969 if (count > s)
970 {
971 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
972 count = s;
973 }
974
975 for (; count--;)
976 *cmdbuf_endp++ = *str++;
977
978 cmd_parse ();
979
980 return 0;
981}
982#endif
983
984void 953void
985rxvt_term::flush () 954rxvt_term::flush ()
986{ 955{
987 flush_ev.stop (); 956 flush_ev.stop ();
988 957
989#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
990 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
991 { 960 {
992// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
993 scr_touch (false); 962 scr_touch (false);
994 } 963 }
995#endif 964#endif
996 965
997 if (want_refresh) 966 if (want_refresh)
… …
1033 } 1002 }
1034 while (row < end_row); 1003 while (row < end_row);
1035 } 1004 }
1036 1005
1037 scr_refresh (); 1006 scr_refresh ();
1038 scrollbar_show (1); 1007 scrollBar.show (1);
1039#ifdef USE_XIM 1008#if USE_XIM
1040 IMSendSpot (); 1009 im_send_spot ();
1041#endif 1010#endif
1042 } 1011 }
1043 1012
1044 display->flush (); 1013 display->flush ();
1045} 1014}
1046 1015
1047/* checks wether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1048void 1017void
1049rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1050{ 1019{
1051 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1062 refresh_count = 0; 1031 refresh_count = 0;
1063 flush (); 1032 flush ();
1064} 1033}
1065 1034
1066#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
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
1067void 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;
… …
1090 1077
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1079void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1081{
1095 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1096 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1097 { 1084 {
1098 want_refresh = 1; 1085 want_refresh = 1;
1099 refresh_check (); 1086 refresh_check ();
1100 } 1087 }
1101 else 1088 else
… …
1105 1092
1106#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1107void 1094void
1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1109{ 1096{
1110 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1111 { 1098 {
1112 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1113 want_refresh = 1; 1100 want_refresh = 1;
1114 refresh_check (); 1101 refresh_check ();
1115 } 1102 }
… …
1120 1107
1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1122void 1109void
1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1124{ 1111{
1125 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1126 { 1113 {
1127 want_refresh = 1; 1114 want_refresh = 1;
1128 refresh_check (); 1115 refresh_check ();
1129 } 1116 }
1130 1117
… …
1145 { 1132 {
1146 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1148 // 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
1149 // 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.
1150 1140
1151 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1153 1143
1154 w.stop (); 1144 w.stop ();
1155 } 1145 }
1156 1146
… …
1159 { 1149 {
1160 } 1150 }
1161} event_handler; 1151} event_handler;
1162#endif 1152#endif
1163 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
1164bool 1187bool
1165rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1166{ 1189{
1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1168 1191
1169 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1170 { 1193
1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1172 n = 0;
1173 } 1195 {
1174 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1176 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1177 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1178 1201
1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1180 1203
1181 if (r > 0) 1204 if (r > 0)
1182 { 1205 {
1183 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1184 return true; 1207 return true;
… …
1206{ 1229{
1207 make_current (); 1230 make_current ();
1208 1231
1209 if (revents & ev::READ) 1232 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1235 cmd_parse ();
1213 break;
1214 1236
1215 if (revents & ev::WRITE) 1237 if (revents & ev::WRITE)
1216 pty_write (); 1238 pty_write ();
1217 1239
1218 refresh_check (); 1240 refresh_check ();
1219} 1241}
1220 1242
1221void 1243void ecb_cold
1222rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1223{ 1245{
1224 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1225 recolour_cursor (); 1247 recolor_cursor ();
1226 1248
1227#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1228 hidden_pointer = 0; 1250 hidden_pointer = 0;
1229 1251
1230 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1231 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1232#endif 1254#endif
1233} 1255}
1234 1256
1235#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1236void 1258void ecb_cold
1237rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1238{ 1260{
1239 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1240 return; 1262 return;
1241 1263
… …
1243 XFlush (dpy); 1265 XFlush (dpy);
1244 1266
1245 hidden_pointer = 1; 1267 hidden_pointer = 1;
1246} 1268}
1247 1269
1248void 1270void ecb_cold
1249rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1250{ 1272{
1251 make_current (); 1273 make_current ();
1252 1274
1253 pointer_blank (); 1275 pointer_blank ();
… …
1259{ 1281{
1260 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1261 int x, y; 1283 int x, y;
1262 int code = 32; 1284 int code = 32;
1263 1285
1264 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1265 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1266 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1267 { 1290 {
1268 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1269 return; 1292 return;
1293
1270 mouse_row = x; 1294 mouse_row = x;
1271 mouse_col = y; 1295 mouse_col = y;
1272 code += 32; 1296 code += 32;
1273 } 1297 }
1274 1298
… …
1277 else 1301 else
1278 { 1302 {
1279 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1280 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1281 if (button_number >= 3) 1305 if (button_number >= 3)
1282 button_number += (64 - 3); 1306 button_number += 64 - 3;
1283 } 1307 }
1284 1308
1285 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1286 { 1310 {
1287 /* 1311 /*
… …
1319 fputc ('A', stderr); 1343 fputc ('A', stderr);
1320 if (key_state & 32) 1344 if (key_state & 32)
1321 fputc ('2', stderr); 1345 fputc ('2', stderr);
1322 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1323 button_number, 1347 button_number,
1324 x + 1, 1348 x,
1325 y + 1); 1349 y);
1326#endif 1350#endif
1327 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
1328 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1329 (code + button_number + key_state), 1366 code + button_number + key_state,
1330 (32 + x + 1), 1367 32 + x,
1331 (32 + y + 1)); 1368 32 + y);
1332} 1369}
1333 1370
1334/*{{{ process an X event */ 1371/*{{{ process an X event */
1335void 1372void ecb_hot
1336rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1337{ 1374{
1338 make_current (); 1375 make_current ();
1339 1376
1340 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1438 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1476 focus_out ();
1440 break; 1477 break;
1441 1478
1442 case ConfigureNotify: 1479 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1447 { 1481 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 if (want_position_change)
1488 {
1489 int x, y;
1490
1491 if (ev.xconfigure.send_event)
1492 {
1493 x = ev.xconfigure.x;
1494 y = ev.xconfigure.y;
1495 }
1496 else
1497 get_window_origin (x, y);
1498
1499 if (x != parent_x || y != parent_y)
1500 {
1501 parent_x = x;
1502 parent_y = y;
1503 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1504 }
1505 }
1450 1506
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1508 {
1453 seen_resize = 1; 1509 seen_resize = 1;
1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1455 } 1511 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif
1467 }
1468 1512
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1513 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 } 1514 }
1471 break; 1515 break;
1472 1516
1473 case PropertyNotify: 1517 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1518 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1476 && ev.xproperty.state == PropertyNewValue)
1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478
1479 break; 1519 break;
1480 1520
1481 case SelectionClear: 1521 case SelectionClear:
1482 selection_clear (); 1522 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break;
1484
1485 case SelectionNotify:
1486 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1488 break; 1523 break;
1489 1524
1490 case SelectionRequest: 1525 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1492 break; 1527 break;
1493 1528
1494 case MapNotify: 1529 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1511 mapped = 1; 1530 mapped = 1;
1512#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1513 text_blink_ev.start (); 1532 text_blink_ev.start ();
1514#endif 1533#endif
1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1528 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1529 { 1548 {
1530 do 1549 do
1531 { 1550 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, false);
1534 } 1553 }
1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1555
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1557
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 { 1559 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1562 }
1544 1563
1545 want_refresh = 1; 1564 want_refresh = 1;
1546 } 1565 }
1547 else 1566 else
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1573 ;
1555 1574
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1575 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1576 {
1558 scrollBar.state = STATE_IDLE; 1577 scrollBar.state = SB_STATE_IDLE;
1559 scrollbar_show (0); 1578 scrollBar.show (0);
1560 } 1579 }
1561 } 1580 }
1562 break; 1581 break;
1563 1582
1564 case MotionNotify: 1583 case MotionNotify:
1565#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
1566 if (hidden_pointer) 1585 if (hidden_pointer)
1567 pointer_unblank (); 1586 pointer_unblank ();
1568#endif 1587#endif
1588 if (!bypass_keystate
1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1589 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 || priv_modes & PrivMode_MouseAnyEvent) 1590 || priv_modes & PrivMode_MouseAnyEvent))
1571 mouse_report (ev.xbutton); 1591 mouse_report (ev.xbutton);
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1593 break;
1574 1594
1575 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
… …
1587 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1609 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1591 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1592 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1613#endif
1593 { 1614 {
1594#endif
1595#if ISO_14755 1615#if ISO_14755
1596 // 5.4 1616 // 5.4
1597 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 { 1618 {
1599 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1605 1625
1606#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1607 if (ev.xbutton.y < int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1608 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1609 { 1629 {
1630 page_dirn scroll_selection_dir;
1610 int dist; 1631 int dist;
1611 1632
1612 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1613 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
1614 */ 1635 */
… …
1629 dist = int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1630 } 1651 }
1631 else 1652 else
1632 { 1653 {
1633 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1634 dist = ev.xbutton.y - (int_bwidth + height); 1655 dist = ev.xbutton.y - (int_bwidth + vt_height);
1635 } 1656 }
1636 1657
1637 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1638 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1639 + 1; 1660 + 1;
1640 min_it (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1641 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1663 scroll_selection_lines *= scroll_selection_dir;
1642 } 1664 }
1643 else 1665 else
1644 { 1666 {
1645 /* we are within the text window, so we 1667 /* we are within the text window, so we
1646 * shouldn't be scrolling 1668 * shouldn't be scrolling
1647 */ 1669 */
1648 sel_scroll_ev.stop(); 1670 sel_scroll_ev.stop();
1649 } 1671 }
1650#endif 1672#endif
1651#ifdef MOUSE_THRESHOLD
1652 } 1673 }
1653#endif
1654 } 1674 }
1655 } 1675 }
1656 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1677 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1660 ; 1680 ;
1661 1681
1662 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1686 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1688 scrollBar.size ());
1669 want_refresh = 1; 1689 want_refresh = 1;
1670 scrollbar_show (1); 1690 scrollBar.show (1);
1671 } 1691 }
1672 break; 1692 break;
1673 } 1693 }
1674 1694
1675#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1685 }
1686#endif 1698#endif
1687 1699
1688#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 { 1702 {
… …
1700#endif 1712#endif
1701 1713
1702 refresh_check (); 1714 refresh_check ();
1703} 1715}
1704 1716
1705void 1717#if ENABLE_FRILLS
1718void ecb_cold
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 XFree (h);
1730 }
1731}
1732#endif
1733
1734void ecb_cold
1706rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1707{ 1736{
1708 if (!focus) 1737 if (!focus)
1709 { 1738 {
1710 focus = 1; 1739 focus = 1;
1711 want_refresh = 1; 1740 want_refresh = 1;
1712 1741
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714
1715#if USE_XIM 1742#if USE_XIM
1716 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1717 { 1744 {
1718 IMSetPosition (); 1745 im_set_position ();
1719 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1720 } 1747 }
1721#endif 1748#endif
1722#if CURSOR_BLINK 1749#if CURSOR_BLINK
1723 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1725#endif 1752#endif
1726#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1728 { 1755 {
1729 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1757 scr_recolor ();
1731 } 1758 }
1732#endif 1759#endif
1733#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1735 { 1762 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1743 }
1744}
1745 1763
1746void 1764 if (priv_modes & PrivMode_FocusEvent)
1765 tt_printf ("\x1b[I");
1766#endif
1767
1768 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1769 }
1770}
1771
1772void ecb_cold
1747rxvt_term::focus_out () 1773rxvt_term::focus_out ()
1748{ 1774{
1749 if (focus) 1775 if (focus)
1750 { 1776 {
1751 focus = 0; 1777 focus = 0;
1752 want_refresh = 1; 1778 want_refresh = 1;
1753 1779
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1780#if ENABLE_FRILLS
1781 if (option (Opt_urgentOnBell))
1782 set_urgency (0);
1755 1783
1784 if (priv_modes & PrivMode_FocusEvent)
1785 tt_printf ("\x1b[O");
1786#endif
1756#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1788 if (iso14755buf)
1758 { 1789 {
1759 iso14755buf = 0; 1790 iso14755buf = 0;
1760# if ISO_14755 1791# if ISO_14755
… …
1774#endif 1805#endif
1775#if OFF_FOCUS_FADING 1806#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1807 if (rs[Rs_fade])
1777 { 1808 {
1778 pix_colors = pix_colors_unfocused; 1809 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1810 scr_recolor ();
1780 } 1811 }
1781#endif 1812#endif
1782 }
1783}
1784 1813
1785void 1814 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1815 }
1816}
1817
1818void ecb_cold
1786rxvt_term::update_fade_color (unsigned int idx) 1819rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1787{ 1820{
1788#if OFF_FOCUS_FADING 1821#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade]) 1822 if (rs[Rs_fade])
1790 { 1823 {
1824 if (!first_time)
1825 pix_colors_focused [idx].free (this);
1826
1791 rgba c; 1827 rgba c;
1792 pix_colors [Color_fade].get (c); 1828 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1829 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 } 1830 }
1795#endif 1831#endif
1796} 1832}
1797 1833
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL 1834#if ENABLE_PERL
1799void 1835void ecb_hot
1800rxvt_term::rootwin_cb (XEvent &ev) 1836rxvt_term::rootwin_cb (XEvent &ev)
1801{ 1837{
1802 make_current (); 1838 make_current ();
1803 1839
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1840 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1841 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return; 1842 return;
1807 1843
1808# if ENABLE_TRANSPARENCY
1809 switch (ev.type) 1844 switch (ev.type)
1810 { 1845 {
1811 case PropertyNotify: 1846 case PropertyNotify:
1812 /* 1847 /*
1813 * if user used some Esetroot compatible prog to set the root bg, 1848 * if user used some Esetroot compatible prog to set the root bg,
1814 * use the property to determine the pixmap. We use it later on. 1849 * use the property to determine the pixmap. We use it later on.
1815 */ 1850 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1851 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1852 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1853 {
1819 bgPixmap.set_root_pixmap (); 1854 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1820 update_background ();
1821 } 1855 }
1822 1856
1823 break; 1857 break;
1824 } 1858 }
1825# endif
1826 1859
1827 refresh_check (); 1860 refresh_check ();
1828} 1861}
1829#endif 1862#endif
1830 1863
… …
1853 iso14755_54 (ev.x, ev.y); 1886 iso14755_54 (ev.x, ev.y);
1854 return; 1887 return;
1855 } 1888 }
1856#endif 1889#endif
1857 1890
1858 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1891 clickintime = ev.time - MEvent.time < multiClickTime;
1859 1892
1860 if (reportmode) 1893 if (reportmode)
1861 { 1894 {
1862 /* mouse report from vt window */ 1895 /* mouse report from vt window */
1863 /* save the xbutton state (for ButtonRelease) */ 1896 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1897 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1898#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1899 if (ev.button == MEvent.button && clickintime)
1867 { 1900 {
1868 /* same button, within alloted time */ 1901 /* same button, within allowed time */
1869 MEvent.clicks++; 1902 MEvent.clicks++;
1870 1903
1871 if (MEvent.clicks > 1) 1904 if (MEvent.clicks > 1)
1872 { 1905 {
1873 /* only report double clicks */ 1906 /* only report double clicks */
… …
1947 /* 1980 /*
1948 * Scrollbar window processing of button press 1981 * Scrollbar window processing of button press
1949 */ 1982 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1983 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1984 {
1952 int upordown = 0; 1985 page_dirn direction = NO_DIR;
1953 1986
1954 if (scrollBar.upButton (ev.y)) 1987 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */ 1988 direction = UP; /* up */
1956 else if (scrollBar.dnButton (ev.y)) 1989 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* down */ 1990 direction = DN; /* down */
1958 1991
1959 scrollBar.state = STATE_IDLE; 1992 scrollBar.state = SB_STATE_IDLE;
1960 /* 1993 /*
1961 * Rxvt-style scrollbar: 1994 * Rxvt-style scrollbar:
1962 * move up if mouse is above slider 1995 * move up if mouse is above slider
1963 * move dn if mouse is below slider 1996 * move dn if mouse is below slider
1964 * 1997 *
… …
1973 /* 2006 /*
1974 * Mouse report disabled scrollbar: 2007 * Mouse report disabled scrollbar:
1975 * arrow buttons - send up/down 2008 * arrow buttons - send up/down
1976 * click on scrollbar - send pageup/down 2009 * click on scrollbar - send pageup/down
1977 */ 2010 */
1978 if (upordown < 0) 2011 if (direction == UP)
1979 tt_printf ("\033[A"); 2012 tt_printf ("\033[A");
1980 else if (upordown > 0) 2013 else if (direction == DN)
1981 tt_printf ("\033[B"); 2014 tt_printf ("\033[B");
1982 else 2015 else
1983 switch (ev.button) 2016 switch (ev.button)
1984 { 2017 {
1985 case Button2: 2018 case Button2:
… …
1993 break; 2026 break;
1994 } 2027 }
1995 } 2028 }
1996 else 2029 else
1997#endif /* NO_SCROLLBAR_REPORT */ 2030#endif /* NO_SCROLLBAR_REPORT */
1998
1999 { 2031 {
2000 if (upordown) 2032 if (direction != NO_DIR)
2001 { 2033 {
2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2034#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ()) 2035 if (!cont_scroll_ev.is_active ())
2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2036 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2005#endif 2037#endif
2006 if (scr_page (upordown < 0 ? UP : DN, 1)) 2038 if (scr_page (direction, 1))
2007 { 2039 {
2008 if (upordown < 0) 2040 if (direction == UP)
2009 scrollBar.state = STATE_UP; 2041 scrollBar.state = SB_STATE_UP;
2010 else 2042 else
2011 scrollBar.state = STATE_DOWN; 2043 scrollBar.state = SB_STATE_DOWN;
2012 } 2044 }
2013 } 2045 }
2014 else 2046 else
2015 switch (ev.button) 2047 switch (ev.button)
2016 { 2048 {
2017 case Button2: 2049 case Button2:
2018 switch (scrollBar.align) 2050 switch (scrollBar.align)
2019 { 2051 {
2020 case R_SB_ALIGN_TOP: 2052 case SB_ALIGN_TOP:
2021 csrO = 0; 2053 csrO = 0;
2022 break; 2054 break;
2023 case R_SB_ALIGN_CENTRE: 2055 case SB_ALIGN_CENTRE:
2024 csrO = (scrollBar.bot - scrollBar.top) / 2; 2056 csrO = (scrollBar.bot - scrollBar.top) / 2;
2025 break; 2057 break;
2026 case R_SB_ALIGN_BOTTOM: 2058 case SB_ALIGN_BOTTOM:
2027 csrO = scrollBar.bot - scrollBar.top; 2059 csrO = scrollBar.bot - scrollBar.top;
2028 break; 2060 break;
2029 } 2061 }
2030 2062
2031 if (scrollBar.style == R_SB_XTERM 2063 if (scrollBar.style == SB_STYLE_XTERM
2032 || scrollbar_above_slider (ev.y) 2064 || scrollBar.above_slider (ev.y)
2033 || scrollbar_below_slider (ev.y)) 2065 || scrollBar.below_slider (ev.y))
2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2066 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2035 2067
2036 scrollBar.state = STATE_MOTION; 2068 scrollBar.state = SB_STATE_MOTION;
2037 break; 2069 break;
2038 2070
2039 case Button1: 2071 case Button1:
2040 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2072 if (scrollBar.align == SB_ALIGN_CENTRE)
2041 csrO = ev.y - scrollBar.top; 2073 csrO = ev.y - scrollBar.top;
2042 /* FALLTHROUGH */ 2074 /* FALLTHROUGH */
2043 2075
2044 case Button3: 2076 case Button3:
2045 if (scrollBar.style != R_SB_XTERM) 2077 if (scrollBar.style != SB_STYLE_XTERM)
2046 { 2078 {
2047 if (scrollbar_above_slider (ev.y)) 2079 if (scrollBar.above_slider (ev.y))
2048# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2049 scr_page (UP, nrow - 1); 2081 scr_page (UP, nrow - 1);
2050# else 2082# else
2051 scr_page (UP, nrow / 4); 2083 scr_page (UP, nrow / 4);
2052# endif 2084# endif
2053 else if (scrollbar_below_slider (ev.y)) 2085 else if (scrollBar.below_slider (ev.y))
2054# ifdef RXVT_SCROLL_FULL 2086# ifdef RXVT_SCROLL_FULL
2055 scr_page (DN, nrow - 1); 2087 scr_page (DN, nrow - 1);
2056# else 2088# else
2057 scr_page (DN, nrow / 4); 2089 scr_page (DN, nrow / 4);
2058# endif 2090# endif
2059 else 2091 else
2060 scrollBar.state = STATE_MOTION; 2092 scrollBar.state = SB_STATE_MOTION;
2061 } 2093 }
2062 else 2094 else
2063 { 2095 {
2064 scr_page ((ev.button == Button1 ? DN : UP), 2096 scr_page ((ev.button == Button1 ? DN : UP),
2065 (nrow 2097 (nrow
2066 * scrollbar_position (ev.y) 2098 * scrollBar.position (ev.y)
2067 / scrollbar_size ())); 2099 / scrollBar.size ()));
2068 } 2100 }
2069 2101
2070 break; 2102 break;
2071 } 2103 }
2072 } 2104 }
… …
2082 2114
2083 csrO = 0; /* reset csr Offset */ 2115 csrO = 0; /* reset csr Offset */
2084 if (!bypass_keystate) 2116 if (!bypass_keystate)
2085 reportmode = !! (priv_modes & PrivMode_mouse_report); 2117 reportmode = !! (priv_modes & PrivMode_mouse_report);
2086 2118
2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2119 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2088 { 2120 {
2089 scrollBar.state = STATE_IDLE; 2121 scrollBar.state = SB_STATE_IDLE;
2090 scrollbar_show (0); 2122 scrollBar.show (0);
2091 } 2123 }
2092 2124
2093#ifdef SELECTION_SCROLLING 2125#ifdef SELECTION_SCROLLING
2094 sel_scroll_ev.stop(); 2126 sel_scroll_ev.stop();
2095#endif 2127#endif
… …
2114#ifdef MOUSE_REPORT_DOUBLECLICK 2146#ifdef MOUSE_REPORT_DOUBLECLICK
2115 /* only report the release of 'slow' single clicks */ 2147 /* only report the release of 'slow' single clicks */
2116 if (MEvent.button != AnyButton 2148 if (MEvent.button != AnyButton
2117 && (ev.button != MEvent.button 2149 && (ev.button != MEvent.button
2118 || (ev.time - MEvent.time 2150 || (ev.time - MEvent.time
2119 > MULTICLICK_TIME / 2))) 2151 > multiClickTime / 2)))
2120 { 2152 {
2121 MEvent.clicks = 0; 2153 MEvent.clicks = 0;
2122 MEvent.button = AnyButton; 2154 MEvent.button = AnyButton;
2123 mouse_report (ev); 2155 mouse_report (ev);
2124 } 2156 }
… …
2144 case Button3: 2176 case Button3:
2145 selection_make (ev.time); 2177 selection_make (ev.time);
2146 break; 2178 break;
2147 2179
2148 case Button2: 2180 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2181 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2182 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2183 break;
2152 2184
2153#ifdef MOUSE_WHEEL 2185#ifdef MOUSE_WHEEL
2154 case Button4: 2186 case Button4:
2155 case Button5: 2187 case Button5:
2156 { 2188 {
2157 int i; 2189 int lines;
2158 page_dirn v; 2190 page_dirn dirn;
2159 2191
2160 v = ev.button == Button4 ? UP : DN; 2192 dirn = ev.button == Button4 ? UP : DN;
2161 2193
2162 if (ev.state & ShiftMask) 2194 if (ev.state & ShiftMask)
2163 i = 1; 2195 lines = 1;
2164 else if (option (Opt_mouseWheelScrollPage)) 2196 else if (option (Opt_mouseWheelScrollPage))
2165 i = nrow - 1; 2197 lines = nrow - 1;
2166 else 2198 else
2167 i = 5; 2199 lines = 5;
2168 2200
2169# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
2170 if (ev.state & ControlMask) 2202 if (ev.state & ControlMask)
2171 { 2203 {
2172 mouse_slip_wheel_speed += v ? -1 : 1; 2204 mouse_slip_wheel_speed += dirn;
2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2205 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2175 2206
2176 if (!slip_wheel_ev.is_active ()) 2207 if (!slip_wheel_ev.is_active ())
2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2208 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2178 } 2209 }
2179 else 2210 else
2180# endif 2211# endif
2181 { 2212 {
2182 scr_page (v, i); 2213 scr_page (dirn, lines);
2183 scrollbar_show (1); 2214 scrollBar.show (1);
2184 } 2215 }
2185 } 2216 }
2186 break; 2217 break;
2187#endif 2218#endif
2188 } 2219 }
2189 } 2220 }
2190} 2221}
2191 2222
2192/*}}} */ 2223/*}}} */
2193 2224
2194bool 2225void ecb_hot
2195rxvt_term::cmd_parse () 2226rxvt_term::cmd_parse ()
2196{ 2227{
2197 bool flag = false;
2198 wchar_t ch = NOCHAR; 2228 wchar_t ch = NOCHAR;
2199 char *seq_begin; // remember start of esc-sequence here 2229 char *seq_begin; // remember start of esc-sequence here
2200 2230
2201 for (;;) 2231 for (;;)
2202 { 2232 {
2203 if (ch == NOCHAR) 2233 if (ecb_unlikely (ch == NOCHAR))
2204 { 2234 {
2205 seq_begin = cmdbuf_ptr; 2235 seq_begin = cmdbuf_ptr;
2206 ch = next_char (); 2236 ch = next_char ();
2207 2237
2208 if (ch == NOCHAR) 2238 if (ch == NOCHAR)
2209 break; 2239 break;
2210 } 2240 }
2211 2241
2212 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2242 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2213 { 2243 {
2214 if (!seen_input) 2244 if (ecb_unlikely (!seen_input))
2215 { 2245 {
2216 seen_input = 1; 2246 seen_input = 1;
2217 // many badly-written programs (e.g. jed) contain a race condition: 2247 // many badly-written programs (e.g. jed) contain a race condition:
2218 // they first read the screensize and then install a SIGWINCH handler. 2248 // they first read the screensize and then install a SIGWINCH handler.
2219 // some window managers resize the window early, and these programs 2249 // some window managers resize the window early, and these programs
… …
2232 wchar_t *str = buf; 2262 wchar_t *str = buf;
2233 wchar_t *eol = str + min (ncol, UBUFSIZ); 2263 wchar_t *eol = str + min (ncol, UBUFSIZ);
2234 2264
2235 for (;;) 2265 for (;;)
2236 { 2266 {
2237 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2267 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2238 break; 2268 break;
2239 2269
2240 *str++ = ch; 2270 *str++ = ch;
2241 2271
2242 if (ch == C0_LF || str >= eol) 2272 if (ecb_unlikely (ch == C0_LF || str >= eol))
2243 { 2273 {
2244 if (ch == C0_LF) 2274 if (ch == C0_LF)
2245 nlines++; 2275 nlines++;
2246 2276
2247 refresh_count++; 2277 refresh_count++;
… …
2296 * What the heck we'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2297 * if skipScroll is enabled. 2327 * if skipScroll is enabled.
2298 */ 2328 */
2299 if (refreshnow) 2329 if (refreshnow)
2300 { 2330 {
2301 flag = true;
2302 scr_refresh (); 2331 scr_refresh ();
2303 want_refresh = 1; 2332 want_refresh = 1;
2304 } 2333 }
2305
2306 } 2334 }
2307 else 2335 else
2308 { 2336 {
2309 try 2337 try
2310 { 2338 {
… …
2318 } 2346 }
2319 2347
2320 ch = NOCHAR; 2348 ch = NOCHAR;
2321 } 2349 }
2322 } 2350 }
2323
2324 return flag;
2325} 2351}
2326 2352
2327// read the next character 2353// read the next character
2328wchar_t 2354wchar_t ecb_hot
2329rxvt_term::next_char () NOTHROW 2355rxvt_term::next_char () NOTHROW
2330{ 2356{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2357 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2358 {
2333 // assume 7-bit to be ascii ALWAYS 2359 // assume 7-bit to be ascii ALWAYS
2334 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2361 return *cmdbuf_ptr++;
2336 2362
2337 wchar_t wc; 2363 wchar_t wc;
2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2364 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2339 2365
… …
2343 cmdbuf_ptr = cmdbuf_endp; 2369 cmdbuf_ptr = cmdbuf_endp;
2344 break; 2370 break;
2345 } 2371 }
2346 2372
2347 if (len == (size_t)-1) 2373 if (len == (size_t)-1)
2374 {
2375 mbstate.reset (); // reset now undefined conversion state
2376 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2377 // in which case we "erroneously" return the next byte which might be valid.
2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2379 }
2349 2380
2350 // assume wchar == unicode 2381 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2382 cmdbuf_ptr += len;
2352 return wc & UNICODE_MASK; 2383 return wc & UNICODE_MASK;
2353 } 2384 }
2354 2385
2355 return NOCHAR; 2386 return NOCHAR;
2356} 2387}
2357 2388
2358// read the next octet 2389// read the next octet
2359uint32_t 2390uint32_t ecb_hot
2360rxvt_term::next_octet () NOTHROW 2391rxvt_term::next_octet () NOTHROW
2361{ 2392{
2362 return cmdbuf_ptr < cmdbuf_endp 2393 return cmdbuf_ptr < cmdbuf_endp
2363 ? (unsigned char)*cmdbuf_ptr++ 2394 ? (unsigned char)*cmdbuf_ptr++
2364 : NOCHAR; 2395 : NOCHAR;
2365} 2396}
2366 2397
2367static class out_of_input out_of_input; 2398static class out_of_input out_of_input;
2368 2399
2369/* rxvt_cmd_getc () - Return next input character */ 2400wchar_t ecb_hot
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2401rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2402{
2377 wchar_t c = next_char (); 2403 wchar_t c = next_char ();
2378 2404
2379 if (c == NOCHAR) 2405 if (c == NOCHAR)
2380 throw out_of_input; 2406 throw out_of_input;
2381 2407
2382 return c; 2408 return c;
2383} 2409}
2384 2410
2385uint32_t 2411uint32_t ecb_hot
2386rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2412rxvt_term::cmd_get8 () THROW ((class out_of_input))
2387{ 2413{
2388 uint32_t c = next_octet (); 2414 uint32_t c = next_octet ();
2389 2415
2390 if (c == NOCHAR) 2416 if (c == NOCHAR)
… …
2394} 2420}
2395 2421
2396/*{{{ print pipe */ 2422/*{{{ print pipe */
2397/*----------------------------------------------------------------------*/ 2423/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2424#ifdef PRINTPIPE
2399FILE * 2425FILE * ecb_cold
2400rxvt_term::popen_printer () 2426rxvt_term::popen_printer ()
2401{ 2427{
2402 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2428 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2429
2404 if (stream == NULL) 2430 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2431 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2432
2407 return stream; 2433 return stream;
2408} 2434}
2409 2435
2410int 2436int ecb_cold
2411rxvt_term::pclose_printer (FILE *stream) 2437rxvt_term::pclose_printer (FILE *stream)
2412{ 2438{
2413 fflush (stream); 2439 fflush (stream);
2414 return pclose (stream); 2440 return pclose (stream);
2415} 2441}
2416 2442
2417/* 2443/*
2418 * simulate attached vt100 printer 2444 * simulate attached vt100 printer
2419 */ 2445 */
2420void 2446void ecb_cold
2421rxvt_term::process_print_pipe () 2447rxvt_term::process_print_pipe ()
2422{ 2448{
2423 int done; 2449 FILE *fd = popen_printer ();
2424 FILE *fd;
2425 2450
2426 if ((fd = popen_printer ()) == NULL) 2451 if (!fd)
2427 return; 2452 return;
2428 2453
2429 /* 2454 /*
2430 * Send all input to the printer until either ESC[4i or ESC[?4i 2455 * Send all input to the printer until either ESC[4i or ESC[?4i
2431 * is received. 2456 * is received.
2432 */ 2457 */
2433 for (done = 0; !done;) 2458 for (int done = 0; !done; )
2434 { 2459 {
2435 unsigned char buf[8]; 2460 unsigned char buf[8];
2436 unicode_t ch; 2461 unicode_t ch;
2437 unsigned int i, len; 2462 unsigned int i, len;
2438 2463
… …
2472 pclose_printer (fd); 2497 pclose_printer (fd);
2473} 2498}
2474#endif /* PRINTPIPE */ 2499#endif /* PRINTPIPE */
2475/*}}} */ 2500/*}}} */
2476 2501
2477/* *INDENT-OFF* */
2478enum { 2502enum {
2479 C1_40 = 0x40, 2503 C1_40 = 0x40,
2480 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2481 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2482 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2483 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2484}; 2508};
2485/* *INDENT-ON* */
2486 2509
2487/*{{{ process non-printing single characters */ 2510/*{{{ process non-printing single characters */
2488void 2511void ecb_hot
2489rxvt_term::process_nonprinting (unicode_t ch) 2512rxvt_term::process_nonprinting (unicode_t ch)
2490{ 2513{
2491 switch (ch) 2514 switch (ch)
2492 { 2515 {
2493 case C0_ESC: 2516 case C0_ESC:
… …
2523 scr_charset_choose (0); 2546 scr_charset_choose (0);
2524 break; 2547 break;
2525 2548
2526#ifdef EIGHT_BIT_CONTROLS 2549#ifdef EIGHT_BIT_CONTROLS
2527 // 8-bit controls 2550 // 8-bit controls
2528 case 0x90: /* DCS */ 2551 case 0x90: /* DCS */
2529 process_dcs_seq (); 2552 process_dcs_seq ();
2530 break; 2553 break;
2531 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
2532 process_csi_seq (); 2555 process_csi_seq ();
2533 break; 2556 break;
2534 case 0x9d: /* OSC */ 2557 case 0x9d: /* OSC */
2535 process_osc_seq (); 2558 process_osc_seq ();
2536 break; 2559 break;
2537#endif 2560#endif
2538 } 2561 }
2539} 2562}
2540/*}}} */ 2563/*}}} */
2541 2564
2542 2565
2543/*{{{ process VT52 escape sequences */ 2566/*{{{ process VT52 escape sequences */
2544void 2567void ecb_cold
2545rxvt_term::process_escape_vt52 (unicode_t ch) 2568rxvt_term::process_escape_vt52 (unicode_t ch)
2546{ 2569{
2547 int row, col; 2570 int row, col;
2548 2571
2549 switch (ch) 2572 switch (ch)
… …
2583 break; 2606 break;
2584 case 'Z': /* identify the terminal type */ 2607 case 'Z': /* identify the terminal type */
2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2608 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586 break; 2609 break;
2587 case '<': /* turn off VT52 mode */ 2610 case '<': /* turn off VT52 mode */
2588 PrivMode (0, PrivMode_vt52); 2611 priv_modes &= ~PrivMode_vt52;
2589 break; 2612 break;
2590 case 'F': /* use special graphics character set */ 2613 case 'F': /* use special graphics character set */
2591 case 'G': /* use regular character set */ 2614 case 'G': /* use regular character set */
2592 /* unimplemented */ 2615 /* unimplemented */
2593 break; 2616 break;
… …
2599} 2622}
2600/*}}} */ 2623/*}}} */
2601 2624
2602 2625
2603/*{{{ process escape sequences */ 2626/*{{{ process escape sequences */
2604void 2627void ecb_hot
2605rxvt_term::process_escape_seq () 2628rxvt_term::process_escape_seq ()
2606{ 2629{
2607 unicode_t ch = cmd_getc (); 2630 unicode_t ch = cmd_getc ();
2608 2631
2609 if (priv_modes & PrivMode_vt52) 2632 if (priv_modes & PrivMode_vt52)
… …
2612 return; 2635 return;
2613 } 2636 }
2614 2637
2615 switch (ch) 2638 switch (ch)
2616 { 2639 {
2617 /* case 1: do_tek_mode (); break; */
2618 case '#': 2640 case '#':
2619 if (cmd_getc () == '8') 2641 if (cmd_getc () == '8')
2620 scr_E (); 2642 scr_E ();
2621 break; 2643 break;
2622 case '(': 2644 case '(':
… …
2645#if !ENABLE_MINIMAL 2667#if !ENABLE_MINIMAL
2646 case '9': 2668 case '9':
2647 scr_forwardindex (); 2669 scr_forwardindex ();
2648 break; 2670 break;
2649#endif 2671#endif
2672 // DECPAM/DECPNM
2650 case '=': 2673 case '=':
2674 priv_modes |= PrivMode_aplKP;
2675 break;
2651 case '>': 2676 case '>':
2652 PrivMode ((ch == '='), PrivMode_aplKP); 2677 priv_modes &= ~PrivMode_aplKP;
2653 break; 2678 break;
2654 2679
2655 case C1_40: 2680 case C1_40:
2656 cmd_getc (); 2681 cmd_getc ();
2657 break; 2682 break;
… …
2661 2686
2662 /* 8.3.87: NEXT LINE */ 2687 /* 8.3.87: NEXT LINE */
2663 case C1_NEL: /* ESC E */ 2688 case C1_NEL: /* ESC E */
2664 { 2689 {
2665 wchar_t nlcr[] = { C0_LF, C0_CR }; 2690 wchar_t nlcr[] = { C0_LF, C0_CR };
2666 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2667 } 2692 }
2668 break; 2693 break;
2669 2694
2670 /* kidnapped escape sequence: Should be 8.3.48 */ 2695 /* kidnapped escape sequence: Should be 8.3.48 */
2671 case C1_ESA: /* ESC G */ 2696 case C1_ESA: /* ESC G */
2672 process_graphics (); 2697 // used by original rxvt for rob nations own graphics mode
2698 if (cmd_getc () == 'Q' && option (Opt_insecure))
2699 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2673 break; 2700 break;
2674 2701
2675 /* 8.3.63: CHARACTER TABULATION SET */ 2702 /* 8.3.63: CHARACTER TABULATION SET */
2676 case C1_HTS: /* ESC H */ 2703 case C1_HTS: /* ESC H */
2677 scr_set_tab (1); 2704 scr_set_tab (1);
… …
2681 case C1_RI: /* ESC M */ 2708 case C1_RI: /* ESC M */
2682 scr_index (DN); 2709 scr_index (DN);
2683 break; 2710 break;
2684 2711
2685 /* 8.3.142: SINGLE-SHIFT TWO */ 2712 /* 8.3.142: SINGLE-SHIFT TWO */
2686 /*case C1_SS2: scr_single_shift (2); break; */ 2713 /* case C1_SS2: break; */
2687 2714
2688 /* 8.3.143: SINGLE-SHIFT THREE */ 2715 /* 8.3.143: SINGLE-SHIFT THREE */
2689 /*case C1_SS3: scr_single_shift (3); break; */ 2716 /* case C1_SS3: break; */
2690 2717
2691 /* 8.3.27: DEVICE CONTROL STRING */ 2718 /* 8.3.27: DEVICE CONTROL STRING */
2692 case C1_DCS: /* ESC P */ 2719 case C1_DCS: /* ESC P */
2693 process_dcs_seq (); 2720 process_dcs_seq ();
2694 break; 2721 break;
… …
2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2723 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2697 case C1_SCI: /* ESC Z */ 2724 case C1_SCI: /* ESC Z */
2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2725 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2699 break; /* steal obsolete ESC [ c */ 2726 break; /* steal obsolete ESC [ c */
2700 2727
2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2728 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2702 case C1_CSI: /* ESC [ */ 2729 case C1_CSI: /* ESC [ */
2703 process_csi_seq (); 2730 process_csi_seq ();
2704 break; 2731 break;
2705 2732
2706 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2733 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2707 case C1_OSC: /* ESC ] */ 2734 case C1_OSC: /* ESC ] */
2708 process_osc_seq (); 2735 process_osc_seq ();
2709 break; 2736 break;
2710 2737
2711 /* 8.3.106: RESET TO INITIAL STATE */ 2738 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2712 case 'c': 2739 case 'c':
2713 mbstate.reset (); 2740 mbstate.reset ();
2714 scr_poweron (); 2741 scr_poweron ();
2715 scrollbar_show (1); 2742 scrollBar.show (1);
2716 break; 2743 break;
2717 2744
2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2745 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2719 case 'n': 2746 case 'n':
2720 scr_charset_choose (2); 2747 scr_charset_choose (2);
… …
2727 } 2754 }
2728} 2755}
2729/*}}} */ 2756/*}}} */
2730 2757
2731/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2758/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2732/* *INDENT-OFF* */
2733enum { 2759enum {
2734 CSI_ICH = 0x40, 2760 CSI_ICH = 0x40,
2735 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2761 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2736 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2762 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2737 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2763 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2740 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2766 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2741 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2767 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2742 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2768 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2743}; 2769};
2744 2770
2745#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2747 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2748#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
2749 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750 2776
2751const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
2752 { 2778 {
2753 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2779 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2754 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2780 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2755 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2781 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2756 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2782 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2757 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2783 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2758 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2784 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2759 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2785 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2760 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2786 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2761 }; 2787 };
2762/* *INDENT-ON* */
2763 2788
2764void 2789void ecb_hot
2765rxvt_term::process_csi_seq () 2790rxvt_term::process_csi_seq ()
2766{ 2791{
2767 unicode_t ch, priv, i; 2792 unicode_t ch, priv, prev_ch, i;
2768 unsigned int nargs, p; 2793 unsigned int nargs, p;
2769 int n, ndef; 2794 int n, ndef;
2770 int arg[ESC_ARGS] = { }; 2795 int arg[ESC_ARGS] = { };
2771 2796
2772 nargs = 0; 2797 nargs = 0;
2773 2798
2774 priv = 0; 2799 priv = 0;
2775 ch = cmd_getc (); 2800 ch = cmd_getc ();
2776 if (ch >= '<' && ch <= '?') 2801 if ((ch >= '<' && ch <= '?') || ch == '!')
2777 { 2802 {
2778 /* '<' '=' '>' '?' */ 2803 /* '<' '=' '>' '?' '!' */
2779 priv = ch; 2804 priv = ch;
2780 ch = cmd_getc (); 2805 ch = cmd_getc ();
2781 } 2806 }
2782 2807
2808 prev_ch = 0;
2783 /* read any numerical arguments */ 2809 /* read any numerical arguments */
2784 for (n = -1; ch < CSI_ICH; ) 2810 for (n = -1; ch < CSI_ICH; )
2785 { 2811 {
2786 if (isdigit (ch)) 2812 if (isdigit (ch))
2787 { 2813 {
… …
2797 n = -1; 2823 n = -1;
2798 } 2824 }
2799 else if (IS_CONTROL (ch)) 2825 else if (IS_CONTROL (ch))
2800 process_nonprinting (ch); 2826 process_nonprinting (ch);
2801 2827
2828 prev_ch = ch;
2802 ch = cmd_getc (); 2829 ch = cmd_getc ();
2803 } 2830 }
2804 2831
2805 if (ch > CSI_7F) 2832 if (ch > CSI_7F)
2806 return; 2833 return;
… …
2837 2864
2838 case '?': 2865 case '?':
2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2840 process_terminal_mode (ch, priv, nargs, arg); 2867 process_terminal_mode (ch, priv, nargs, arg);
2841 break; 2868 break;
2869
2870 case '!':
2871 if (ch == CSI_70)
2872 {
2873 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2874 scr_soft_reset ();
2875
2876 static const int pm_h[] = { 7, 25 };
2877 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2878
2879 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2880 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2842 } 2881 }
2882 break;
2883 }
2884
2843 return; 2885 return;
2844 } 2886 }
2845 2887
2846 switch (ch) 2888 switch (ch)
2847 { 2889 {
… …
2861 } 2903 }
2862 break; 2904 break;
2863#endif 2905#endif
2864 2906
2865 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2907 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2866 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2908 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2867 arg[0] = -arg[0]; 2909 arg[0] = -arg[0];
2868 /* FALLTHROUGH */ 2910 /* FALLTHROUGH */
2869 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2911 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2870 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2912 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2871 scr_gotorc (arg[0], 0, RELATIVE); 2913 scr_gotorc (arg[0], 0, RELATIVE);
2872 break; 2914 break;
2873 2915
2874 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2916 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2875 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2917 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2876#ifdef ISO6429 2918#ifdef ISO6429
2877 arg[0] = -arg[0]; 2919 arg[0] = -arg[0];
2878#else /* emulate common DEC VTs */ 2920#else /* emulate common DEC VTs */
2879 arg[0] = arg[0] ? -arg[0] : -1; 2921 arg[0] = arg[0] ? -arg[0] : -1;
2880#endif 2922#endif
… …
3025 scr_insert_mode (1); 3067 scr_insert_mode (1);
3026 else if (arg[0] == 20) 3068 else if (arg[0] == 20)
3027 priv_modes |= PrivMode_LFNL; 3069 priv_modes |= PrivMode_LFNL;
3028 break; 3070 break;
3029 3071
3072 case CSI_71: // DECSCUSR: set cursor style
3073 if (prev_ch == ' ')
3074 set_cursor_style (arg[0]);
3075 break;
3076
3030 /* 3077 /*
3031 * PRIVATE USE beyond this point. All CSI_7? sequences here 3078 * PRIVATE USE beyond this point. All CSI_7? sequences here
3032 */ 3079 */
3033 case CSI_72: /* DECSTBM: set top and bottom margins */ 3080 case CSI_72: /* DECSTBM: set top and bottom margins */
3034 if (nargs == 1) 3081 if (nargs == 1)
… …
3062 } 3109 }
3063} 3110}
3064/*}}} */ 3111/*}}} */
3065 3112
3066#if !ENABLE_MINIMAL 3113#if !ENABLE_MINIMAL
3067/* ARGSUSED */
3068void 3114void
3069rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3115rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3070{ 3116{
3071 int x, y; 3117 int x, y;
3072 XWindowAttributes wattr; 3118 XWindowAttributes wattr;
… …
3081 { 3127 {
3082 /* 3128 /*
3083 * commands 3129 * commands
3084 */ 3130 */
3085 case 1: /* deiconify window */ 3131 case 1: /* deiconify window */
3086 XMapWindow (dpy, parent[0]); 3132 XMapWindow (dpy, parent);
3087 break; 3133 break;
3088 case 2: /* iconify window */ 3134 case 2: /* iconify window */
3089 XIconifyWindow (dpy, parent[0], display->screen); 3135 XIconifyWindow (dpy, parent, display->screen);
3090 break; 3136 break;
3091 case 3: /* set position (pixels) */ 3137 case 3: /* set position (pixels) */
3092 XMoveWindow (dpy, parent[0], args[1], args[2]); 3138 XMoveWindow (dpy, parent, args[1], args[2]);
3093 break; 3139 break;
3094 case 4: /* set size (pixels) */ 3140 case 4: /* set size (pixels) */
3095 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3141 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3096 break; 3142 break;
3097 case 5: /* raise window */ 3143 case 5: /* raise window */
3098 XRaiseWindow (dpy, parent[0]); 3144 XRaiseWindow (dpy, parent);
3099 break; 3145 break;
3100 case 6: /* lower window */ 3146 case 6: /* lower window */
3101 XLowerWindow (dpy, parent[0]); 3147 XLowerWindow (dpy, parent);
3102 break; 3148 break;
3103 case 7: /* refresh window */ 3149 case 7: /* refresh window */
3104 scr_touch (true); 3150 scr_touch (true);
3105 break; 3151 break;
3106 case 8: /* set size (chars) */ 3152 case 8: /* set size (chars) */
… …
3109 break; 3155 break;
3110 3156
3111 //case 9: NYI, TODO, restore maximized window or maximize window 3157 //case 9: NYI, TODO, restore maximized window or maximize window
3112 default: 3158 default:
3113 if (args[0] >= 24) /* set height (chars) */ 3159 if (args[0] >= 24) /* set height (chars) */
3114 set_widthheight ((unsigned int)width, 3160 set_widthheight ((unsigned int)vt_width,
3115 (unsigned int) (args[1] * fheight)); 3161 (unsigned int) (args[1] * fheight));
3116 break; 3162 break;
3117 3163
3118 /* 3164 /*
3119 * reports - some output format copied from XTerm 3165 * reports - some output format copied from XTerm
3120 */ 3166 */
3121 case 11: /* report window state */ 3167 case 11: /* report window state */
3122 XGetWindowAttributes (dpy, parent[0], &wattr); 3168 XGetWindowAttributes (dpy, parent, &wattr);
3123 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3169 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3124 break; 3170 break;
3125 case 13: /* report window position */ 3171 case 13: /* report window position */
3126 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3127 XTranslateCoordinates (dpy, parent[0], wattr.root, 3173 XTranslateCoordinates (dpy, parent, wattr.root,
3128 -wattr.border_width, -wattr.border_width, 3174 -wattr.border_width, -wattr.border_width,
3129 &x, &y, &wdummy); 3175 &x, &y, &wdummy);
3130 tt_printf ("\033[3;%d;%dt", x, y); 3176 tt_printf ("\033[3;%d;%dt", x, y);
3131 break; 3177 break;
3132 case 14: /* report window size (pixels) */ 3178 case 14: /* report window size (pixels) */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3134 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3180 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3135 break; 3181 break;
3136 case 18: /* report text area size (chars) */ 3182 case 18: /* report text area size (chars) */
3137 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3183 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3138 break; 3184 break;
… …
3140 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3141 break; 3187 break;
3142 case 20: /* report icon label */ 3188 case 20: /* report icon label */
3143 { 3189 {
3144 char *s; 3190 char *s;
3145 XGetIconName (dpy, parent[0], &s); 3191 XGetIconName (dpy, parent, &s);
3146 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3147 XFree (s); 3193 XFree (s);
3148 } 3194 }
3149 break; 3195 break;
3150 case 21: /* report window title */ 3196 case 21: /* report window title */
3151 { 3197 {
3152 char *s; 3198 char *s;
3153 XFetchName (dpy, parent[0], &s); 3199 XFetchName (dpy, parent, &s);
3154 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3200 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3155 XFree (s); 3201 XFree (s);
3156 } 3202 }
3157 break; 3203 break;
3158 } 3204 }
… …
3168rxvt_term::get_to_st (unicode_t &ends_how) 3214rxvt_term::get_to_st (unicode_t &ends_how)
3169{ 3215{
3170 unicode_t ch; 3216 unicode_t ch;
3171 bool seen_esc = false; 3217 bool seen_esc = false;
3172 unsigned int n = 0; 3218 unsigned int n = 0;
3173 wchar_t string[STRING_MAX]; 3219 wchar_t string[CBUFSIZ];
3174 3220
3175 while ((ch = cmd_getc ()) != NOCHAR) 3221 while ((ch = cmd_getc ()) != NOCHAR)
3176 { 3222 {
3177 if (seen_esc) 3223 if (seen_esc)
3178 { 3224 {
… …
3193 else if (ch < 0x20) 3239 else if (ch < 0x20)
3194 return NULL; /* other control character - exit */ 3240 return NULL; /* other control character - exit */
3195 3241
3196 seen_esc = false; 3242 seen_esc = false;
3197 3243
3198 if (n >= STRING_MAX - 1) 3244 if (n >= sizeof (string) - 1)
3199 // stop at some sane length 3245 // stop at some sane length
3200 return NULL; 3246 return NULL;
3201 3247
3202 string[n++] = ch; 3248 string[n++] = ch;
3203 } 3249 }
… …
3214 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3260 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3215 */ 3261 */
3216void 3262void
3217rxvt_term::process_dcs_seq () 3263rxvt_term::process_dcs_seq ()
3218{ 3264{
3219 char *s;
3220 unicode_t eh;
3221
3222 /* 3265 /*
3223 * Not handled yet 3266 * Not handled yet
3224 */ 3267 */
3268
3269 unicode_t eh;
3225 s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3226 if (s) 3271 if (s)
3227 free (s); 3272 free (s);
3228 3273
3229 return; 3274 return;
3230} 3275}
… …
3234 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3279 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3235 */ 3280 */
3236void 3281void
3237rxvt_term::process_osc_seq () 3282rxvt_term::process_osc_seq ()
3238{ 3283{
3239 unicode_t ch, eh;
3240 int arg; 3284 int arg;
3241 3285
3242 ch = cmd_getc (); 3286 unicode_t ch = cmd_getc ();
3243 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3244 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3245 3289
3246 if (ch == ';') 3290 if (ch == ';')
3247 { 3291 {
3292 unicode_t eh;
3248 char *s = get_to_st (eh); 3293 char *s = get_to_st (eh);
3249 3294
3250 if (s) 3295 if (s)
3251 { 3296 {
3252 process_xterm_seq (arg, s, eh); 3297 process_xterm_seq (arg, s, eh);
3253 free (s); 3298 free (s);
3254 } 3299 }
3255 } 3300 }
3256} 3301}
3257 3302
3303static unsigned int
3304colorcube_index (unsigned int idx_r,
3305 unsigned int idx_g,
3306 unsigned int idx_b)
3307{
3308 assert (idx_r < Red_levels);
3309 assert (idx_g < Green_levels);
3310 assert (idx_b < Blue_levels);
3311
3312 return idx_r * Blue_levels * Green_levels +
3313 idx_g * Blue_levels +
3314 idx_b;
3315}
3316
3317/*
3318 * Find the nearest color slot in the hidden color cube,
3319 * adapt its value to the 32bit RGBA color.
3320 */
3321unsigned int
3322rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3323{
3324 r &= 0xff;
3325 g &= 0xff;
3326 b &= 0xff;
3327 a &= 0xff;
3328
3329 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3330
3331 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3332 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3333 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3334 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3335
3336 /* we allow one of the 6 directly neighbouring colours */
3337 /* to replace the current color, if they not used recently */
3338 static const signed char dxyz[][3] = {
3339 0, 0, 0,
3340 0, 0, +1,
3341 0, 0, -1,
3342 0, +1, 0,
3343 0, -1, 0,
3344 +1, 0, 0,
3345 -1, 0, 0,
3346 };
3347
3348 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3349 {
3350 int r = idx_r + dxyz[n][0];
3351 int g = idx_g + dxyz[n][1];
3352 int b = idx_b + dxyz[n][2];
3353
3354 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3355 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3356 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3357
3358 unsigned int index = colorcube_index (r, g, b);
3359
3360 if (rgb24_color[index] == color)
3361 {
3362 rgb24_seqno[index] = ++rgb24_sequence;
3363 return index + minTermCOLOR24;
3364 }
3365
3366 // minor issue: could update index 0 few more times
3367 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3368 {
3369 idx = index;
3370 goto update;
3371 }
3372
3373 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3374 // but also handles wrap around values good enough
3375 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3376 idx = index;
3377 }
3378
3379update:
3380 rgb24_color[idx] = color;
3381 rgb24_seqno[idx] = ++rgb24_sequence;
3382
3383 idx += minTermCOLOR24;
3384 pix_colors_focused [idx].free (this);
3385 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3386 update_fade_color (idx, false);
3387
3388 return idx;
3389}
3390
3258void 3391void
3259rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3392rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3260{ 3393{
3261 if (str[0] == '?' && !str[1]) 3394 if (str[0] == '?' && !str[1])
3262 { 3395 {
3263 rgba c; 3396 rgba c;
3264 pix_colors_focused[color].get (c); 3397 pix_colors_focused[color].get (c);
3265 3398
3266#if XFT 3399#if XFT
3267 if (c.a != rgba::MAX_CC) 3400 if (c.a != rgba::MAX_CC)
3268 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3401 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3269 else 3402 else
3270#endif 3403#endif
3271 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3404 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3272 } 3405 }
3273 else 3406 else
… …
3276 3409
3277/* 3410/*
3278 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3411 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3279 */ 3412 */
3280void 3413void
3281rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3414rxvt_term::process_xterm_seq (int op, char *str, char resp)
3282{ 3415{
3283 int color; 3416 int color;
3284 char *buf, *name; 3417 char *buf, *name;
3285 bool query = str[0] == '?' && !str[1]; 3418 bool query = str[0] == '?' && !str[1];
3286 int saveop = op; 3419 int saveop = op;
… …
3313 unsigned long bytes_after; 3446 unsigned long bytes_after;
3314 unsigned char *value = 0; 3447 unsigned char *value = 0;
3315 const char *str = ""; 3448 const char *str = "";
3316 3449
3317 if (prop 3450 if (prop
3318 && XGetWindowProperty (dpy, parent[0], 3451 && XGetWindowProperty (dpy, parent,
3319 prop, 0, 1<<16, 0, AnyPropertyType, 3452 prop, 0, 1<<16, 0, AnyPropertyType,
3320 &actual_type, &actual_format, 3453 &actual_type, &actual_format,
3321 &nitems, &bytes_after, &value) == Success 3454 &nitems, &bytes_after, &value) == Success
3322 && actual_type != None 3455 && actual_type != None
3323 && actual_format == 8) 3456 && actual_format == 8)
3324 str = (const char *)(value); 3457 str = (const char *)(value);
3325 3458
3326 tt_printf ("\033]%d;%s%c", op, str, resp); 3459 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3327 3460
3328 XFree (value); 3461 XFree (value);
3329 } 3462 }
3330 else 3463 else
3331 { 3464 {
3332 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3465 char *eq = strchr (str, '=');
3333 3466
3334 if (eq) 3467 if (eq)
3335 { 3468 {
3336 *eq = 0; 3469 *eq = 0;
3337 set_utf8_property (display->atom (str), eq + 1); 3470 set_utf8_property (display->atom (str), eq + 1);
3338 } 3471 }
3339 else 3472 else
3340 XDeleteProperty (dpy, parent[0], 3473 XDeleteProperty (dpy, parent,
3341 display->atom (str)); 3474 display->atom (str));
3342 } 3475 }
3343 break; 3476 break;
3344 3477
3345 case XTerm_Color: 3478 case XTerm_Color:
… …
3377 process_color_seq (op, Color_pointer_fg, str, resp); 3510 process_color_seq (op, Color_pointer_fg, str, resp);
3378 break; 3511 break;
3379 case XTerm_Color_pointer_bg: 3512 case XTerm_Color_pointer_bg:
3380 process_color_seq (op, Color_pointer_bg, str, resp); 3513 process_color_seq (op, Color_pointer_bg, str, resp);
3381 break; 3514 break;
3515#ifdef OPTION_HC
3516 case XTerm_Color_HC:
3517 process_color_seq (op, Color_HC, str, resp);
3518 break;
3519 case XTerm_Color_HTC:
3520 process_color_seq (op, Color_HTC, str, resp);
3521 break;
3522#endif
3382#ifndef NO_BOLD_UNDERLINE_REVERSE 3523#ifndef NO_BOLD_UNDERLINE_REVERSE
3383 case XTerm_Color_RV:
3384 process_color_seq (op, Color_RV, str, resp);
3385 break;
3386 case Rxvt_Color_BD:
3387 case URxvt_Color_BD: 3524 case URxvt_Color_BD:
3388 process_color_seq (op, Color_BD, str, resp); 3525 process_color_seq (op, Color_BD, str, resp);
3389 break; 3526 break;
3390 case Rxvt_Color_UL:
3391 case URxvt_Color_UL: 3527 case URxvt_Color_UL:
3392 process_color_seq (op, Color_UL, str, resp); 3528 process_color_seq (op, Color_UL, str, resp);
3393 break; 3529 break;
3394 case URxvt_Color_IT: 3530 case URxvt_Color_IT:
3395 process_color_seq (op, Color_IT, str, resp); 3531 process_color_seq (op, Color_IT, str, resp);
3396 break; 3532 break;
3397#endif 3533#endif
3398#if ENABLE_TRANSPARENCY
3399 case URxvt_Color_tint: 3534 case URxvt_Color_border:
3400 process_color_seq (op, Color_tint, str, resp); 3535 process_color_seq (op, Color_border, str, resp);
3401 {
3402 bool changed = false;
3403
3404 if (ISSET_PIXCOLOR (Color_tint))
3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3406 else
3407 changed = bgPixmap.unset_tint ();
3408
3409 if (changed)
3410 update_background ();
3411 }
3412
3413 break; 3536 break;
3414#endif
3415
3416#if BG_IMAGE_FROM_FILE
3417 case Rxvt_Pixmap:
3418 if (!strcmp (str, "?"))
3419 {
3420 char str[256];
3421
3422 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3423 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3424 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3425 process_xterm_seq (XTerm_title, str, CHAR_ST);
3426 }
3427 else
3428 {
3429 int changed = 0;
3430
3431 if (*str != ';')
3432 {
3433 /* reset to default scaling :*/
3434 bgPixmap.unset_geometry ();
3435 if (bgPixmap.set_file (str)) /* change pixmap */
3436 changed++;
3437 str = strchr (str, ';');
3438 if (str == NULL)
3439 bgPixmap.set_defaultGeometry ();
3440 }
3441
3442 while (str)
3443 {
3444 str++;
3445 if (bgPixmap.set_geometry (str))
3446 changed++;
3447 str = strchr (str, ';');
3448 }
3449
3450 if (changed)
3451 update_background ();
3452 }
3453 break;
3454#endif
3455 3537
3456 case XTerm_logfile: 3538 case XTerm_logfile:
3457 // TODO, when secure mode? 3539 // TODO, when secure mode?
3458 break; 3540 break;
3459 3541
… …
3526 break; 3608 break;
3527#endif 3609#endif
3528 3610
3529#if ENABLE_PERL 3611#if ENABLE_PERL
3530 case URxvt_perl: 3612 case URxvt_perl:
3531 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3613 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3532 ; // no responses yet
3533 break; 3614 break;
3534#endif 3615#endif
3535 } 3616 }
3536} 3617}
3537/*----------------------------------------------------------------------*/ 3618/*----------------------------------------------------------------------*/
… …
3544 * 's' = save 3625 * 's' = save
3545 * 'r' = restore 3626 * 'r' = restore
3546 * 't' = toggle 3627 * 't' = toggle
3547 * so no need for fancy checking 3628 * so no need for fancy checking
3548 */ 3629 */
3549int 3630int ecb_cold
3550rxvt_term::privcases (int mode, unsigned long bit) 3631rxvt_term::privcases (int mode, unsigned long bit)
3551{ 3632{
3552 int state; 3633 int state;
3553 3634
3554 if (mode == 's') 3635 if (mode == 's')
3555 { 3636 {
3556 SavedModes |= (priv_modes & bit); 3637 if (priv_modes & bit)
3638 SavedModes |= bit;
3639 else
3640 SavedModes &= ~bit;
3557 return -1; 3641 return -1;
3558 } 3642 }
3559 else 3643 else
3560 { 3644 {
3561 if (mode == 'r') 3645 if (mode == 'r')
3562 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3646 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3563 else 3647 else
3564 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3648 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3565 PrivMode (state, bit); 3649
3650 if (state)
3651 priv_modes |= bit;
3652 else
3653 priv_modes &= ~bit;
3566 } 3654 }
3567 3655
3568 return state; 3656 return state;
3569} 3657}
3570 3658
3571/* we're not using priv _yet_ */ 3659/* we're not using priv _yet_ */
3572void 3660void
3573rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3661rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3574{ 3662{
3575 unsigned int i, j; 3663 unsigned int i, j;
3576 int state; 3664 int state;
3577 3665
3578 static const struct 3666 static const struct
3579 { 3667 {
3580 const int argval; 3668 const int argval;
3581 const unsigned long bit; 3669 const unsigned long bit;
3582 } argtopriv[] = { 3670 } argtopriv[] = {
3583 { 1, PrivMode_aplCUR }, 3671 { 1, PrivMode_aplCUR }, // DECCKM
3584 { 2, PrivMode_vt52 }, 3672 { 2, PrivMode_vt52 }, // DECANM
3585 { 3, PrivMode_132 }, 3673 { 3, PrivMode_132 }, // DECCOLM
3586 { 4, PrivMode_smoothScroll }, 3674 { 4, PrivMode_smoothScroll }, // DECSCLM
3587 { 5, PrivMode_rVideo }, 3675 { 5, PrivMode_rVideo }, // DECSCNM
3588 { 6, PrivMode_relOrigin }, 3676 { 6, PrivMode_relOrigin }, // DECOM
3589 { 7, PrivMode_Autowrap }, 3677 { 7, PrivMode_Autowrap }, // DECAWM
3590 // 8, bi-directional support mode 3678 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3679 { 9, PrivMode_MouseX10 },
3592 // 18, 19 printing-related
3593 { 25, PrivMode_VisibleCursor }, 3680 { 12, PrivMode_BlinkingCursor },
3681 // 18 end FF to printer after print screen
3682 // 19 Print screen prints full screen/scroll region
3683 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3594#ifdef scrollBar_esc 3684#ifdef scrollBar_esc
3595 { scrollBar_esc, PrivMode_scrollBar }, 3685 { scrollBar_esc, PrivMode_scrollBar },
3596#endif 3686#endif
3597 { 35, PrivMode_ShiftKeys }, // rxvt extension 3687 { 35, PrivMode_ShiftKeys }, // rxvt extension
3688 // 38, tektronix mode // DECTEK
3598 { 40, PrivMode_132OK }, 3689 { 40, PrivMode_132OK },
3599 // 41 xterm more fixes NYI 3690 // 41 xterm more fixes NYI
3600 // 45 margin bell NYI 3691 // 45 margin bell NYI
3601 // 46 start logging 3692 // 46 start logging
3602 { 47, PrivMode_Screen }, 3693 { 47, PrivMode_Screen },
3603 { 66, PrivMode_aplKP }, 3694 { 66, PrivMode_aplKP }, // DECNKM
3604#ifndef NO_BACKSPACE_KEY 3695#ifndef NO_BACKSPACE_KEY
3605 { 67, PrivMode_BackSpace }, 3696 { 67, PrivMode_BackSpace }, // DECBKM
3606#endif 3697#endif
3607 { 1000, PrivMode_MouseX11 }, 3698 { 1000, PrivMode_MouseX11 },
3608 { 1002, PrivMode_MouseBtnEvent }, 3699 { 1002, PrivMode_MouseBtnEvent },
3609 { 1003, PrivMode_MouseAnyEvent }, 3700 { 1003, PrivMode_MouseAnyEvent },
3701#if ENABLE_FRILLS
3702 { 1004, PrivMode_FocusEvent },
3703 { 1005, PrivMode_ExtModeMouse },
3704#endif
3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3705 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3611 { 1011, PrivMode_Keypress }, // rxvt extension 3706 { 1011, PrivMode_Keypress }, // rxvt extension
3707#if ENABLE_FRILLS
3708 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3709#endif
3612 // 1035 enable modifiers for alt, numlock NYI 3710 // 1035 enable modifiers for alt, numlock NYI
3613 // 1036 send ESC for meta keys NYI 3711 // 1036 send ESC for meta keys NYI
3614 // 1037 send DEL for keypad delete NYI 3712 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3713 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3714 // 1048 save and restore cursor, implemented in code
3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3715 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3716 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste }, 3717 { 2004, PrivMode_BracketPaste },
3620 }; 3718 };
3621 3719
… …
3631 for (i = 0; i < nargs; i++) 3729 for (i = 0; i < nargs; i++)
3632 { 3730 {
3633 state = -1; 3731 state = -1;
3634 3732
3635 /* basic handling */ 3733 /* basic handling */
3636 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3734 for (j = 0; j < ecb_array_length (argtopriv); j++)
3637 if (argtopriv[j].argval == arg[i]) 3735 if (argtopriv[j].argval == arg[i])
3638 { 3736 {
3639 state = privcases (mode, argtopriv[j].bit); 3737 state = privcases (mode, argtopriv[j].bit);
3640 break; 3738 break;
3641 } 3739 }
… …
3649 3747
3650 scr_touch (true); 3748 scr_touch (true);
3651 break; 3749 break;
3652#endif 3750#endif
3653 case 1048: /* alternative cursor save */ 3751 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3656 if (mode == 0) 3753 if (mode == 0)
3657 scr_cursor (RESTORE); 3754 scr_cursor (RESTORE);
3658 else if (mode == 1) 3755 else if (mode == 1)
3659 scr_cursor (SAVE); 3756 scr_cursor (SAVE);
… …
3668 case 2: /* VT52 mode */ 3765 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3766 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3767 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3768 * within VT52 mode
3672 */ 3769 */
3673 PrivMode (1, PrivMode_vt52); 3770 priv_modes |= PrivMode_vt52;
3674 break; 3771 break;
3675 case 3: /* 80/132 */ 3772 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3773 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3774 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3680 }
3681 break; 3775 break;
3682 case 4: /* smooth scrolling */ 3776 case 4: /* smooth scrolling */
3683 set_option (Opt_jumpScroll, !state); 3777 set_option (Opt_jumpScroll, !state);
3684 break; 3778 break;
3685 case 5: /* reverse video */ 3779 case 5: /* reverse video */
… …
3696 if (state) /* orthogonal */ 3790 if (state) /* orthogonal */
3697 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3791 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3698 break; 3792 break;
3699#ifdef scrollBar_esc 3793#ifdef scrollBar_esc
3700 case scrollBar_esc: 3794 case scrollBar_esc:
3701 if (scrollbar_mapping (state)) 3795 scrollBar.map (state);
3702 {
3703 resize_all_windows (0, 0, 0); 3796 resize_all_windows (0, 0, 0);
3704 scr_touch (true); 3797 scr_touch (true);
3705 } 3798 break;
3799#endif
3800#ifdef CURSOR_BLINK
3801 case 12:
3802 cursor_blink_reset ();
3706 break; 3803 break;
3707#endif 3804#endif
3708 case 25: /* visible/invisible cursor */ 3805 case 25: /* visible/invisible cursor */
3709 scr_cursor_visible (state); 3806 scr_cursor_visible (state);
3710 break; 3807 break;
… …
3723 case 1003: 3820 case 1003:
3724 if (state) 3821 if (state)
3725 { 3822 {
3726 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3823 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3727 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3824 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3825 mouse_row = mouse_col = 0;
3728 vt_emask_mouse = PointerMotionMask; 3826 vt_emask_mouse = PointerMotionMask;
3729 } 3827 }
3730 else 3828 else
3731 vt_emask_mouse = NoEventMask; 3829 vt_emask_mouse = NoEventMask;
3830
3732 vt_select_input (); 3831 vt_select_input ();
3733 break; 3832 break;
3734 case 1010: /* scroll to bottom on TTY output inhibit */ 3833 case 1010: /* scroll to bottom on TTY output inhibit */
3735 set_option (Opt_scrollTtyOutput, !state); 3834 set_option (Opt_scrollTtyOutput, !state);
3736 break; 3835 break;
3737 case 1011: /* scroll to bottom on key press */ 3836 case 1011: /* scroll to bottom on key press */
3738 set_option (Opt_scrollTtyKeypress, state); 3837 set_option (Opt_scrollTtyKeypress, state);
3739 break; 3838 break;
3740 case 1047: /* secondary screen w/ clearing last */ 3839 case 1047: /* secondary screen w/ clearing last */
3741 if (option (Opt_secondaryScreen)) 3840 if (option (Opt_secondaryScreen))
3742 if (current_screen != PRIMARY) 3841 if (!state)
3743 scr_erase_screen (2); 3842 scr_erase_screen (2);
3843
3744 scr_change_screen (state); 3844 scr_change_screen (state);
3745 break; 3845 break;
3746 case 1049: /* secondary screen w/ clearing first */ 3846 case 1049: /* secondary screen w/ clearing first */
3847 if (option (Opt_secondaryScreen))
3848 if (state)
3849 scr_cursor (SAVE);
3850
3747 scr_change_screen (state); 3851 scr_change_screen (state);
3852
3748 if (option (Opt_secondaryScreen)) 3853 if (option (Opt_secondaryScreen))
3749 if (current_screen != PRIMARY) 3854 if (state)
3750 scr_erase_screen (2); 3855 scr_erase_screen (2);
3856 else
3857 scr_cursor (RESTORE);
3751 break; 3858 break;
3752 default: 3859 default:
3753 break; 3860 break;
3754 } 3861 }
3755 } 3862 }
3756} 3863}
3757/*}}} */ 3864/*}}} */
3758 3865
3759/*{{{ process sgr sequences */ 3866/*{{{ process sgr sequences */
3760void 3867void ecb_hot
3761rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3868rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3762{ 3869{
3763 unsigned int i; 3870 unsigned int i;
3764 short rendset; 3871 short rendset;
3765 int rendstyle; 3872 int rendstyle;
… …
3807 //case 19: // ninth alt font 3914 //case 19: // ninth alt font
3808 //case 20: // gothic 3915 //case 20: // gothic
3809 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3916 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3810 rendset = 0, rendstyle = RS_Bold; 3917 rendset = 0, rendstyle = RS_Bold;
3811 break; 3918 break;
3812 case 22: // normal intensity 3919 case 22: // bold off (vt220)
3813 rendset = 0, rendstyle = RS_Bold; 3920 rendset = 0, rendstyle = RS_Bold;
3814 break; 3921 break;
3815 case 23: // disable italic 3922 case 23: // disable italic
3816 rendset = 0, rendstyle = RS_Italic; 3923 rendset = 0, rendstyle = RS_Italic;
3817 break; 3924 break;
3818 case 24: 3925 case 24: // underline off (vt220)
3819 rendset = 0, rendstyle = RS_Uline; 3926 rendset = 0, rendstyle = RS_Uline;
3820 break; 3927 break;
3821 case 25: 3928 case 25: // blink off (vt220)
3822 rendset = 0, rendstyle = RS_Blink; 3929 rendset = 0, rendstyle = RS_Blink;
3823 break; 3930 break;
3824 case 26: // variable spacing (iso 8613) 3931 case 26: // variable spacing (iso 8613)
3825 rendset = 0, rendstyle = RS_Blink; 3932 rendset = 0, rendstyle = RS_Blink;
3826 break; 3933 break;
3827 case 27: 3934 case 27: // reverse off (vt220)
3828 rendset = 0, rendstyle = RS_RVid; 3935 rendset = 0, rendstyle = RS_RVid;
3829 break; 3936 break;
3830 //case 28: // visible. NYI 3937 //case 28: // visible. NYI
3831 //case 29: // not crossed-out 3938 //case 29: // not crossed-out
3832 } 3939 }
… …
3847 case 35: 3954 case 35:
3848 case 36: 3955 case 36:
3849 case 37: 3956 case 37:
3850 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3957 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3851 break; 3958 break;
3852 case 38: // set fg color, ISO 8613-6
3853 if (nargs > i + 2 && arg[i + 1] == 5)
3854 {
3855 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3856 i += 2;
3857 }
3858 break;
3859 case 39: /* default fg */ 3959 case 39: /* default fg */
3860 scr_color (Color_fg, Color_fg); 3960 scr_color (Color_fg, Color_fg);
3861 break; 3961 break;
3862 3962
3863 case 40: 3963 case 40:
… …
3868 case 45: 3968 case 45:
3869 case 46: 3969 case 46:
3870 case 47: 3970 case 47:
3871 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3971 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3872 break; 3972 break;
3873 case 48: // set bg color, ISO 8613-6
3874 if (nargs > i + 2 && arg[i + 1] == 5)
3875 {
3876 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3877 i += 2;
3878 }
3879 break;
3880 case 49: /* default bg */ 3973 case 49: /* default bg */
3881 scr_color (Color_bg, Color_bg); 3974 scr_color (Color_bg, Color_bg);
3975 break;
3976
3977 case 38: // set fg color, ISO 8613-6
3978 case 48: // set bg color, ISO 8613-6
3979 {
3980 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3981 unsigned int idx;
3982
3983 if (nargs > i + 2 && arg[i + 1] == 5)
3984 {
3985 idx = minCOLOR + arg[i + 2];
3986 i += 2;
3987
3988 scr_color (idx, fgbg);
3989 }
3990 else if (nargs > i + 4 && arg[i + 1] == 2)
3991 {
3992 unsigned int r = arg[i + 2];
3993 unsigned int g = arg[i + 3];
3994 unsigned int b = arg[i + 4];
3995 unsigned int a = 0xff;
3996
3997 idx = map_rgb24_color (r, g, b, a);
3998
3999 i += 4;
4000
4001 scr_color (idx, fgbg);
4002 }
4003 }
3882 break; 4004 break;
3883 4005
3884 //case 50: // not variable spacing 4006 //case 50: // not variable spacing
3885 4007
3886#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL
… …
3906 break; 4028 break;
3907#endif 4029#endif
3908 } 4030 }
3909 } 4031 }
3910} 4032}
4033
4034void
4035rxvt_term::set_cursor_style (int style)
4036{
4037 if (!IN_RANGE_INC (style, 0, 6))
4038 return;
4039
4040 if (style == 0)
4041 style = 1;
4042
4043 cursor_type = (style - 1) / 2;
4044 set_option (Opt_cursorUnderline, cursor_type == 1);
4045
4046#ifdef CURSOR_BLINK
4047 set_option (Opt_cursorBlink, style & 1);
4048 cursor_blink_reset ();
4049#endif
4050
4051 want_refresh = 1;
4052}
3911/*}}} */ 4053/*}}} */
3912 4054
3913/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3914void
3915rxvt_term::process_graphics ()
3916{
3917 unicode_t ch, cmd = cmd_getc ();
3918
3919 if (cmd == 'Q')
3920 {
3921 /* query graphics */
3922 tt_printf ("\033G0\012"); /* no graphics */
3923 return;
3924 }
3925 /* swallow other graphics sequences until terminating ':' */
3926 do
3927 ch = cmd_getc ();
3928 while (ch != ':');
3929}
3930/*}}} */
3931
3932/* ------------------------------------------------------------------------- */ 4055/* ---------------------------------------------------------------------- */
4056/* Write data to the pty as typed by the user, pasted with the mouse,
4057 * or generated by us in response to a query ESC sequence.
4058 */
3933 4059
3934/* 4060/*
3935 * Send printf () formatted output to the command. 4061 * Send printf () formatted output to the command.
3936 * Only use for small amounts of data. 4062 * Only use for small amounts of data.
3937 */ 4063 */
… …
3945 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4071 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3946 va_end (arg_ptr); 4072 va_end (arg_ptr);
3947 tt_write (buf, strlen (buf)); 4073 tt_write (buf, strlen (buf));
3948} 4074}
3949 4075
3950/* ---------------------------------------------------------------------- */
3951/* Write data to the pty as typed by the user, pasted with the mouse, 4076/* Write data to the pty as typed by the user. */
3952 * or generated by us in response to a query ESC sequence. 4077void
3953 */ 4078rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4079{
4080 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4081 return;
4082
4083 if (option (Opt_scrollTtyKeypress))
4084 if (view_start)
4085 {
4086 view_start = 0;
4087 want_refresh = 1;
4088 }
4089
4090 tt_write_ (data, len);
4091}
3955 4092
3956void 4093void
3957rxvt_term::tt_write (const char *data, unsigned int len) 4094rxvt_term::tt_write (const char *data, unsigned int len)
3958{ 4095{
3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4096 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3960 return; 4097 return;
3961 4098
4099 tt_write_ (data, len);
4100}
4101
4102static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4103
4104void
4105rxvt_term::tt_write_ (const char *data, unsigned int len)
4106{
3962 if (pty->pty < 0) 4107 if (pty->pty < 0)
3963 return; 4108 return;
3964 4109
3965 if (v_buflen == 0) 4110 if (v_buflen == 0)
3966 { 4111 {
3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4112 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3968 4113
4114 max_it (written, 0);
4115
3969 if ((unsigned int)written == len) 4116 if (written == len)
3970 return; 4117 return;
3971 4118
3972 data += written; 4119 data += written;
3973 len -= written; 4120 len -= written;
3974 } 4121 }
3975 4122
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4123 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3977 4124
3978 memcpy (v_buffer + v_buflen, data, len); 4125 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4126 v_buflen += len;
3980 4127
3981 pty_ev.set (ev::READ | ev::WRITE); 4128 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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