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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.564 by sf-exg, Fri Mar 27 15:06:09 2015 UTC

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

Diff Legend

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