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.422 by root, Tue Oct 28 04:45:59 2008 UTC vs.
Revision 1.553 by sf-exg, Sat Jul 26 15:58:38 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-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 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 - 4 && 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
284static int 291static int ecb_cold
285hex_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
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
322 }; 324 };
323 325
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
334# endif 336# endif
335#endif 337#endif
336 return keysym; 338 return keysym;
337} 339}
338 340
339static inline int 341static inline int ecb_cold
340map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
341{ 343{
342 int param = 0; 344 int param = 0;
343 345
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
369 param = 3; 371 param = 3;
370 break; 372 break;
371 case XK_Select: 373 case XK_Select:
372 param = 4; 374 param = 4;
373 break; 375 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior: 376 case XK_Prior:
376 param = 5; 377 param = 5;
377 break; 378 break;
378 case XK_Next: 379 case XK_Next:
379 param = 6; 380 param = 6;
… …
382 param = 7; 383 param = 7;
383 break; 384 break;
384 case XK_End: 385 case XK_End:
385 param = 8; 386 param = 8;
386 break; 387 break;
387#endif
388 case XK_Help: 388 case XK_Help:
389 param = 28; 389 param = 28;
390 break; 390 break;
391 case XK_Menu: 391 case XK_Menu:
392 param = 29; 392 param = 29;
393 break; 393 break;
394 } 394 }
395 return param; 395 return param;
396} 396}
397 397
398void 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
399rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
400{ 409{
401 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
402 KeySym keysym; 411 KeySym keysym = NoSymbol;
403 int valid_keysym;
404 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
405 414
406#if ISO_14755 415#if ISO_14755
407 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
408 return; 417 return;
409#endif 418#endif
… …
416 */ 425 */
417 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
420 429
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 430 kbuf[0] = 0;
428 431
429#ifdef USE_XIM 432#if USE_XIM
430 if (Input_Context) 433 if (Input_Context)
431 { 434 {
432 Status status_return; 435 Status status_return;
433 436
434#if 0 437#if 0
… …
472 } 475 }
473 } 476 }
474 else 477 else
475 len = 0; 478 len = 0;
476 } 479 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 480 }
481 else 481 else
482#endif 482#endif
483 { 483 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
486 } 488 {
489 KeySym orig_keysym = keysym;
487 490
488 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 meta = 0;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
489 { 706 {
490#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 709 return;
493#endif 710#endif
494 711
495 if (saveLines) 712 if (saveLines)
496 { 713 {
… …
505#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 724#else
508 lnsppg = nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
509#endif 726#endif
727 max_it (lnsppg, 1);
728
510 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
511 { 730 {
512 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
513 return; 732 return;
514 } 733 }
515 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
516 { 735 {
517 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
518 return; 737 return;
519 } 738 }
520 } 739 }
521#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
522 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
523 { 742 {
524 if (keysym == XK_Up) 743 if (keysym == XK_Up)
525 { 744 {
526 scr_page (UP, 1); 745 scr_page (1);
527 return; 746 return;
528 } 747 }
529 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
530 { 749 {
531 scr_page (DN, 1); 750 scr_page (-1);
532 return; 751 return;
533 } 752 }
534 } 753 }
535#endif 754#endif
536#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
537 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
538 { 757 {
539 if (keysym == XK_Home) 758 if (keysym == XK_Home)
540 { 759 {
541 scr_move_to (0, 1); 760 scr_changeview (top_row);
542 return; 761 return;
543 } 762 }
544 else if (keysym == XK_End) 763 else if (keysym == XK_End)
545 { 764 {
546 scr_move_to (1, 1); 765 scr_changeview (0);
547 return; 766 return;
548 } 767 }
549 } 768 }
550#endif 769#endif
551 } 770 }
552 771
553 if (shft) 772 if (shft)
554 { 773 {
555 /* Shift + F1 - F10 generates F11 - F20 */
556 if (keysym >= XK_F1 && keysym <= XK_F10)
557 {
558 keysym += (XK_F11 - XK_F1);
559 shft = 0; /* turn off Shift */
560 }
561 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
562 { 775 {
563 switch (keysym) 776 switch (keysym)
564 { 777 {
565 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
566 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
567 selection_request (ev.time); 780 selection_request (ev.time);
568 return; 781 return;
569#if TODO 782#if TODO
570 /* rxvt extras */ 783 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 785 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 787 return;
577#endif 788#endif
578 } 789 }
579 } 790 }
580 } 791 }
581 792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
806 }
807
582#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 809 // ISO 14755 support
584 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 811 {
586 int hv; 812 int hv;
587 813
588 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 845 scr_overlay_off ();
620# endif 846# endif
621 iso14755buf = 0; 847 iso14755buf = 0;
622 } 848 }
623 } 849 }
850 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
627 { 854 {
628 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 856# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
638 { 865 {
639 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
640 return; 867 return;
641 } 868 }
642#endif 869#endif
643
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
765 {
766 int param = map_function_key (keysym);
767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
771 }
772 break;
773 }
774
775 if (newlen)
776 len = strlen (kbuf);
777
778 /*
779 * Pass meta for all function keys, if 'meta' option set
780 */
781#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0)
783 kbuf[len - 1] |= 0x80;
784#endif
785
786 }
787 else if (ctrl && keysym == XK_minus)
788 {
789 len = 1;
790 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
791 }
792 else if (keysym == XK_ISO_Left_Tab)
793 {
794 strcpy (kbuf, "\033[Z");
795 len = 3;
796 }
797 else
798 {
799#ifdef META8_OPTION
800 /* set 8-bit on */
801 if (meta && (meta_char == 0x80))
802 {
803 char *ch;
804
805 for (ch = kbuf; ch < kbuf + len; ch++)
806 *ch |= 0x80;
807
808 meta = 0;
809 }
810#endif
811 /* nil */ ;
812 }
813 } 870 }
814
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return;
817 871
818 if (len <= 0) 872 if (len <= 0)
819 return; /* not mapped */ 873 return; /* not mapped */
820 874
821 if (option (Opt_scrollTtyKeypress))
822 if (view_start)
823 {
824 view_start = 0;
825 want_refresh = 1;
826 }
827
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */
843 if (meta
844#ifdef META8_OPTION
845 && meta_char == C0_ESC
846#endif
847 )
848 {
849 const char ch = C0_ESC;
850 tt_write (&ch, 1);
851 }
852
853 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
854} 876}
855 877
856void 878void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
858{ 880{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 882 KeySym keysym;
861 883
… …
881 commit_iso14755 (); 903 commit_iso14755 ();
882 904
883 return; 905 return;
884 } 906 }
885 907
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 909 if (i[0] == keysym)
888 { 910 {
889 iso14755buf = ISO_14755_51 | i[1]; 911 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 912 commit_iso14755 ();
891 913
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 951 mouse_slip_wheel_speed = 0;
930#endif 952#endif
931} 953}
932 954
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 955void
967rxvt_term::flush () 956rxvt_term::flush ()
968{ 957{
969 flush_ev.stop (); 958 flush_ev.stop ();
970 959
971#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 961 if (bg_flags & BG_NEEDS_REFRESH)
973 { 962 {
974// scr_clear (true); This needs to be researched further! 963 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 964 scr_touch (false);
976 } 965 }
977#endif 966#endif
978 967
979 if (want_refresh) 968 if (want_refresh)
… …
1016 while (row < end_row); 1005 while (row < end_row);
1017 } 1006 }
1018 1007
1019 scr_refresh (); 1008 scr_refresh ();
1020 scrollBar.show (1); 1009 scrollBar.show (1);
1021#ifdef USE_XIM 1010#if USE_XIM
1022 IMSendSpot (); 1011 im_send_spot ();
1023#endif 1012#endif
1024 } 1013 }
1025 1014
1026 display->flush (); 1015 display->flush ();
1027} 1016}
1028 1017
1029/* checks wether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1030void 1019void
1031rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1032{ 1021{
1033 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1033 refresh_count = 0;
1045 flush (); 1034 flush ();
1046} 1035}
1047 1036
1048#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (hidden_cursor)
1042 {
1043 hidden_cursor = 0;
1044 want_refresh = 1;
1045 }
1046
1047 if (option (Opt_cursorBlink))
1048 cursor_blink_ev.again ();
1049 else
1050 cursor_blink_ev.stop ();
1051}
1052
1049void 1053void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1054rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1055{
1052 hidden_cursor = !hidden_cursor; 1056 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1057 want_refresh = 1;
… …
1072 1076
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1077#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1078void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1079rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1080{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1081 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1082 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1083 {
1080 want_refresh = 1; 1084 want_refresh = 1;
1081 refresh_check (); 1085 refresh_check ();
1082 } 1086 }
1083 else 1087 else
… …
1087 1091
1088#ifdef SELECTION_SCROLLING 1092#ifdef SELECTION_SCROLLING
1089void 1093void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1094rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1095{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1096 if (scr_page (scroll_selection_lines))
1093 { 1097 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1098 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1099 want_refresh = 1;
1096 refresh_check (); 1100 refresh_check ();
1097 } 1101 }
… …
1102 1106
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1107#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1108void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1109rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1110{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1111 if (scr_page (mouse_slip_wheel_speed))
1108 { 1112 {
1109 want_refresh = 1; 1113 want_refresh = 1;
1110 refresh_check (); 1114 refresh_check ();
1111 } 1115 }
1112 1116
… …
1128 // this should really be sched_yield(), but the linux guys thought 1132 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1133 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1134 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1135 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1136 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1137 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1138 // we just nanosleep a bit and hope for the best.
1135 1139
1136 struct timespec ts = { 0, 1000 }; 1140 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1141 nanosleep (&ts, 0);
1138 1142
… …
1144 { 1148 {
1145 } 1149 }
1146} event_handler; 1150} event_handler;
1147#endif 1151#endif
1148 1152
1153/* make sure all the cmd data is at beginning of cmdbuf */
1154void
1155rxvt_term::cmdbuf_reify ()
1156{
1157 if (cmdbuf_ptr == cmdbuf_base)
1158 return;
1159
1160 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1161
1162 memmove (cmdbuf_base, cmdbuf_ptr, used);
1163 cmdbuf_ptr = cmdbuf_base;
1164 cmdbuf_endp = cmdbuf_ptr + used;
1165
1166}
1167
1168#if defined (KEYSYM_RESOURCE)
1169void
1170rxvt_term::cmdbuf_append (const char *str, size_t count)
1171{
1172 cmdbuf_reify ();
1173
1174 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1175
1176 if (count > avail)
1177 return;
1178
1179 memcpy (cmdbuf_endp, str, count);
1180 cmdbuf_endp += count;
1181
1182 cmd_parse ();
1183}
1184#endif
1185
1149bool 1186bool
1150rxvt_term::pty_fill () 1187rxvt_term::pty_fill ()
1151{ 1188{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1189 cmdbuf_reify ();
1153 1190
1154 if (CBUFSIZ == n) 1191 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1192
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1193 if (!avail)
1157 n = 0;
1158 } 1194 {
1159 1195 // normally this indicates a "too long" command sequence - just drop the data we have
1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1196 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1197 cmdbuf_endp = cmdbuf_ptr;
1198 avail = CBUFSIZ;
1199 }
1163 1200
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1201 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1202
1166 if (r > 0) 1203 if (r > 0)
1167 { 1204 {
1168 cmdbuf_endp += r; 1205 cmdbuf_endp += r;
1169 return true; 1206 return true;
… …
1200 pty_write (); 1237 pty_write ();
1201 1238
1202 refresh_check (); 1239 refresh_check ();
1203} 1240}
1204 1241
1205void 1242void ecb_cold
1206rxvt_term::pointer_unblank () 1243rxvt_term::pointer_unblank ()
1207{ 1244{
1208 XDefineCursor (dpy, vt, TermWin_cursor); 1245 XDefineCursor (dpy, vt, TermWin_cursor);
1209 recolour_cursor (); 1246 recolour_cursor ();
1210 1247
… …
1215 pointer_ev.start (pointerBlankDelay); 1252 pointer_ev.start (pointerBlankDelay);
1216#endif 1253#endif
1217} 1254}
1218 1255
1219#ifdef POINTER_BLANK 1256#ifdef POINTER_BLANK
1220void 1257void ecb_cold
1221rxvt_term::pointer_blank () 1258rxvt_term::pointer_blank ()
1222{ 1259{
1223 if (!option (Opt_pointerBlank)) 1260 if (!option (Opt_pointerBlank))
1224 return; 1261 return;
1225 1262
… …
1227 XFlush (dpy); 1264 XFlush (dpy);
1228 1265
1229 hidden_pointer = 1; 1266 hidden_pointer = 1;
1230} 1267}
1231 1268
1232void 1269void ecb_cold
1233rxvt_term::pointer_cb (ev::timer &w, int revents) 1270rxvt_term::pointer_cb (ev::timer &w, int revents)
1234{ 1271{
1235 make_current (); 1272 make_current ();
1236 1273
1237 pointer_blank (); 1274 pointer_blank ();
… …
1243{ 1280{
1244 int button_number, key_state = 0; 1281 int button_number, key_state = 0;
1245 int x, y; 1282 int x, y;
1246 int code = 32; 1283 int code = 32;
1247 1284
1248 x = Pixel2Col (ev.x); 1285 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1286 y = Pixel2Row (ev.y) + 1;
1287
1250 if (ev.type == MotionNotify) 1288 if (ev.type == MotionNotify)
1251 { 1289 {
1252 if (x == mouse_row && y == mouse_col) 1290 if (x == mouse_row && y == mouse_col)
1253 return; 1291 return;
1292
1254 mouse_row = x; 1293 mouse_row = x;
1255 mouse_col = y; 1294 mouse_col = y;
1256 code += 32; 1295 code += 32;
1257 } 1296 }
1258 1297
… …
1261 else 1300 else
1262 { 1301 {
1263 button_number = MEvent.button - Button1; 1302 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1303 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1304 if (button_number >= 3)
1266 button_number += (64 - 3); 1305 button_number += 64 - 3;
1267 } 1306 }
1268 1307
1269 if (priv_modes & PrivMode_MouseX10) 1308 if (priv_modes & PrivMode_MouseX10)
1270 { 1309 {
1271 /* 1310 /*
… …
1303 fputc ('A', stderr); 1342 fputc ('A', stderr);
1304 if (key_state & 32) 1343 if (key_state & 32)
1305 fputc ('2', stderr); 1344 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1346 button_number,
1308 x + 1, 1347 x,
1309 y + 1); 1348 y);
1310#endif 1349#endif
1311 1350
1351#if ENABLE_FRILLS
1352 if (priv_modes & PrivMode_ExtMouseRight)
1353 tt_printf ("\033[%d;%d;%dM",
1354 code + button_number + key_state,
1355 x,
1356 y);
1357 else if (priv_modes & PrivMode_ExtModeMouse)
1358 tt_printf ("\033[M%c%lc%lc",
1359 code + button_number + key_state,
1360 wint_t (32 + x),
1361 wint_t (32 + y));
1362 else
1363#endif
1312 tt_printf ("\033[M%c%c%c", 1364 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1365 code + button_number + key_state,
1314 (32 + x + 1), 1366 32 + x,
1315 (32 + y + 1)); 1367 32 + y);
1316} 1368}
1317 1369
1318/*{{{ process an X event */ 1370/*{{{ process an X event */
1319void 1371void ecb_hot
1320rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1321{ 1373{
1322 make_current (); 1374 make_current ();
1323 1375
1324 dLocal (Display *, dpy); 1376 dLocal (Display *, dpy);
… …
1422 && ev.xfocus.mode != NotifyGrab) 1474 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1475 focus_out ();
1424 break; 1476 break;
1425 1477
1426 case ConfigureNotify: 1478 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1479 if (ev.xconfigure.window == parent)
1431 { 1480 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1482 ;
1483
1484 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1485
1486 bool moved = false;
1487#ifdef HAVE_BG_PIXMAP
1488 if (bg_window_position_sensitive ())
1489 {
1490 want_position_change = true;
1491 if (bg_img == 0)
1492 moved = true;
1493 }
1494#endif
1495
1496 if (want_position_change)
1497 {
1498 int x, y;
1499
1500 if (ev.xconfigure.send_event)
1501 {
1502 x = ev.xconfigure.x;
1503 y = ev.xconfigure.y;
1504 }
1505 else
1506 get_window_origin (x, y);
1507
1508 if (x != parent_x || y != parent_y)
1509 {
1510 parent_x = x;
1511 parent_y = y;
1512 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1513 moved = true;
1514 }
1515 }
1434 1516
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1517 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1518 {
1437 seen_resize = 1; 1519 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1520 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1521 }
1440 else 1522 else
1441 { 1523 {
1442#ifdef HAVE_BG_PIXMAP 1524#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped) 1525 if (moved)
1446 update_background (); 1526 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif 1527#endif
1451 } 1528 }
1452 1529
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1530 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1531 }
1455 break; 1532 break;
1456 1533
1457 case PropertyNotify: 1534 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1535 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1536 break;
1464 1537
1465 case SelectionClear: 1538 case SelectionClear:
1466 selection_clear (); 1539 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1540 break;
1473 1541
1474 case SelectionRequest: 1542 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1543 selection_send (ev.xselectionrequest);
1476 break; 1544 break;
1477 1545
1478 case MapNotify: 1546 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1547#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1548 // This is needed at startup for the case of no window manager
1481 * non-reparenting window manager. In those cases we never get first 1549 // or a non-reparenting window manager and also because we
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1550 // defer bg image updates if the window is not mapped. The
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1551 // short delay is to optimize for multiple ConfigureNotify
1484 * reparenting. 1552 // events at startup when the window manager reparents the
1485 * We should not render background immidiately, as there could be several 1553 // window, so as to perform the computation after we have
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1554 // received all of them.
1487 * by scheduling background redraw as soon as we can, but giving a short 1555 if (bg_img == 0)
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025); 1556 update_background_ev.start (0.025);
1494#endif 1557#endif
1495 mapped = 1; 1558 mapped = 1;
1496#ifdef TEXT_BLINK 1559#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1560 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1513 { 1576 {
1514 do 1577 do
1515 { 1578 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1581 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1582 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1583
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1584 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1585
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1587 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1588 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1589 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1590 }
1528 1591
1529 want_refresh = 1; 1592 want_refresh = 1;
1530 } 1593 }
1531 else 1594 else
… …
1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1600 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1538 ; 1601 ;
1539 1602
1540 if (scrollBar.state && ev.xany.window == scrollBar.win) 1603 if (scrollBar.state && ev.xany.window == scrollBar.win)
1541 { 1604 {
1542 scrollBar.state = STATE_IDLE; 1605 scrollBar.state = SB_STATE_IDLE;
1543 scrollBar.show (0); 1606 scrollBar.show (0);
1544 } 1607 }
1545 } 1608 }
1546 break; 1609 break;
1547 1610
… …
1589 1652
1590#ifdef SELECTION_SCROLLING 1653#ifdef SELECTION_SCROLLING
1591 if (ev.xbutton.y < int_bwidth 1654 if (ev.xbutton.y < int_bwidth
1592 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1655 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1593 { 1656 {
1657 page_dirn scroll_selection_dir;
1594 int dist; 1658 int dist;
1595 1659
1596 /* don't clobber the current delay if we are 1660 /* don't clobber the current delay if we are
1597 * already in the middle of scrolling. 1661 * already in the middle of scrolling.
1598 */ 1662 */
… …
1613 dist = int_bwidth - ev.xbutton.y; 1677 dist = int_bwidth - ev.xbutton.y;
1614 } 1678 }
1615 else 1679 else
1616 { 1680 {
1617 scroll_selection_dir = DN; 1681 scroll_selection_dir = DN;
1618 dist = ev.xbutton.y - (int_bwidth + height); 1682 dist = ev.xbutton.y - (int_bwidth + vt_height);
1619 } 1683 }
1620 1684
1621 scroll_selection_lines = Pixel2Height (dist) 1685 scroll_selection_lines = Pixel2Height (dist)
1622 / SELECTION_SCROLL_LINE_SPEEDUP 1686 / SELECTION_SCROLL_LINE_SPEEDUP
1623 + 1; 1687 + 1;
1624 min_it (scroll_selection_lines, 1688 min_it (scroll_selection_lines,
1625 SELECTION_SCROLL_MAX_LINES); 1689 SELECTION_SCROLL_MAX_LINES);
1690 scroll_selection_lines *= scroll_selection_dir;
1626 } 1691 }
1627 else 1692 else
1628 { 1693 {
1629 /* we are within the text window, so we 1694 /* we are within the text window, so we
1630 * shouldn't be scrolling 1695 * shouldn't be scrolling
… …
1635#ifdef MOUSE_THRESHOLD 1700#ifdef MOUSE_THRESHOLD
1636 } 1701 }
1637#endif 1702#endif
1638 } 1703 }
1639 } 1704 }
1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1641 { 1706 {
1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1643 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1644 ; 1709 ;
1645 1710
1646 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1647 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1648 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1649 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1650 &unused_mask); 1715 &unused_mask);
1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652 scrollBar.size ()); 1717 scrollBar.size ());
1653 want_refresh = 1; 1718 want_refresh = 1;
1654 scrollBar.show (1); 1719 scrollBar.show (1);
1655 } 1720 }
1656 break; 1721 break;
1657 } 1722 }
1658 1723
1659#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1660 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1661 {
1662 if (hidden_cursor)
1663 {
1664 hidden_cursor = 0;
1665 want_refresh = 1;
1666 }
1667
1668 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1669 }
1670#endif 1727#endif
1671 1728
1672#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1674 { 1731 {
… …
1684#endif 1741#endif
1685 1742
1686 refresh_check (); 1743 refresh_check ();
1687} 1744}
1688 1745
1689void 1746#if ENABLE_FRILLS
1747void ecb_cold
1690rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1691{ 1749{
1692 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1693 return; 1751 return;
1694 1752
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1696 { 1754 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1756 XSetWMHints (dpy, parent, h);
1699 urgency_hint = enable; 1757 urgency_hint = enable;
1758 XFree (h);
1700 } 1759 }
1701} 1760}
1761#endif
1702 1762
1703void 1763void ecb_cold
1704rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1705{ 1765{
1706 if (!focus) 1766 if (!focus)
1707 { 1767 {
1708 focus = 1; 1768 focus = 1;
1709 want_refresh = 1; 1769 want_refresh = 1;
1710 1770
1711#if USE_XIM 1771#if USE_XIM
1712 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1713 { 1773 {
1714 IMSetPosition (); 1774 im_set_position ();
1715 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1716 } 1776 }
1717#endif 1777#endif
1718#if CURSOR_BLINK 1778#if CURSOR_BLINK
1719 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1733 1793
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735 } 1795 }
1736} 1796}
1737 1797
1738void 1798void ecb_cold
1739rxvt_term::focus_out () 1799rxvt_term::focus_out ()
1740{ 1800{
1741 if (focus) 1801 if (focus)
1742 { 1802 {
1743 focus = 0; 1803 focus = 0;
… …
1776 1836
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778 } 1838 }
1779} 1839}
1780 1840
1781void 1841void ecb_cold
1782rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx)
1783{ 1843{
1784#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1785 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1786 { 1846 {
… …
1789 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1849 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1790 } 1850 }
1791#endif 1851#endif
1792} 1852}
1793 1853
1794#if ENABLE_TRANSPARENCY || ENABLE_PERL 1854#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1795void 1855void ecb_hot
1796rxvt_term::rootwin_cb (XEvent &ev) 1856rxvt_term::rootwin_cb (XEvent &ev)
1797{ 1857{
1798 make_current (); 1858 make_current ();
1799 1859
1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1860 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1801 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1861 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1802 return; 1862 return;
1803 1863
1804# if ENABLE_TRANSPARENCY
1805 switch (ev.type) 1864 switch (ev.type)
1806 { 1865 {
1807 case PropertyNotify: 1866 case PropertyNotify:
1808 /* 1867 /*
1809 * if user used some Esetroot compatible prog to set the root bg, 1868 * if user used some Esetroot compatible prog to set the root bg,
1810 * use the property to determine the pixmap. We use it later on. 1869 * use the property to determine the pixmap. We use it later on.
1811 */ 1870 */
1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1871 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1872 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814 { 1873 {
1815 bgPixmap.set_root_pixmap (); 1874#if BG_IMAGE_FROM_ROOT
1875 if (option (Opt_transparent))
1876 {
1877 rxvt_img::new_from_root (this)->replace (root_img);
1816 update_background (); 1878 update_background ();
1879 }
1880#endif
1881 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1817 } 1882 }
1818 1883
1819 break; 1884 break;
1820 } 1885 }
1821# endif
1822 1886
1823 refresh_check (); 1887 refresh_check ();
1824} 1888}
1825#endif 1889#endif
1826 1890
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1923 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1924 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1925#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1926 if (ev.button == MEvent.button && clickintime)
1863 { 1927 {
1864 /* same button, within alloted time */ 1928 /* same button, within allowed time */
1865 MEvent.clicks++; 1929 MEvent.clicks++;
1866 1930
1867 if (MEvent.clicks > 1) 1931 if (MEvent.clicks > 1)
1868 { 1932 {
1869 /* only report double clicks */ 1933 /* only report double clicks */
… …
1950 if (scrollBar.upButton (ev.y)) 2014 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */ 2015 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y)) 2016 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */ 2017 direction = DN; /* down */
1954 2018
1955 scrollBar.state = STATE_IDLE; 2019 scrollBar.state = SB_STATE_IDLE;
1956 /* 2020 /*
1957 * Rxvt-style scrollbar: 2021 * Rxvt-style scrollbar:
1958 * move up if mouse is above slider 2022 * move up if mouse is above slider
1959 * move dn if mouse is below slider 2023 * move dn if mouse is below slider
1960 * 2024 *
… …
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2063 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 2064#endif
2001 if (scr_page (direction, 1)) 2065 if (scr_page (direction, 1))
2002 { 2066 {
2003 if (direction == UP) 2067 if (direction == UP)
2004 scrollBar.state = STATE_UP; 2068 scrollBar.state = SB_STATE_UP;
2005 else 2069 else
2006 scrollBar.state = STATE_DOWN; 2070 scrollBar.state = SB_STATE_DOWN;
2007 } 2071 }
2008 } 2072 }
2009 else 2073 else
2010 switch (ev.button) 2074 switch (ev.button)
2011 { 2075 {
2012 case Button2: 2076 case Button2:
2013 switch (scrollBar.align) 2077 switch (scrollBar.align)
2014 { 2078 {
2015 case R_SB_ALIGN_TOP: 2079 case SB_ALIGN_TOP:
2016 csrO = 0; 2080 csrO = 0;
2017 break; 2081 break;
2018 case R_SB_ALIGN_CENTRE: 2082 case SB_ALIGN_CENTRE:
2019 csrO = (scrollBar.bot - scrollBar.top) / 2; 2083 csrO = (scrollBar.bot - scrollBar.top) / 2;
2020 break; 2084 break;
2021 case R_SB_ALIGN_BOTTOM: 2085 case SB_ALIGN_BOTTOM:
2022 csrO = scrollBar.bot - scrollBar.top; 2086 csrO = scrollBar.bot - scrollBar.top;
2023 break; 2087 break;
2024 } 2088 }
2025 2089
2026 if (scrollBar.style == R_SB_XTERM 2090 if (scrollBar.style == SB_STYLE_XTERM
2027 || scrollbar_above_slider (ev.y) 2091 || scrollBar.above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2092 || scrollBar.below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2093 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2030 2094
2031 scrollBar.state = STATE_MOTION; 2095 scrollBar.state = SB_STATE_MOTION;
2032 break; 2096 break;
2033 2097
2034 case Button1: 2098 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2099 if (scrollBar.align == SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2100 csrO = ev.y - scrollBar.top;
2037 /* FALLTHROUGH */ 2101 /* FALLTHROUGH */
2038 2102
2039 case Button3: 2103 case Button3:
2040 if (scrollBar.style != R_SB_XTERM) 2104 if (scrollBar.style != SB_STYLE_XTERM)
2041 { 2105 {
2042 if (scrollbar_above_slider (ev.y)) 2106 if (scrollBar.above_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2107# ifdef RXVT_SCROLL_FULL
2044 scr_page (UP, nrow - 1); 2108 scr_page (UP, nrow - 1);
2045# else 2109# else
2046 scr_page (UP, nrow / 4); 2110 scr_page (UP, nrow / 4);
2047# endif 2111# endif
2048 else if (scrollbar_below_slider (ev.y)) 2112 else if (scrollBar.below_slider (ev.y))
2049# ifdef RXVT_SCROLL_FULL 2113# ifdef RXVT_SCROLL_FULL
2050 scr_page (DN, nrow - 1); 2114 scr_page (DN, nrow - 1);
2051# else 2115# else
2052 scr_page (DN, nrow / 4); 2116 scr_page (DN, nrow / 4);
2053# endif 2117# endif
2054 else 2118 else
2055 scrollBar.state = STATE_MOTION; 2119 scrollBar.state = SB_STATE_MOTION;
2056 } 2120 }
2057 else 2121 else
2058 { 2122 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2123 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2124 (nrow
2061 * scrollbar_position (ev.y) 2125 * scrollBar.position (ev.y)
2062 / scrollBar.size ())); 2126 / scrollBar.size ()));
2063 } 2127 }
2064 2128
2065 break; 2129 break;
2066 } 2130 }
… …
2077 2141
2078 csrO = 0; /* reset csr Offset */ 2142 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2143 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2144 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2145
2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2146 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2083 { 2147 {
2084 scrollBar.state = STATE_IDLE; 2148 scrollBar.state = SB_STATE_IDLE;
2085 scrollBar.show (0); 2149 scrollBar.show (0);
2086 } 2150 }
2087 2151
2088#ifdef SELECTION_SCROLLING 2152#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2153 sel_scroll_ev.stop();
… …
2139 case Button3: 2203 case Button3:
2140 selection_make (ev.time); 2204 selection_make (ev.time);
2141 break; 2205 break;
2142 2206
2143 case Button2: 2207 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2208 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2209 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2210 break;
2147 2211
2148#ifdef MOUSE_WHEEL 2212#ifdef MOUSE_WHEEL
2149 case Button4: 2213 case Button4:
2150 case Button5: 2214 case Button5:
2151 { 2215 {
2152 int i; 2216 int lines;
2153 page_dirn v; 2217 page_dirn dirn;
2154 2218
2155 v = ev.button == Button4 ? UP : DN; 2219 dirn = ev.button == Button4 ? UP : DN;
2156 2220
2157 if (ev.state & ShiftMask) 2221 if (ev.state & ShiftMask)
2158 i = 1; 2222 lines = 1;
2159 else if (option (Opt_mouseWheelScrollPage)) 2223 else if (option (Opt_mouseWheelScrollPage))
2160 i = nrow - 1; 2224 lines = nrow - 1;
2161 else 2225 else
2162 i = 5; 2226 lines = 5;
2163 2227
2164# ifdef MOUSE_SLIP_WHEELING 2228# ifdef MOUSE_SLIP_WHEELING
2165 if (ev.state & ControlMask) 2229 if (ev.state & ControlMask)
2166 { 2230 {
2167 mouse_slip_wheel_speed += v ? -1 : 1; 2231 mouse_slip_wheel_speed += dirn;
2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2232 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2170 2233
2171 if (!slip_wheel_ev.is_active ()) 2234 if (!slip_wheel_ev.is_active ())
2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2235 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2173 } 2236 }
2174 else 2237 else
2175# endif 2238# endif
2176 { 2239 {
2177 scr_page (v, i); 2240 scr_page (dirn, lines);
2178 scrollBar.show (1); 2241 scrollBar.show (1);
2179 } 2242 }
2180 } 2243 }
2181 break; 2244 break;
2182#endif 2245#endif
… …
2184 } 2247 }
2185} 2248}
2186 2249
2187/*}}} */ 2250/*}}} */
2188 2251
2189void 2252void ecb_hot
2190rxvt_term::cmd_parse () 2253rxvt_term::cmd_parse ()
2191{ 2254{
2192 wchar_t ch = NOCHAR; 2255 wchar_t ch = NOCHAR;
2193 char *seq_begin; // remember start of esc-sequence here 2256 char *seq_begin; // remember start of esc-sequence here
2194 2257
2195 for (;;) 2258 for (;;)
2196 { 2259 {
2197 if (expect_false (ch == NOCHAR)) 2260 if (ecb_unlikely (ch == NOCHAR))
2198 { 2261 {
2199 seq_begin = cmdbuf_ptr; 2262 seq_begin = cmdbuf_ptr;
2200 ch = next_char (); 2263 ch = next_char ();
2201 2264
2202 if (ch == NOCHAR) 2265 if (ch == NOCHAR)
2203 break; 2266 break;
2204 } 2267 }
2205 2268
2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2269 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207 { 2270 {
2208 if (expect_false (!seen_input)) 2271 if (ecb_unlikely (!seen_input))
2209 { 2272 {
2210 seen_input = 1; 2273 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition: 2274 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler. 2275 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs 2276 // some window managers resize the window early, and these programs
… …
2226 wchar_t *str = buf; 2289 wchar_t *str = buf;
2227 wchar_t *eol = str + min (ncol, UBUFSIZ); 2290 wchar_t *eol = str + min (ncol, UBUFSIZ);
2228 2291
2229 for (;;) 2292 for (;;)
2230 { 2293 {
2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2294 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232 break; 2295 break;
2233 2296
2234 *str++ = ch; 2297 *str++ = ch;
2235 2298
2236 if (expect_false (ch == C0_LF || str >= eol)) 2299 if (ecb_unlikely (ch == C0_LF || str >= eol))
2237 { 2300 {
2238 if (ch == C0_LF) 2301 if (ch == C0_LF)
2239 nlines++; 2302 nlines++;
2240 2303
2241 refresh_count++; 2304 refresh_count++;
… …
2313 } 2376 }
2314 } 2377 }
2315} 2378}
2316 2379
2317// read the next character 2380// read the next character
2318wchar_t 2381wchar_t ecb_hot
2319rxvt_term::next_char () NOTHROW 2382rxvt_term::next_char () NOTHROW
2320{ 2383{
2321 while (cmdbuf_ptr < cmdbuf_endp) 2384 while (cmdbuf_ptr < cmdbuf_endp)
2322 { 2385 {
2323 // assume 7-bit to be ascii ALWAYS 2386 // assume 7-bit to be ascii ALWAYS
2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2387 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2325 return *cmdbuf_ptr++; 2388 return *cmdbuf_ptr++;
2326 2389
2327 wchar_t wc; 2390 wchar_t wc;
2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2391 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2329 2392
… …
2334 break; 2397 break;
2335 } 2398 }
2336 2399
2337 if (len == (size_t)-1) 2400 if (len == (size_t)-1)
2338 { 2401 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2402 mbstate.reset (); // reset now undefined conversion state
2403 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2404 // in which case we "erroneously" return the next byte which might be valid.
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2405 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2406 }
2342 2407
2343 // assume wchar == unicode 2408 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2409 cmdbuf_ptr += len;
… …
2347 2412
2348 return NOCHAR; 2413 return NOCHAR;
2349} 2414}
2350 2415
2351// read the next octet 2416// read the next octet
2352uint32_t 2417uint32_t ecb_hot
2353rxvt_term::next_octet () NOTHROW 2418rxvt_term::next_octet () NOTHROW
2354{ 2419{
2355 return cmdbuf_ptr < cmdbuf_endp 2420 return cmdbuf_ptr < cmdbuf_endp
2356 ? (unsigned char)*cmdbuf_ptr++ 2421 ? (unsigned char)*cmdbuf_ptr++
2357 : NOCHAR; 2422 : NOCHAR;
2358} 2423}
2359 2424
2360static class out_of_input out_of_input; 2425static class out_of_input out_of_input;
2361 2426
2362/* rxvt_cmd_getc () - Return next input character */ 2427wchar_t ecb_hot
2363/*
2364 * Return the next input character after first passing any keyboard input
2365 * to the command.
2366 */
2367wchar_t
2368rxvt_term::cmd_getc () THROW ((class out_of_input)) 2428rxvt_term::cmd_getc () THROW ((class out_of_input))
2369{ 2429{
2370 wchar_t c = next_char (); 2430 wchar_t c = next_char ();
2371 2431
2372 if (c == NOCHAR) 2432 if (c == NOCHAR)
2373 throw out_of_input; 2433 throw out_of_input;
2374 2434
2375 return c; 2435 return c;
2376} 2436}
2377 2437
2378uint32_t 2438uint32_t ecb_hot
2379rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2439rxvt_term::cmd_get8 () THROW ((class out_of_input))
2380{ 2440{
2381 uint32_t c = next_octet (); 2441 uint32_t c = next_octet ();
2382 2442
2383 if (c == NOCHAR) 2443 if (c == NOCHAR)
… …
2387} 2447}
2388 2448
2389/*{{{ print pipe */ 2449/*{{{ print pipe */
2390/*----------------------------------------------------------------------*/ 2450/*----------------------------------------------------------------------*/
2391#ifdef PRINTPIPE 2451#ifdef PRINTPIPE
2392FILE * 2452FILE * ecb_cold
2393rxvt_term::popen_printer () 2453rxvt_term::popen_printer ()
2394{ 2454{
2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2455 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2396 2456
2397 if (stream == NULL) 2457 if (stream == NULL)
2398 rxvt_warn ("can't open printer pipe, not printing.\n"); 2458 rxvt_warn ("can't open printer pipe, not printing.\n");
2399 2459
2400 return stream; 2460 return stream;
2401} 2461}
2402 2462
2403int 2463int ecb_cold
2404rxvt_term::pclose_printer (FILE *stream) 2464rxvt_term::pclose_printer (FILE *stream)
2405{ 2465{
2406 fflush (stream); 2466 fflush (stream);
2407 return pclose (stream); 2467 return pclose (stream);
2408} 2468}
2409 2469
2410/* 2470/*
2411 * simulate attached vt100 printer 2471 * simulate attached vt100 printer
2412 */ 2472 */
2413void 2473void ecb_cold
2414rxvt_term::process_print_pipe () 2474rxvt_term::process_print_pipe ()
2415{ 2475{
2416 FILE *fd = popen_printer (); 2476 FILE *fd = popen_printer ();
2417 2477
2418 if (!fd) 2478 if (!fd)
… …
2464 pclose_printer (fd); 2524 pclose_printer (fd);
2465} 2525}
2466#endif /* PRINTPIPE */ 2526#endif /* PRINTPIPE */
2467/*}}} */ 2527/*}}} */
2468 2528
2469/* *INDENT-OFF* */
2470enum { 2529enum {
2471 C1_40 = 0x40, 2530 C1_40 = 0x40,
2472 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2531 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2473 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2532 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2474 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2533 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2475 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2534 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2476}; 2535};
2477/* *INDENT-ON* */
2478 2536
2479/*{{{ process non-printing single characters */ 2537/*{{{ process non-printing single characters */
2480void 2538void ecb_hot
2481rxvt_term::process_nonprinting (unicode_t ch) 2539rxvt_term::process_nonprinting (unicode_t ch)
2482{ 2540{
2483 switch (ch) 2541 switch (ch)
2484 { 2542 {
2485 case C0_ESC: 2543 case C0_ESC:
… …
2531} 2589}
2532/*}}} */ 2590/*}}} */
2533 2591
2534 2592
2535/*{{{ process VT52 escape sequences */ 2593/*{{{ process VT52 escape sequences */
2536void 2594void ecb_cold
2537rxvt_term::process_escape_vt52 (unicode_t ch) 2595rxvt_term::process_escape_vt52 (unicode_t ch)
2538{ 2596{
2539 int row, col; 2597 int row, col;
2540 2598
2541 switch (ch) 2599 switch (ch)
… …
2575 break; 2633 break;
2576 case 'Z': /* identify the terminal type */ 2634 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2635 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2636 break;
2579 case '<': /* turn off VT52 mode */ 2637 case '<': /* turn off VT52 mode */
2580 set_privmode (PrivMode_vt52, 0); 2638 priv_modes &= ~PrivMode_vt52;
2581 break; 2639 break;
2582 case 'F': /* use special graphics character set */ 2640 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2641 case 'G': /* use regular character set */
2584 /* unimplemented */ 2642 /* unimplemented */
2585 break; 2643 break;
… …
2591} 2649}
2592/*}}} */ 2650/*}}} */
2593 2651
2594 2652
2595/*{{{ process escape sequences */ 2653/*{{{ process escape sequences */
2596void 2654void ecb_hot
2597rxvt_term::process_escape_seq () 2655rxvt_term::process_escape_seq ()
2598{ 2656{
2599 unicode_t ch = cmd_getc (); 2657 unicode_t ch = cmd_getc ();
2600 2658
2601 if (priv_modes & PrivMode_vt52) 2659 if (priv_modes & PrivMode_vt52)
… …
2604 return; 2662 return;
2605 } 2663 }
2606 2664
2607 switch (ch) 2665 switch (ch)
2608 { 2666 {
2609 /* case 1: do_tek_mode (); break; */
2610 case '#': 2667 case '#':
2611 if (cmd_getc () == '8') 2668 if (cmd_getc () == '8')
2612 scr_E (); 2669 scr_E ();
2613 break; 2670 break;
2614 case '(': 2671 case '(':
… …
2637#if !ENABLE_MINIMAL 2694#if !ENABLE_MINIMAL
2638 case '9': 2695 case '9':
2639 scr_forwardindex (); 2696 scr_forwardindex ();
2640 break; 2697 break;
2641#endif 2698#endif
2699 // DECPAM/DECPNM
2642 case '=': 2700 case '=':
2701 priv_modes |= PrivMode_aplKP;
2702 break;
2643 case '>': 2703 case '>':
2644 set_privmode (PrivMode_aplKP, ch == '='); 2704 priv_modes &= ~PrivMode_aplKP;
2645 break; 2705 break;
2646 2706
2647 case C1_40: 2707 case C1_40:
2648 cmd_getc (); 2708 cmd_getc ();
2649 break; 2709 break;
… …
2653 2713
2654 /* 8.3.87: NEXT LINE */ 2714 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2715 case C1_NEL: /* ESC E */
2656 { 2716 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2717 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2718 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2659 } 2719 }
2660 break; 2720 break;
2661 2721
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2722 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2723 case C1_ESA: /* ESC G */
2664 process_graphics (); 2724 // used by original rxvt for rob nations own graphics mode
2725 if (cmd_getc () == 'Q')
2726 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665 break; 2727 break;
2666 2728
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2729 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2730 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2731 scr_set_tab (1);
… …
2673 case C1_RI: /* ESC M */ 2735 case C1_RI: /* ESC M */
2674 scr_index (DN); 2736 scr_index (DN);
2675 break; 2737 break;
2676 2738
2677 /* 8.3.142: SINGLE-SHIFT TWO */ 2739 /* 8.3.142: SINGLE-SHIFT TWO */
2678 /*case C1_SS2: scr_single_shift (2); break; */ 2740 /* case C1_SS2: break; */
2679 2741
2680 /* 8.3.143: SINGLE-SHIFT THREE */ 2742 /* 8.3.143: SINGLE-SHIFT THREE */
2681 /*case C1_SS3: scr_single_shift (3); break; */ 2743 /* case C1_SS3: break; */
2682 2744
2683 /* 8.3.27: DEVICE CONTROL STRING */ 2745 /* 8.3.27: DEVICE CONTROL STRING */
2684 case C1_DCS: /* ESC P */ 2746 case C1_DCS: /* ESC P */
2685 process_dcs_seq (); 2747 process_dcs_seq ();
2686 break; 2748 break;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2750 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2751 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2752 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2753 break; /* steal obsolete ESC [ c */
2692 2754
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2755 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2756 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2757 process_csi_seq ();
2696 break; 2758 break;
2697 2759
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2760 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2761 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2762 process_osc_seq ();
2701 break; 2763 break;
2702 2764
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2765 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2766 case 'c':
2705 mbstate.reset (); 2767 mbstate.reset ();
2706 scr_poweron (); 2768 scr_poweron ();
2707 scrollBar.show (1); 2769 scrollBar.show (1);
2708 break; 2770 break;
… …
2719 } 2781 }
2720} 2782}
2721/*}}} */ 2783/*}}} */
2722 2784
2723/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2785/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724/* *INDENT-OFF* */
2725enum { 2786enum {
2726 CSI_ICH = 0x40, 2787 CSI_ICH = 0x40,
2727 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2788 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2728 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2789 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2729 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2790 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2793 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2794 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2795 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2796};
2736 2797
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2798#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2799 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2800 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2801#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2802 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2803
2743const unsigned char csi_defaults[] = 2804static const unsigned char csi_defaults[] =
2744 { 2805 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2806 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2807 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2808 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2809 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2749 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2810 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2750 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2811 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2751 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2812 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2752 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2813 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2753 }; 2814 };
2754/* *INDENT-ON* */
2755 2815
2756void 2816void ecb_hot
2757rxvt_term::process_csi_seq () 2817rxvt_term::process_csi_seq ()
2758{ 2818{
2759 unicode_t ch, priv, i; 2819 unicode_t ch, priv, prev_ch, i;
2760 unsigned int nargs, p; 2820 unsigned int nargs, p;
2761 int n, ndef; 2821 int n, ndef;
2762 int arg[ESC_ARGS] = { }; 2822 int arg[ESC_ARGS] = { };
2763 2823
2764 nargs = 0; 2824 nargs = 0;
2765 2825
2766 priv = 0; 2826 priv = 0;
2767 ch = cmd_getc (); 2827 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2828 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2829 {
2770 /* '<' '=' '>' '?' */ 2830 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2831 priv = ch;
2772 ch = cmd_getc (); 2832 ch = cmd_getc ();
2773 } 2833 }
2774 2834
2835 prev_ch = 0;
2775 /* read any numerical arguments */ 2836 /* read any numerical arguments */
2776 for (n = -1; ch < CSI_ICH; ) 2837 for (n = -1; ch < CSI_ICH; )
2777 { 2838 {
2778 if (isdigit (ch)) 2839 if (isdigit (ch))
2779 { 2840 {
… …
2789 n = -1; 2850 n = -1;
2790 } 2851 }
2791 else if (IS_CONTROL (ch)) 2852 else if (IS_CONTROL (ch))
2792 process_nonprinting (ch); 2853 process_nonprinting (ch);
2793 2854
2855 prev_ch = ch;
2794 ch = cmd_getc (); 2856 ch = cmd_getc ();
2795 } 2857 }
2796 2858
2797 if (ch > CSI_7F) 2859 if (ch > CSI_7F)
2798 return; 2860 return;
… …
2829 2891
2830 case '?': 2892 case '?':
2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2893 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2832 process_terminal_mode (ch, priv, nargs, arg); 2894 process_terminal_mode (ch, priv, nargs, arg);
2833 break; 2895 break;
2896
2897 case '!':
2898 if (ch == CSI_70)
2899 {
2900 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2901 scr_soft_reset ();
2902
2903 static const int pm_h[] = { 7, 25 };
2904 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2905
2906 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2907 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2834 } 2908 }
2909 break;
2910 }
2911
2835 return; 2912 return;
2836 } 2913 }
2837 2914
2838 switch (ch) 2915 switch (ch)
2839 { 2916 {
… …
2853 } 2930 }
2854 break; 2931 break;
2855#endif 2932#endif
2856 2933
2857 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2934 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2858 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2935 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2859 arg[0] = -arg[0]; 2936 arg[0] = -arg[0];
2860 /* FALLTHROUGH */ 2937 /* FALLTHROUGH */
2861 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2938 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2862 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2939 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2863 scr_gotorc (arg[0], 0, RELATIVE); 2940 scr_gotorc (arg[0], 0, RELATIVE);
2864 break; 2941 break;
2865 2942
2866 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2943 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2867 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2944 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3017 scr_insert_mode (1); 3094 scr_insert_mode (1);
3018 else if (arg[0] == 20) 3095 else if (arg[0] == 20)
3019 priv_modes |= PrivMode_LFNL; 3096 priv_modes |= PrivMode_LFNL;
3020 break; 3097 break;
3021 3098
3099 case CSI_71: // DESCUSR: set cursor style
3100 if (prev_ch == ' ')
3101 set_cursor_style (arg[0]);
3102 break;
3103
3022 /* 3104 /*
3023 * PRIVATE USE beyond this point. All CSI_7? sequences here 3105 * PRIVATE USE beyond this point. All CSI_7? sequences here
3024 */ 3106 */
3025 case CSI_72: /* DECSTBM: set top and bottom margins */ 3107 case CSI_72: /* DECSTBM: set top and bottom margins */
3026 if (nargs == 1) 3108 if (nargs == 1)
… …
3054 } 3136 }
3055} 3137}
3056/*}}} */ 3138/*}}} */
3057 3139
3058#if !ENABLE_MINIMAL 3140#if !ENABLE_MINIMAL
3059/* ARGSUSED */
3060void 3141void
3061rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3142rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3062{ 3143{
3063 int x, y; 3144 int x, y;
3064 XWindowAttributes wattr; 3145 XWindowAttributes wattr;
… …
3073 { 3154 {
3074 /* 3155 /*
3075 * commands 3156 * commands
3076 */ 3157 */
3077 case 1: /* deiconify window */ 3158 case 1: /* deiconify window */
3078 XMapWindow (dpy, parent[0]); 3159 XMapWindow (dpy, parent);
3079 break; 3160 break;
3080 case 2: /* iconify window */ 3161 case 2: /* iconify window */
3081 XIconifyWindow (dpy, parent[0], display->screen); 3162 XIconifyWindow (dpy, parent, display->screen);
3082 break; 3163 break;
3083 case 3: /* set position (pixels) */ 3164 case 3: /* set position (pixels) */
3084 XMoveWindow (dpy, parent[0], args[1], args[2]); 3165 XMoveWindow (dpy, parent, args[1], args[2]);
3085 break; 3166 break;
3086 case 4: /* set size (pixels) */ 3167 case 4: /* set size (pixels) */
3087 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3168 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3088 break; 3169 break;
3089 case 5: /* raise window */ 3170 case 5: /* raise window */
3090 XRaiseWindow (dpy, parent[0]); 3171 XRaiseWindow (dpy, parent);
3091 break; 3172 break;
3092 case 6: /* lower window */ 3173 case 6: /* lower window */
3093 XLowerWindow (dpy, parent[0]); 3174 XLowerWindow (dpy, parent);
3094 break; 3175 break;
3095 case 7: /* refresh window */ 3176 case 7: /* refresh window */
3096 scr_touch (true); 3177 scr_touch (true);
3097 break; 3178 break;
3098 case 8: /* set size (chars) */ 3179 case 8: /* set size (chars) */
… …
3101 break; 3182 break;
3102 3183
3103 //case 9: NYI, TODO, restore maximized window or maximize window 3184 //case 9: NYI, TODO, restore maximized window or maximize window
3104 default: 3185 default:
3105 if (args[0] >= 24) /* set height (chars) */ 3186 if (args[0] >= 24) /* set height (chars) */
3106 set_widthheight ((unsigned int)width, 3187 set_widthheight ((unsigned int)vt_width,
3107 (unsigned int) (args[1] * fheight)); 3188 (unsigned int) (args[1] * fheight));
3108 break; 3189 break;
3109 3190
3110 /* 3191 /*
3111 * reports - some output format copied from XTerm 3192 * reports - some output format copied from XTerm
3112 */ 3193 */
3113 case 11: /* report window state */ 3194 case 11: /* report window state */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3196 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3116 break; 3197 break;
3117 case 13: /* report window position */ 3198 case 13: /* report window position */
3118 XGetWindowAttributes (dpy, parent[0], &wattr); 3199 XGetWindowAttributes (dpy, parent, &wattr);
3119 XTranslateCoordinates (dpy, parent[0], wattr.root, 3200 XTranslateCoordinates (dpy, parent, wattr.root,
3120 -wattr.border_width, -wattr.border_width, 3201 -wattr.border_width, -wattr.border_width,
3121 &x, &y, &wdummy); 3202 &x, &y, &wdummy);
3122 tt_printf ("\033[3;%d;%dt", x, y); 3203 tt_printf ("\033[3;%d;%dt", x, y);
3123 break; 3204 break;
3124 case 14: /* report window size (pixels) */ 3205 case 14: /* report window size (pixels) */
3125 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3126 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3207 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3127 break; 3208 break;
3128 case 18: /* report text area size (chars) */ 3209 case 18: /* report text area size (chars) */
3129 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3210 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3130 break; 3211 break;
… …
3132 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3213 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3133 break; 3214 break;
3134 case 20: /* report icon label */ 3215 case 20: /* report icon label */
3135 { 3216 {
3136 char *s; 3217 char *s;
3137 XGetIconName (dpy, parent[0], &s); 3218 XGetIconName (dpy, parent, &s);
3138 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3219 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3139 XFree (s); 3220 XFree (s);
3140 } 3221 }
3141 break; 3222 break;
3142 case 21: /* report window title */ 3223 case 21: /* report window title */
3143 { 3224 {
3144 char *s; 3225 char *s;
3145 XFetchName (dpy, parent[0], &s); 3226 XFetchName (dpy, parent, &s);
3146 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3227 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3147 XFree (s); 3228 XFree (s);
3148 } 3229 }
3149 break; 3230 break;
3150 } 3231 }
… …
3160rxvt_term::get_to_st (unicode_t &ends_how) 3241rxvt_term::get_to_st (unicode_t &ends_how)
3161{ 3242{
3162 unicode_t ch; 3243 unicode_t ch;
3163 bool seen_esc = false; 3244 bool seen_esc = false;
3164 unsigned int n = 0; 3245 unsigned int n = 0;
3165 wchar_t string[STRING_MAX]; 3246 wchar_t string[CBUFSIZ];
3166 3247
3167 while ((ch = cmd_getc ()) != NOCHAR) 3248 while ((ch = cmd_getc ()) != NOCHAR)
3168 { 3249 {
3169 if (seen_esc) 3250 if (seen_esc)
3170 { 3251 {
… …
3185 else if (ch < 0x20) 3266 else if (ch < 0x20)
3186 return NULL; /* other control character - exit */ 3267 return NULL; /* other control character - exit */
3187 3268
3188 seen_esc = false; 3269 seen_esc = false;
3189 3270
3190 if (n >= STRING_MAX - 1) 3271 if (n >= sizeof (string) - 1)
3191 // stop at some sane length 3272 // stop at some sane length
3192 return NULL; 3273 return NULL;
3193 3274
3194 string[n++] = ch; 3275 string[n++] = ch;
3195 } 3276 }
… …
3206 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3207 */ 3288 */
3208void 3289void
3209rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3210{ 3291{
3211 char *s;
3212 unicode_t eh;
3213
3214 /* 3292 /*
3215 * Not handled yet 3293 * Not handled yet
3216 */ 3294 */
3295
3296 unicode_t eh;
3217 s = get_to_st (eh); 3297 char *s = get_to_st (eh);
3218 if (s) 3298 if (s)
3219 free (s); 3299 free (s);
3220 3300
3221 return; 3301 return;
3222} 3302}
… …
3226 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3227 */ 3307 */
3228void 3308void
3229rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3230{ 3310{
3231 unicode_t ch, eh;
3232 int arg; 3311 int arg;
3233 3312
3234 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3235 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3236 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3237 3316
3238 if (ch == ';') 3317 if (ch == ';')
3239 { 3318 {
3319 unicode_t eh;
3240 char *s = get_to_st (eh); 3320 char *s = get_to_st (eh);
3241 3321
3242 if (s) 3322 if (s)
3243 { 3323 {
3244 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, eh);
… …
3268 3348
3269/* 3349/*
3270 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3350 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3271 */ 3351 */
3272void 3352void
3273rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3353rxvt_term::process_xterm_seq (int op, char *str, char resp)
3274{ 3354{
3275 int color; 3355 int color;
3276 char *buf, *name; 3356 char *buf, *name;
3277 bool query = str[0] == '?' && !str[1]; 3357 bool query = str[0] == '?' && !str[1];
3278 int saveop = op; 3358 int saveop = op;
… …
3305 unsigned long bytes_after; 3385 unsigned long bytes_after;
3306 unsigned char *value = 0; 3386 unsigned char *value = 0;
3307 const char *str = ""; 3387 const char *str = "";
3308 3388
3309 if (prop 3389 if (prop
3310 && XGetWindowProperty (dpy, parent[0], 3390 && XGetWindowProperty (dpy, parent,
3311 prop, 0, 1<<16, 0, AnyPropertyType, 3391 prop, 0, 1<<16, 0, AnyPropertyType,
3312 &actual_type, &actual_format, 3392 &actual_type, &actual_format,
3313 &nitems, &bytes_after, &value) == Success 3393 &nitems, &bytes_after, &value) == Success
3314 && actual_type != None 3394 && actual_type != None
3315 && actual_format == 8) 3395 && actual_format == 8)
3316 str = (const char *)(value); 3396 str = (const char *)(value);
3317 3397
3318 tt_printf ("\033]%d;%s%c", op, str, resp); 3398 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3319 3399
3320 XFree (value); 3400 XFree (value);
3321 } 3401 }
3322 else 3402 else
3323 { 3403 {
3324 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3404 char *eq = strchr (str, '=');
3325 3405
3326 if (eq) 3406 if (eq)
3327 { 3407 {
3328 *eq = 0; 3408 *eq = 0;
3329 set_utf8_property (display->atom (str), eq + 1); 3409 set_utf8_property (display->atom (str), eq + 1);
3330 } 3410 }
3331 else 3411 else
3332 XDeleteProperty (dpy, parent[0], 3412 XDeleteProperty (dpy, parent,
3333 display->atom (str)); 3413 display->atom (str));
3334 } 3414 }
3335 break; 3415 break;
3336 3416
3337 case XTerm_Color: 3417 case XTerm_Color:
… …
3369 process_color_seq (op, Color_pointer_fg, str, resp); 3449 process_color_seq (op, Color_pointer_fg, str, resp);
3370 break; 3450 break;
3371 case XTerm_Color_pointer_bg: 3451 case XTerm_Color_pointer_bg:
3372 process_color_seq (op, Color_pointer_bg, str, resp); 3452 process_color_seq (op, Color_pointer_bg, str, resp);
3373 break; 3453 break;
3454#ifdef OPTION_HC
3455 case XTerm_Color_HC:
3456 process_color_seq (op, Color_HC, str, resp);
3457 break;
3458 case XTerm_Color_HTC:
3459 process_color_seq (op, Color_HTC, str, resp);
3460 break;
3461#endif
3374#ifndef NO_BOLD_UNDERLINE_REVERSE 3462#ifndef NO_BOLD_UNDERLINE_REVERSE
3375 case XTerm_Color_RV:
3376 process_color_seq (op, Color_RV, str, resp);
3377 break;
3378 case Rxvt_Color_BD:
3379 case URxvt_Color_BD: 3463 case URxvt_Color_BD:
3380 process_color_seq (op, Color_BD, str, resp); 3464 process_color_seq (op, Color_BD, str, resp);
3381 break; 3465 break;
3382 case Rxvt_Color_UL:
3383 case URxvt_Color_UL: 3466 case URxvt_Color_UL:
3384 process_color_seq (op, Color_UL, str, resp); 3467 process_color_seq (op, Color_UL, str, resp);
3385 break; 3468 break;
3386 case URxvt_Color_IT: 3469 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3470 process_color_seq (op, Color_IT, str, resp);
3388 break; 3471 break;
3389#endif 3472#endif
3390#if ENABLE_TRANSPARENCY 3473 case URxvt_Color_border:
3474 process_color_seq (op, Color_border, str, resp);
3475 break;
3476
3477#if BG_IMAGE_FROM_ROOT
3391 case URxvt_Color_tint: 3478 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3479 process_color_seq (op, Color_tint, str, resp);
3393 { 3480 {
3394 bool changed = false; 3481 bool changed = false;
3395 3482
3396 if (ISSET_PIXCOLOR (Color_tint)) 3483 if (ISSET_PIXCOLOR (Color_tint))
3397 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3484 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3398 else
3399 changed = bgPixmap.unset_tint ();
3400 3485
3401 if (changed) 3486 if (changed)
3402 update_background (); 3487 update_background ();
3403 } 3488 }
3404 3489
… …
3408#if BG_IMAGE_FROM_FILE 3493#if BG_IMAGE_FROM_FILE
3409 case Rxvt_Pixmap: 3494 case Rxvt_Pixmap:
3410 if (!strcmp (str, "?")) 3495 if (!strcmp (str, "?"))
3411 { 3496 {
3412 char str[256]; 3497 char str[256];
3498 int h_scale = fimage.h_scale;
3499 int v_scale = fimage.v_scale;
3500 int h_align = fimage.h_align;
3501 int v_align = fimage.v_align;
3413 3502
3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3503 sprintf (str, "[%dx%d+%d+%d]",
3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3504 h_scale, v_scale,
3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3505 h_align, v_align);
3417 process_xterm_seq (XTerm_title, str, CHAR_ST); 3506 process_xterm_seq (XTerm_title, str, CHAR_ST);
3418 } 3507 }
3419 else 3508 else
3420 { 3509 {
3421 int changed = 0; 3510 bool changed = false;
3422 3511
3423 if (*str != ';') 3512 if (*str != ';')
3424 { 3513 {
3425 /* reset to default scaling :*/ 3514 try
3426 bgPixmap.unset_geometry (); 3515 {
3427 if (bgPixmap.set_file (str)) /* change pixmap */ 3516 fimage.set_file_geometry (this, str);
3428 changed++; 3517 changed = true;
3429 str = strchr (str, ';'); 3518 }
3430 if (str == NULL) 3519 catch (const class rxvt_failure_exception &e)
3431 bgPixmap.set_defaultGeometry (); 3520 {
3521 }
3432 } 3522 }
3433 3523 else
3434 while (str)
3435 { 3524 {
3436 str++; 3525 str++;
3437 if (bgPixmap.set_geometry (str)) 3526 if (fimage.set_geometry (str, true))
3438 changed++; 3527 changed = true;
3439 str = strchr (str, ';');
3440 } 3528 }
3441 3529
3442 if (changed) 3530 if (changed)
3531 {
3532 if (bg_window_position_sensitive ())
3533 {
3534 int x, y;
3535 get_window_origin (x, y);
3536 parent_x = x;
3537 parent_y = y;
3538 }
3443 update_background (); 3539 update_background ();
3540 }
3444 } 3541 }
3445 break; 3542 break;
3446#endif 3543#endif
3447 3544
3448 case XTerm_logfile: 3545 case XTerm_logfile:
… …
3535 * 's' = save 3632 * 's' = save
3536 * 'r' = restore 3633 * 'r' = restore
3537 * 't' = toggle 3634 * 't' = toggle
3538 * so no need for fancy checking 3635 * so no need for fancy checking
3539 */ 3636 */
3540int 3637int ecb_cold
3541rxvt_term::privcases (int mode, unsigned long bit) 3638rxvt_term::privcases (int mode, unsigned long bit)
3542{ 3639{
3543 int state; 3640 int state;
3544 3641
3545 if (mode == 's') 3642 if (mode == 's')
3546 { 3643 {
3547 SavedModes |= (priv_modes & bit); 3644 if (priv_modes & bit)
3645 SavedModes |= bit;
3646 else
3647 SavedModes &= ~bit;
3548 return -1; 3648 return -1;
3549 } 3649 }
3550 else 3650 else
3551 { 3651 {
3552 if (mode == 'r') 3652 if (mode == 'r')
3553 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3653 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3554 else 3654 else
3555 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3655 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3556 set_privmode (bit, state); 3656
3657 if (state)
3658 priv_modes |= bit;
3659 else
3660 priv_modes &= ~bit;
3557 } 3661 }
3558 3662
3559 return state; 3663 return state;
3560} 3664}
3561 3665
3562/* we're not using priv _yet_ */ 3666/* we're not using priv _yet_ */
3563void 3667void
3564rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3668rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3565{ 3669{
3566 unsigned int i, j; 3670 unsigned int i, j;
3567 int state; 3671 int state;
3568 3672
3569 static const struct 3673 static const struct
3570 { 3674 {
3571 const int argval; 3675 const int argval;
3572 const unsigned long bit; 3676 const unsigned long bit;
3573 } argtopriv[] = { 3677 } argtopriv[] = {
3574 { 1, PrivMode_aplCUR }, 3678 { 1, PrivMode_aplCUR }, // DECCKM
3575 { 2, PrivMode_vt52 }, 3679 { 2, PrivMode_vt52 }, // DECANM
3576 { 3, PrivMode_132 }, 3680 { 3, PrivMode_132 }, // DECCOLM
3577 { 4, PrivMode_smoothScroll }, 3681 { 4, PrivMode_smoothScroll }, // DECSCLM
3578 { 5, PrivMode_rVideo }, 3682 { 5, PrivMode_rVideo }, // DECSCNM
3579 { 6, PrivMode_relOrigin }, 3683 { 6, PrivMode_relOrigin }, // DECOM
3580 { 7, PrivMode_Autowrap }, 3684 { 7, PrivMode_Autowrap }, // DECAWM
3581 // 8, bi-directional support mode 3685 // 8, auto-repeat keys // DECARM
3582 { 9, PrivMode_MouseX10 }, 3686 { 9, PrivMode_MouseX10 },
3583 // 18, 19 printing-related 3687 // 18 end FF to printer after print screen
3688 // 19 Print screen prints full screen/scroll region
3584 { 25, PrivMode_VisibleCursor }, 3689 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3585#ifdef scrollBar_esc 3690#ifdef scrollBar_esc
3586 { scrollBar_esc, PrivMode_scrollBar }, 3691 { scrollBar_esc, PrivMode_scrollBar },
3587#endif 3692#endif
3588 { 35, PrivMode_ShiftKeys }, // rxvt extension 3693 { 35, PrivMode_ShiftKeys }, // rxvt extension
3694 // 38, tektronix mode // DECTEK
3589 { 40, PrivMode_132OK }, 3695 { 40, PrivMode_132OK },
3590 // 41 xterm more fixes NYI 3696 // 41 xterm more fixes NYI
3591 // 45 margin bell NYI 3697 // 45 margin bell NYI
3592 // 46 start logging 3698 // 46 start logging
3593 { 47, PrivMode_Screen }, 3699 { 47, PrivMode_Screen },
3594 { 66, PrivMode_aplKP }, 3700 { 66, PrivMode_aplKP }, // DECNKM
3595#ifndef NO_BACKSPACE_KEY 3701#ifndef NO_BACKSPACE_KEY
3596 { 67, PrivMode_BackSpace }, 3702 { 67, PrivMode_BackSpace }, // DECBKM
3597#endif 3703#endif
3598 { 1000, PrivMode_MouseX11 }, 3704 { 1000, PrivMode_MouseX11 },
3599 { 1002, PrivMode_MouseBtnEvent }, 3705 { 1002, PrivMode_MouseBtnEvent },
3600 { 1003, PrivMode_MouseAnyEvent }, 3706 { 1003, PrivMode_MouseAnyEvent },
3707#if ENABLE_FRILLS
3708 { 1005, PrivMode_ExtModeMouse },
3709#endif
3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3710 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3602 { 1011, PrivMode_Keypress }, // rxvt extension 3711 { 1011, PrivMode_Keypress }, // rxvt extension
3712#if ENABLE_FRILLS
3713 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3714#endif
3603 // 1035 enable modifiers for alt, numlock NYI 3715 // 1035 enable modifiers for alt, numlock NYI
3604 // 1036 send ESC for meta keys NYI 3716 // 1036 send ESC for meta keys NYI
3605 // 1037 send DEL for keypad delete NYI 3717 // 1037 send DEL for keypad delete NYI
3606 { 1047, PrivMode_Screen }, 3718 { 1047, PrivMode_Screen },
3607 // 1048 save and restore cursor 3719 // 1048 save and restore cursor, implemented in code
3608 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3720 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3609 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3721 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3610 { 2004, PrivMode_BracketPaste }, 3722 { 2004, PrivMode_BracketPaste },
3611 }; 3723 };
3612 3724
… …
3622 for (i = 0; i < nargs; i++) 3734 for (i = 0; i < nargs; i++)
3623 { 3735 {
3624 state = -1; 3736 state = -1;
3625 3737
3626 /* basic handling */ 3738 /* basic handling */
3627 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3739 for (j = 0; j < ecb_array_length (argtopriv); j++)
3628 if (argtopriv[j].argval == arg[i]) 3740 if (argtopriv[j].argval == arg[i])
3629 { 3741 {
3630 state = privcases (mode, argtopriv[j].bit); 3742 state = privcases (mode, argtopriv[j].bit);
3631 break; 3743 break;
3632 } 3744 }
… …
3640 3752
3641 scr_touch (true); 3753 scr_touch (true);
3642 break; 3754 break;
3643#endif 3755#endif
3644 case 1048: /* alternative cursor save */ 3756 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3757 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3758 if (mode == 0)
3648 scr_cursor (RESTORE); 3759 scr_cursor (RESTORE);
3649 else if (mode == 1) 3760 else if (mode == 1)
3650 scr_cursor (SAVE); 3761 scr_cursor (SAVE);
… …
3659 case 2: /* VT52 mode */ 3770 case 2: /* VT52 mode */
3660 /* oddball mode. should be set regardless of set/reset 3771 /* oddball mode. should be set regardless of set/reset
3661 * parameter. Return from VT52 mode with an ESC < from 3772 * parameter. Return from VT52 mode with an ESC < from
3662 * within VT52 mode 3773 * within VT52 mode
3663 */ 3774 */
3664 set_privmode (PrivMode_vt52, 1); 3775 priv_modes |= PrivMode_vt52;
3665 break; 3776 break;
3666 case 3: /* 80/132 */ 3777 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3778 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3779 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 }
3672 break; 3780 break;
3673 case 4: /* smooth scrolling */ 3781 case 4: /* smooth scrolling */
3674 set_option (Opt_jumpScroll, !state); 3782 set_option (Opt_jumpScroll, !state);
3675 break; 3783 break;
3676 case 5: /* reverse video */ 3784 case 5: /* reverse video */
… …
3687 if (state) /* orthogonal */ 3795 if (state) /* orthogonal */
3688 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3796 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3689 break; 3797 break;
3690#ifdef scrollBar_esc 3798#ifdef scrollBar_esc
3691 case scrollBar_esc: 3799 case scrollBar_esc:
3692 if (scrollBar.map (state)) 3800 scrollBar.map (state);
3693 {
3694 resize_all_windows (0, 0, 0); 3801 resize_all_windows (0, 0, 0);
3695 scr_touch (true); 3802 scr_touch (true);
3696 }
3697 break; 3803 break;
3698#endif 3804#endif
3699 case 25: /* visible/invisible cursor */ 3805 case 25: /* visible/invisible cursor */
3700 scr_cursor_visible (state); 3806 scr_cursor_visible (state);
3701 break; 3807 break;
… …
3714 case 1003: 3820 case 1003:
3715 if (state) 3821 if (state)
3716 { 3822 {
3717 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3823 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3718 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;
3719 vt_emask_mouse = PointerMotionMask; 3826 vt_emask_mouse = PointerMotionMask;
3720 } 3827 }
3721 else 3828 else
3722 vt_emask_mouse = NoEventMask; 3829 vt_emask_mouse = NoEventMask;
3830
3723 vt_select_input (); 3831 vt_select_input ();
3724 break; 3832 break;
3725 case 1010: /* scroll to bottom on TTY output inhibit */ 3833 case 1010: /* scroll to bottom on TTY output inhibit */
3726 set_option (Opt_scrollTtyOutput, !state); 3834 set_option (Opt_scrollTtyOutput, !state);
3727 break; 3835 break;
3728 case 1011: /* scroll to bottom on key press */ 3836 case 1011: /* scroll to bottom on key press */
3729 set_option (Opt_scrollTtyKeypress, state); 3837 set_option (Opt_scrollTtyKeypress, state);
3730 break; 3838 break;
3731 case 1047: /* secondary screen w/ clearing last */ 3839 case 1047: /* secondary screen w/ clearing last */
3732 if (option (Opt_secondaryScreen)) 3840 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3841 if (!state)
3734 scr_erase_screen (2); 3842 scr_erase_screen (2);
3843
3735 scr_change_screen (state); 3844 scr_change_screen (state);
3736 break; 3845 break;
3737 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
3738 scr_change_screen (state); 3851 scr_change_screen (state);
3852
3739 if (option (Opt_secondaryScreen)) 3853 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3854 if (state)
3741 scr_erase_screen (2); 3855 scr_erase_screen (2);
3856 else
3857 scr_cursor (RESTORE);
3742 break; 3858 break;
3743 default: 3859 default:
3744 break; 3860 break;
3745 } 3861 }
3746 } 3862 }
3747} 3863}
3748/*}}} */ 3864/*}}} */
3749 3865
3750/*{{{ process sgr sequences */ 3866/*{{{ process sgr sequences */
3751void 3867void ecb_hot
3752rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3868rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3753{ 3869{
3754 unsigned int i; 3870 unsigned int i;
3755 short rendset; 3871 short rendset;
3756 int rendstyle; 3872 int rendstyle;
… …
3897 break; 4013 break;
3898#endif 4014#endif
3899 } 4015 }
3900 } 4016 }
3901} 4017}
4018
4019void
4020rxvt_term::set_cursor_style (int style)
4021{
4022 if (!IN_RANGE_INC (style, 0, 4))
4023 return;
4024
4025 set_option (Opt_cursorUnderline, style >= 3);
4026
4027#ifdef CURSOR_BLINK
4028 set_option (Opt_cursorBlink, !style || (style & 1));
4029 cursor_blink_reset ();
4030#endif
4031
4032 want_refresh = 1;
4033}
3902/*}}} */ 4034/*}}} */
3903 4035
3904/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3905void
3906rxvt_term::process_graphics ()
3907{
3908 unicode_t ch, cmd = cmd_getc ();
3909
3910 if (cmd == 'Q')
3911 {
3912 /* query graphics */
3913 tt_printf ("\033G0\012"); /* no graphics */
3914 return;
3915 }
3916 /* swallow other graphics sequences until terminating ':' */
3917 do
3918 ch = cmd_getc ();
3919 while (ch != ':');
3920}
3921/*}}} */
3922
3923/* ------------------------------------------------------------------------- */ 4036/* ---------------------------------------------------------------------- */
4037/* Write data to the pty as typed by the user, pasted with the mouse,
4038 * or generated by us in response to a query ESC sequence.
4039 */
3924 4040
3925/* 4041/*
3926 * Send printf () formatted output to the command. 4042 * Send printf () formatted output to the command.
3927 * Only use for small amounts of data. 4043 * Only use for small amounts of data.
3928 */ 4044 */
… …
3936 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4052 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3937 va_end (arg_ptr); 4053 va_end (arg_ptr);
3938 tt_write (buf, strlen (buf)); 4054 tt_write (buf, strlen (buf));
3939} 4055}
3940 4056
3941/* ---------------------------------------------------------------------- */
3942/* Write data to the pty as typed by the user, pasted with the mouse, 4057/* Write data to the pty as typed by the user. */
3943 * or generated by us in response to a query ESC sequence. 4058void
3944 */ 4059rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3945const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4060{
4061 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4062 return;
4063
4064 if (option (Opt_scrollTtyKeypress))
4065 if (view_start)
4066 {
4067 view_start = 0;
4068 want_refresh = 1;
4069 }
4070
4071 tt_write_ (data, len);
4072}
3946 4073
3947void 4074void
3948rxvt_term::tt_write (const char *data, unsigned int len) 4075rxvt_term::tt_write (const char *data, unsigned int len)
3949{ 4076{
3950 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4077 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3951 return; 4078 return;
3952 4079
4080 tt_write_ (data, len);
4081}
4082
4083static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4084
4085void
4086rxvt_term::tt_write_ (const char *data, unsigned int len)
4087{
3953 if (pty->pty < 0) 4088 if (pty->pty < 0)
3954 return; 4089 return;
3955 4090
3956 if (v_buflen == 0) 4091 if (v_buflen == 0)
3957 { 4092 {
3958 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4093 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3959 4094
4095 max_it (written, 0);
4096
3960 if ((unsigned int)written == len) 4097 if (written == len)
3961 return; 4098 return;
3962 4099
3963 data += written; 4100 data += written;
3964 len -= written; 4101 len -= written;
3965 } 4102 }
3966 4103
3967 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4104 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3968 4105
3969 memcpy (v_buffer + v_buflen, data, len); 4106 memcpy (v_buffer + v_buflen, data, len);
3970 v_buflen += len; 4107 v_buflen += len;
3971 4108
3972 pty_ev.set (ev::READ | ev::WRITE); 4109 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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