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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.354 by sasha, Wed Sep 12 21:06:08 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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
… …
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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
59// exception thrown when the command parser runs out of input data 68#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input;
61 69
62/*{{{ Convert the keypress event into a string */ 70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0,
105 XK_Home, 0x21f1,
106 XK_End, 0x21f2,
107
108 XK_Execute, 0x2318,
109 XK_Begin, 0x2320,
110 XK_Delete, 0x2326,
111 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380,
114 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389,
117 XK_Break, 0x238a,
118 XK_Escape, 0x238b,
119 XK_Undo, 0x238c,
120 XK_Print, 0x2399,
121
122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
130 XK_KP_Space, 0x2422,
131#endif
132 0,
133};
134
63void 135void
136rxvt_term::iso14755_54 (int x, int y)
137{
138 x = Pixel2Col (x);
139 y = Pixel2Row (y);
140
141 if (!IN_RANGE_EXC (x, 0, ncol)
142 || !IN_RANGE_EXC (y, 0, nrow))
143 return;
144
145 for (;;)
146 {
147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
150
151 if (t != NOCHAR || !x)
152 {
153 iso14755_51 (l.t[x], l.r[x], x, y);
154 iso14755buf = ISO_14755_54;
155 break;
156 }
157
158 x--;
159 }
160}
161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
165 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname;
168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171
172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch))
174 {
175 len = rxvt_composite.expand (ch, 0);
176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr);
178 }
179 else
180# endif
181 {
182 ch2 = ch;
183
184 alloc = 0;
185 chr = &ch2;
186 len = 1;
187 }
188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
64rxvt_term::lookup_key (XKeyEvent &ev) 284rxvt_term::hex_keyval (XKeyEvent &ev)
285{
286 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++)
289 {
290 KeySym k = XLookupKeysym (&ev, index);
291
292 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
293 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
294 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
295 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
296 }
297
298 return -1;
299}
300#endif
301
302void
303rxvt_term::key_press (XKeyEvent &ev)
65{ 304{
66 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
67 unsigned int newlen; 306 unsigned int newlen;
68 KeySym keysym; 307 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 308 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
74 315
75 /* 316 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
78 * 319 *
79 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
80 */ 321 */
81 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
84 325
85 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
86 { 327 {
87 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 337 Status status_return;
97 338
98#if 0 339#if 0
99#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
103 else 344 else
104#endif 345#endif
105#endif 346#endif
106 { 347 {
… …
108 349
109 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
113 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
116 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 360 SET_LOCALE (locale);
118 361
119 if (status_return == XLookupChars 362 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
142 } 385 }
143 else 386 else
144#endif 387#endif
145 { 388 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
148 } 391 }
149 392
150 if (valid_keysym) 393 if (valid_keysym)
151 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
152 if (TermWin.saveLines) 400 if (saveLines)
153 { 401 {
154#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 403 if (!ctrl && !meta)
156 {
157#else 404#else
158 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
406#endif
159 { 407 {
160#endif
161 int lnsppg; 408 int lnsppg;
162 409
163#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 412#else
166 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
167#endif 414#endif
168 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
169 { 416 {
170 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
171 return; 418 return;
… …
199 scr_move_to (0, 1); 446 scr_move_to (0, 1);
200 return; 447 return;
201 } 448 }
202 else if (keysym == XK_End) 449 else if (keysym == XK_End)
203 { 450 {
204 scr_move_to (1, 0); 451 scr_move_to (1, 1);
205 return; 452 return;
206 } 453 }
207 } 454 }
208#endif 455#endif
209 } 456 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 461 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 462 {
216 keysym += (XK_F11 - XK_F1); 463 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 464 shft = 0; /* turn off Shift */
218 } 465 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 467 {
221 switch (keysym) 468 switch (keysym)
222 { 469 {
223 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
226 return; 473 return;
474#if TODO
227 /* rxvt extras */ 475 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 477 change_font (FONT_UP);
230 return; 478 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 480 change_font (FONT_DN);
233 return; 481 return;
482#endif
234 } 483 }
235 } 484 }
236 } 485 }
237#ifdef PRINTPIPE 486
238 if (keysym == XK_Print) 487#if ENABLE_FRILLS || ISO_14755
239 { 488 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 489 if (shft && ctrl)
241 return;
242 } 490 {
243#endif 491 int hv;
244 492
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 493 if (iso14755buf & ISO_14755_51
246 { 494 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 495 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 496 {
250 unsigned int l; 497 commit_iso14755 ();
251 const unsigned char *kbuf0; 498 iso14755buf = ISO_14755_51;
252 499# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 500 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 501# endif
261 ) 502 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 503 }
266 504 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
512 else if ((hv = hex_keyval (ev)) >= 0)
513 {
514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
515 | hv | ISO_14755_51;
516# if ISO_14755
517 iso14755_51 (iso14755buf & ISO_14755_MASK);
518# endif
268 return; 519 return;
269 } 520 }
270 else 521 else
271#endif
272 { 522 {
523# if ISO_14755
524 scr_overlay_off ();
525# endif
526 iso14755buf = 0;
527 }
528 }
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
531 if (!(iso14755buf & ISO_14755_STARTED))
532 {
533 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
536 scr_overlay_set (0, 0, "ISO 14755 mode");
537# endif
538 }
539#endif
540
541#ifdef PRINTPIPE
542 if (keysym == XK_Print)
543 {
544 scr_printscreen (ctrl | shft);
545 return;
546 }
547#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
273 newlen = 1; 553 newlen = 1;
274 switch (keysym) 554 switch (keysym)
275 { 555 {
276#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 557 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
279 { 559 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
283 } 563 }
284 else 564 else
285 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
286 break; 566 break;
287#endif 567#endif
288#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
289 case XK_Delete: 579 case XK_Delete:
290 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
291 break; 581 break;
292#endif 582#endif
293 case XK_Tab: 583 case XK_Tab:
294 if (shft) 584 if (shft)
295 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
296 else 586 else
297 { 587 {
298#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 589 if (ctrl)
300 meta = 1; 590 meta = 1;
… …
306 newlen = 0; 596 newlen = 0;
307 } 597 }
308 break; 598 break;
309 599
310#ifdef XK_KP_Left 600#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
316 { 606 {
317 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 609 break;
320 } 610 }
321 else 611 else
322 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
325#endif 615#endif
326 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 622 /* do Shift first */
333 if (shft) 623 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 625 else if (ctrl)
336 { 626 {
337 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 629 }
340 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
342 break; 632 break;
343 633
344#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
346 case XK_KP_Prior: 636 case XK_KP_Prior:
347 /* allow shift to override */ 637 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
349 { 639 {
350 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
351 break; 641 break;
352 } 642 }
353 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
354# endif 644# endif
355 case XK_Prior: 645 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
357 break; 647 break;
358# ifdef XK_KP_Next 648# ifdef XK_KP_Next
359 case XK_KP_Next: 649 case XK_KP_Next:
360 /* allow shift to override */ 650 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
362 { 652 {
363 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
364 break; 654 break;
365 } 655 }
366 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
367# endif 657# endif
368 case XK_Next: 658 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
370 break; 660 break;
371#endif 661#endif
372 case XK_KP_Enter: 662 case XK_KP_Enter:
373 /* allow shift to override */ 663 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
375 { 665 {
376 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
377 } 678 }
378 else 679 else
379 { 680 {
380 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
382 } 683 }
383 break; 684 break;
384 685
385#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
386 case XK_KP_Begin: 687 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
388 break; 689 break;
389 690
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 691#endif
398 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
404 break; 698 break;
405 699
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 716 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
424 { 718 {
425 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 721 }
428 else 722 else
429 { 723 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
432 } 726 }
433 break; 727 break;
434 728
435 case XK_Find: 729 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
437 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
438 case XK_Insert: 743 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
440 break; 745 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 747 case DXK_Remove:
443 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
444#endif 749#endif
445 case XK_Execute: 750 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
447 break; 752 break;
448 case XK_Select: 753 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
450 break; 755 break;
451#ifdef XK_KP_End 756#ifdef XK_KP_End
452 case XK_KP_End: 757 case XK_KP_End:
453 /* allow shift to override */ 758 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
455 { 760 {
456 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
457 break; 762 break;
458 } 763 }
459 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
460#endif 765#endif
461 case XK_End: 766 case XK_End:
462 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
463 break; 768 break;
464#ifdef XK_KP_Home 769#ifdef XK_KP_Home
465 case XK_KP_Home: 770 case XK_KP_Home:
466 /* allow shift to override */ 771 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
468 { 773 {
469 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
470 break; 775 break;
471 } 776 }
472 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
473#endif 778#endif
474 case XK_Home: 779 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
476 break; 781 break;
477 782
478#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 785
… …
532#undef FKEY 837#undef FKEY
533 default: 838 default:
534 newlen = 0; 839 newlen = 0;
535 break; 840 break;
536 } 841 }
842
537 if (newlen) 843 if (newlen)
538 len = STRLEN (kbuf); 844 len = strlen (kbuf);
539 } 845 }
540 846
541 /* 847 /*
542 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
543 */ 849 */
… …
550 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
551 { 857 {
552 len = 1; 858 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
555 else 866 else
556 { 867 {
557#ifdef META8_OPTION 868#ifdef META8_OPTION
558 /* set 8-bit on */ 869 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
560 { 871 {
561 unsigned char *ch; 872 char *ch;
562 873
563 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 875 *ch |= 0x80;
565 876
566 meta = 0; 877 meta = 0;
… …
568#endif 879#endif
569 /* nil */ ; 880 /* nil */ ;
570 } 881 }
571 } 882 }
572 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
573 if (len <= 0) 887 if (len <= 0)
574 return; /* not mapped */ 888 return; /* not mapped */
575 889
576 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 891 if (view_start)
578 { 892 {
579 TermWin.view_start = 0; 893 view_start = 0;
580 want_refresh = 1; 894 want_refresh = 1;
581 } 895 }
582 896
583 /* 897 /*
584 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 913#ifdef META8_OPTION
600 && meta_char == C0_ESC 914 && meta_char == C0_ESC
601#endif 915#endif
602 ) 916 )
603 { 917 {
604 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
605 tt_write (&ch, 1); 919 tt_write (&ch, 1);
606 } 920 }
607 921
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
619} 923}
620/*}}} */
621 924
622#if (MENUBAR_MAX) 925void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
625unsigned int 1003unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 1005{
628 unsigned int n, s; 1006 unsigned int n, s;
629 1007
630 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 1010
633 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
634 { 1012 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
639 s += n; 1017 s += n;
640 } 1018 }
… …
650 1028
651 cmd_parse (); 1029 cmd_parse ();
652 1030
653 return 0; 1031 return 0;
654} 1032}
655#endif /* MENUBAR_MAX */ 1033#endif
656 1034
657void 1035void
658rxvt_term::flush () 1036rxvt_term::flush ()
659{ 1037{
660#ifdef TRANSPARENT 1038 flush_ev.stop ();
661 if (want_full_refresh)
662 {
663 want_full_refresh = 0;
664 scr_clear ();
665 scr_touch (false);
666 want_refresh = 1;
667 }
668#endif
669 1039
670 if (want_refresh) 1040 if (want_refresh)
671 { 1041 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 {
1044 int row = view_start;
1045 int end_row = row + nrow;
1046
1047 while (row > top_row && ROW (row - 1).is_longer ())
1048 --row;
1049
1050 do
1051 {
1052 int start_row = row;
1053 line_t *l;
1054
1055 do
1056 {
1057 l = &ROW (row++);
1058
1059 if (!(l->f & LINE_FILTERED))
1060 {
1061 // line not filtered, mark it as filtered
1062 l->f |= LINE_FILTERED;
1063 while (l->is_longer ())
1064 {
1065 l = &ROW (row++);
1066 l->f |= LINE_FILTERED;
1067 }
1068
1069 // and filter it
1070 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1071
1072 break;
1073 }
1074 }
1075 while (l->is_longer () && row < end_row);
1076 }
1077 while (row < end_row);
1078 }
1079
672 scr_refresh (refresh_type); 1080 scr_refresh ();
673 scrollbar_show (1); 1081 scrollbar_show (1);
674#ifdef USE_XIM 1082#ifdef USE_XIM
675 IMSendSpot (); 1083 IMSendSpot ();
676#endif 1084#endif
677
678 } 1085 }
679 1086
680 display->flush (); 1087 display->flush ();
681} 1088}
682 1089
683void 1090void
684rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
685{ 1092{
686 SET_R (this); 1093 make_current ();
687 SET_LOCALE (locale);
688 1094
1095 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099}
1100
1101void
1102rxvt_term::flush_cb (time_watcher &w)
1103{
1104 make_current ();
1105
1106 refresh_count = 0;
689 flush (); 1107 flush ();
690} 1108}
691 1109
692#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
693void 1111void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1113{
696 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1115 want_refresh = 1;
698 1116
699 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1118}
701#endif 1119#endif
702 1120
703#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
704void 1122void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1129 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1130 }
713} 1131}
714#endif 1132#endif
715 1133
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void
1136rxvt_term::cont_scroll_cb (time_watcher &w)
1137{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
1140 {
1141 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1143 }
1144}
1145#endif
1146
1147#ifdef SELECTION_SCROLLING
1148void
1149rxvt_term::sel_scroll_cb (time_watcher &w)
1150{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1156 }
1157}
1158#endif
1159
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void
1162rxvt_term::slip_wheel_cb (time_watcher &w)
1163{
1164 if (mouse_slip_wheel_speed == 0
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1173 }
1174}
1175#endif
1176
1177#if LINUX_YIELD_HACK
1178static struct event_handler
1179{
1180 check_watcher yield_ev;
1181
1182 void yield_cb (check_watcher &w)
1183 {
1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1192 w.stop ();
1193 }
1194
1195 event_handler ()
1196 : yield_ev (this, &event_handler::yield_cb)
1197 {
1198 }
1199} event_handler;
1200#endif
1201
716bool 1202bool
717rxvt_term::pty_fill () 1203rxvt_term::pty_fill ()
718{ 1204{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1206
1207 if (CBUFSIZ == n)
1208 {
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1210 n = 0;
1211 }
720 1212
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
724 1216
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1218
727 if (n > 0) 1219 if (r > 0)
728 { 1220 {
729 cmdbuf_endp += n; 1221 cmdbuf_endp += r;
730 return true; 1222 return true;
731 } 1223 }
732 else if (n < 0 && errno != EAGAIN) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1225 {
1226#if LINUX_YIELD_HACK
1227 if (display->is_local)
1228 event_handler.yield_ev.start ();
1229#endif
1230 }
1231 else
1232 {
1233 pty_ev.stop ();
1234
1235 if (!option (Opt_hold))
733 destroy (); 1236 destroy ();
734 1237 }
1238
735 return false; 1239 return false;
736} 1240}
737 1241
738void 1242void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1244{
741 SET_R (this); 1245 make_current ();
742 SET_LOCALE (locale); 1246
1247 if (revents & EVENT_READ)
1248 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ())
1250 if (cmd_parse ())
1251 break;
743 1252
744 if (revents & EVENT_WRITE) 1253 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1254 pty_write ();
746 else if (revents & EVENT_READ) 1255}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1256
760 if (cmd_parse ()) 1257void
761 break; 1258rxvt_term::pointer_unblank ()
762 } 1259{
763 } 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1261 recolour_cursor ();
1262
1263#ifdef POINTER_BLANK
1264 hidden_pointer = 0;
1265
1266 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay);
1268#endif
764} 1269}
765 1270
766#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
767void 1272void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
781{ 1274{
782 if (! (Options & Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
783 return; 1276 return;
784 1277
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
786 XFlush (display->display); 1279 XFlush (dpy);
787 1280
788 hidden_pointer = 1; 1281 hidden_pointer = 1;
789} 1282}
790 1283
791void 1284void
792rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
793{ 1286{
794 SET_R (this); 1287 make_current ();
795 SET_LOCALE (locale);
796 1288
797 pointer_blank (); 1289 pointer_blank ();
798} 1290}
799#endif 1291#endif
800 1292
… …
807 x = ev.x; 1299 x = ev.x;
808 y = ev.y; 1300 y = ev.y;
809 pixel_position (&x, &y); 1301 pixel_position (&x, &y);
810 1302
811 if (MEvent.button == AnyButton) 1303 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1304 button_number = 3;
814 }
815 else 1305 else
816 { 1306 {
817 button_number = MEvent.button - Button1; 1307 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1308 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1309 if (button_number >= 3)
820 button_number += (64 - 3); 1310 button_number += (64 - 3);
821 } 1311 }
822 1312
823 if (PrivateModes & PrivMode_MouseX10) 1313 if (priv_modes & PrivMode_MouseX10)
824 { 1314 {
825 /* 1315 /*
826 * do not report ButtonRelease 1316 * do not report ButtonRelease
827 * no state info allowed 1317 * no state info allowed
828 */ 1318 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1337#endif
848
849 } 1338 }
850 1339
851#ifdef DEBUG_MOUSEREPORT 1340#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1341 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1342 if (key_state & 16)
854 fputc ('C', stderr); 1343 fputc ('C', stderr);
855 if (key_state & 4) 1344 if (key_state & 4)
856 fputc ('S', stderr); 1345 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1349 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1350 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1351 button_number,
863 x + 1, 1352 x + 1,
864 y + 1); 1353 y + 1);
865#else 1354#endif
1355
866 tt_printf ("\033[M%c%c%c", 1356 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
868 (32 + x + 1), 1358 (32 + x + 1),
869 (32 + y + 1)); 1359 (32 + y + 1));
870#endif
871} 1360}
872
873#ifdef USING_W11LIB
874void
875rxvt_W11_process_x_event (XEvent *ev)
876{
877 rxvt_t *r = rxvt_get_r ();
878
879 x_cb (*ev);
880}
881#endif
882 1361
883/*{{{ process an X event */ 1362/*{{{ process an X event */
884void 1363void
885rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
886{ 1365{
887 SET_R (this); 1366 make_current ();
888 SET_LOCALE (locale);
889 1367
890#if defined(CURSOR_BLINK) 1368 dLocal (Display *, dpy);
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898 1369
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1370 if (ev.xany.window == vt
900 } 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return; 1373 return;
920#endif
921 1374
1375 // for XQueryPointer
922 Window unused_root, unused_child; 1376 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1377 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1378 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
973#endif
974 1379
975 switch (ev.type) 1380 switch (ev.type)
976 { 1381 {
977 case KeyPress: 1382 case KeyPress:
978 lookup_key (ev.xkey); 1383 key_press (ev.xkey);
979 break; 1384 break;
980 1385
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1386 case KeyRelease:
983 { 1387 key_release (ev.xkey);
984 if (! (ev.xkey.state & ControlMask))
985 mouse_slip_wheel_speed = 0;
986 else
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1388 break;
995 }
996#endif
997 1389
998 case ButtonPress: 1390 case ButtonPress:
999 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1000 break; 1392 break;
1001 1393
… …
1003 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1004 break; 1396 break;
1005 1397
1006 case ClientMessage: 1398 case ClientMessage:
1007 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1009 destroy ();
1010#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink))
1016 { 1401 {
1017 /* Get Dnd data */ 1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1403 {
1019 int ActualFormat; 1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1405 {
1021 unsigned long Size, RemainingBytes; 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1407 {
1023 XGetWindowProperty (display->display, display->root, 1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1409 destroy ();
1025 0L, 1000000L, 1410 }
1026 False, AnyPropertyType, 1411#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1415 &ev);
1030 XChangeProperty (display->display, display->root, 1416#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1417 }
1032 8, PropModeReplace, 1418 }
1033 data, STRLEN (data)); 1419#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1421 {
1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1427#endif
1036 } 1428 }
1037#endif /* OFFIX_DND */
1038 break;
1039
1040 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping));
1042 break; 1429 break;
1043 1430
1044 /* 1431 /*
1045 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1065 break; 1452 break;
1066 } 1453 }
1067 break; 1454 break;
1068 1455
1069 case FocusIn: 1456 case FocusIn:
1070 if (!TermWin.focus) 1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1460 focus_in ();
1461 break;
1462
1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1467 focus_out ();
1468 break;
1469
1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0])
1071 { 1475 {
1072 TermWin.focus = 1; 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082
1083 } 1477 ;
1084 break;
1085 1478
1086 case FocusOut: 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1087 if (TermWin.focus)
1088 { 1480 {
1089 TermWin.focus = 0; 1481 seen_resize = 1;
1090 want_refresh = 1; 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0])
1106 {
1107 int height, width;
1108
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1483 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else 1484 else
1124 { 1485 {
1125 D_SIZE ((stderr, "Size: Not resizing")); 1486#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1489#endif
1126 } 1490 }
1127#endif 1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136
1137 } 1492 }
1493 break;
1494
1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1138 break; 1501 break;
1139 1502
1140 case SelectionClear: 1503 case SelectionClear:
1141 selection_clear (); 1504 selection_clear ();
1142 break; 1505 break;
1143 1506
1144 case SelectionNotify: 1507 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1508 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1510 break;
1149 1511
1150 case SelectionRequest: 1512 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1152 break; 1514 break;
1153 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1154 case UnmapNotify: 1524 case UnmapNotify:
1155 TermWin.mapped = 0; 1525 mapped = 0;
1156#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1158#endif 1528#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1159 break; 1530 break;
1160
1161 case MapNotify:
1162 TermWin.mapped = 1;
1163#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif
1166 break;
1167
1168#ifdef TRANSPARENT
1169 case ReparentNotify:
1170 rootwin_cb (ev);
1171 break;
1172#endif /* TRANSPARENT */
1173 1531
1174 case GraphicsExpose: 1532 case GraphicsExpose:
1175 case Expose: 1533 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1534 if (ev.xany.window == vt)
1177 { 1535 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1536 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1540
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1546
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1547 want_refresh = 1;
1189 } 1548 }
1190 else 1549 else
1191 { 1550 {
1192 XEvent unused_event; 1551 XEvent unused_event;
1193 1552
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1195 Expose, 1554 ;
1196 &unused_event)) ; 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1556 ;
1198 GraphicsExpose, 1557
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1201 { 1559 {
1202 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1203 scrollbar_show (0); 1561 scrollbar_show (0);
1204 } 1562 }
1205#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose ();
1208#endif
1209 } 1563 }
1210 break; 1564 break;
1211 1565
1212 case MotionNotify: 1566 case MotionNotify:
1213#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1568 if (hidden_pointer)
1215 pointer_unblank (); 1569 pointer_unblank ();
1216#endif 1570#endif
1217#if MENUBAR 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1218 if (isMenuBarWindow (ev.xany.window)) 1572 break;
1573
1574 if (ev.xany.window == vt)
1219 { 1575 {
1220 menubar_control (ev.xbutton); 1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1578 ; // nop
1223#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1225 break;
1226
1227 if (ev.xany.window == TermWin.vt)
1228 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1580 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1232 ; 1582 ;
1233 1583
1234 XQueryPointer (display->display, TermWin.vt, 1584 XQueryPointer (dpy, vt,
1235 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1587 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1588 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1590 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1591 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1592 {
1243#endif 1593#endif
1594#if ISO_14755
1595 // 5.4
1596 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1597 {
1598 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1599 break;
1600 }
1601#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1602 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1603 ev.xbutton.state & Button3Mask ? 2 : 0);
1604
1246#ifdef SELECTION_SCROLLING 1605#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1606 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1607 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1608 {
1250 int dist; 1609 int dist;
1251
1252 pending_scroll_selection=1;
1253 1610
1254 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1256 */ 1613 */
1257 if (scroll_selection_delay<=0) 1614 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1616
1260 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1262 */ 1619 */
1263 selection_save_x=ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1621 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1622 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1623
1268 /* calc number of lines to scroll */ 1624 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1625 if (ev.xbutton.y < int_bwidth)
1270 { 1626 {
1271 scroll_selection_dir = UP; 1627 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1628 dist = int_bwidth - ev.xbutton.y;
1273 } 1629 }
1274 else 1630 else
1275 { 1631 {
1276 scroll_selection_dir = DN; 1632 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1633 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1634 }
1635
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1636 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1637 / SELECTION_SCROLL_LINE_SPEEDUP
1638 + 1;
1282 MIN_IT (scroll_selection_lines, 1639 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1640 SELECTION_SCROLL_MAX_LINES);
1284 } 1641 }
1285 else 1642 else
1286 { 1643 {
1287 /* we are within the text window, so we 1644 /* we are within the text window, so we
1288 * shouldn't be scrolling 1645 * shouldn't be scrolling
1289 */ 1646 */
1290 pending_scroll_selection = 0; 1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop();
1291 } 1649 }
1292#endif 1650#endif
1293#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1294
1295 } 1652 }
1296#endif 1653#endif
1297
1298 } 1654 }
1299 } 1655 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1657 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1303 MotionNotify, &ev)) ; 1659 MotionNotify, &ev))
1660 ;
1661
1304 XQueryPointer (display->display, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1305 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1665 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1666 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1668 scrollbar_size ());
1311 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1669 want_refresh = 1;
1313 scrollbar_show (1); 1670 scrollbar_show (1);
1314 } 1671 }
1315 break; 1672 break;
1316 } 1673 }
1317}
1318 1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1701}
1702
1703void
1704rxvt_term::focus_in ()
1705{
1706 if (!focus)
1707 {
1708 focus = 1;
1709 want_refresh = 1;
1710
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM
1714 if (Input_Context != NULL)
1715 {
1716 IMSetPosition ();
1717 XSetICFocus (Input_Context);
1718 }
1719#endif
1720#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1723#endif
1724#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade])
1726 {
1727 pix_colors = pix_colors_focused;
1728 scr_recolour ();
1729 }
1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif
1744 }
1745}
1746
1747void
1748rxvt_term::focus_out ()
1749{
1750 if (focus)
1751 {
1752 focus = 0;
1753 want_refresh = 1;
1754
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1757#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf)
1759 {
1760 iso14755buf = 0;
1761# if ISO_14755
1762 scr_overlay_off ();
1763# endif
1764 }
1765#endif
1766#if USE_XIM
1767 if (Input_Context != NULL)
1768 XUnsetICFocus (Input_Context);
1769#endif
1770#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop ();
1773 hidden_cursor = 0;
1774#endif
1775#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade])
1777 {
1778 pix_colors = pix_colors_unfocused;
1779 scr_recolour ();
1780 }
1781#endif
1782 }
1783}
1784
1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1319void 1799void
1320rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1801{
1322 SET_R (this); 1802 make_current ();
1323 SET_LOCALE (locale);
1324 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1325 switch (ev.type) 1809 switch (ev.type)
1326 { 1810 {
1327 case PropertyNotify: 1811 case PropertyNotify:
1812 /*
1813 * if user used some Esetroot compatible prog to set the root bg,
1814 * use the property to determine the pixmap. We use it later on.
1815 */
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1329 { 1818 {
1330 if (ev.xproperty.state == PropertyNewValue) 1819 bgPixmap.set_root_pixmap ();
1331 selection_property (ev.xproperty.window, ev.xproperty.atom); 1820 update_background ();
1332 break;
1333 } 1821 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /*
1338 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on.
1340 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1345 return;
1346 }
1347
1348 /* FALLTHROUGH */
1349 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ())
1351 if (am_transparent)
1352 want_full_refresh = 1;
1353 break; 1822 break;
1823 }
1354#endif 1824# endif
1355 }
1356} 1825}
1826#endif
1357 1827
1358void 1828void
1359rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
1360{ 1830{
1361 int reportmode = 0, clickintime; 1831 int reportmode = 0, clickintime;
1362 1832
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1833 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1834
1364 if (!bypass_keystate) 1835 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1836 reportmode = !! (priv_modes & PrivMode_mouse_report);
1837
1366 /* 1838 /*
1367 * VT window processing of button press 1839 * VT window processing of button press
1368 */ 1840 */
1369 if (ev.window == TermWin.vt) 1841 if (ev.window == vt)
1370 { 1842 {
1843 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1846#if ISO_14755
1847 // 5.4
1848 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1849 {
1850 iso14755_54 (ev.x, ev.y);
1851 return;
1852 }
1853#endif
1854
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1855 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1856
1372 if (reportmode) 1857 if (reportmode)
1373 { 1858 {
1374 /* mouse report from vt window */ 1859 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1860 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1861 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1862#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1863 if (ev.button == MEvent.button && clickintime)
1379 { 1864 {
1380 /* same button, within alloted time */ 1865 /* same button, within alloted time */
1381 MEvent.clicks++; 1866 MEvent.clicks++;
1867
1382 if (MEvent.clicks > 1) 1868 if (MEvent.clicks > 1)
1383 { 1869 {
1384 /* only report double clicks */ 1870 /* only report double clicks */
1385 MEvent.clicks = 2; 1871 MEvent.clicks = 2;
1386 mouse_report (ev); 1872 mouse_report (ev);
… …
1405 } 1891 }
1406 else 1892 else
1407 { 1893 {
1408 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1895 MEvent.clicks = 0;
1896
1410 switch (ev.button) 1897 switch (ev.button)
1411 { 1898 {
1412 case Button1: 1899 case Button1:
1900 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */
1902#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask);
1904#else
1905 selection.rect = false;
1906#endif
1907
1413 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1910 {
1416 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1418 else 1913 else
1419 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1929 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1437 else 1932 else
1438 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1934
1439 MEvent.button = Button3; 1935 MEvent.button = Button3;
1440 break; 1936 break;
1441 } 1937 }
1442 } 1938 }
1939
1443 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1444 return; 1941 return;
1445 } 1942 }
1446 1943
1447 /* 1944 /*
… …
1513 upordown = 1; /* down */ 2010 upordown = 1; /* down */
1514 } 2011 }
1515 if (upordown) 2012 if (upordown)
1516 { 2013 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 2016#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2017 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 2018 {
1522 if (upordown < 0) 2019 if (upordown < 0)
1523 scrollBar.setUp (); 2020 scrollBar.setUp ();
… …
1539 break; 2036 break;
1540 case R_SB_ALIGN_BOTTOM: 2037 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2038 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2039 break;
1543 } 2040 }
2041
1544 if (scrollBar.style == R_SB_XTERM 2042 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2043 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2044 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2046
1549 scrollBar.setMotion (); 2047 scrollBar.setMotion ();
1550 break; 2048 break;
1551 2049
1552 case Button1: 2050 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2051 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2055 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2056 if (scrollBar.style != R_SB_XTERM)
1559 { 2057 {
1560 if (scrollbar_above_slider (ev.y)) 2058 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2060 scr_page (UP, nrow - 1);
1563# else 2061# else
1564 scr_page (UP, TermWin.nrow / 4); 2062 scr_page (UP, nrow / 4);
1565# endif 2063# endif
1566 else if (scrollbar_below_slider (ev.y)) 2064 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2066 scr_page (DN, nrow - 1);
1569# else 2067# else
1570 scr_page (DN, TermWin.nrow / 4); 2068 scr_page (DN, nrow / 4);
1571# endif 2069# endif
1572 else 2070 else
1573 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1574 } 2072 }
1575 else 2073 else
1576 { 2074 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2075 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2076 (nrow
1579 * scrollbar_position (ev.y) 2077 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2078 / scrollbar_size ()));
1581 } 2079 }
2080
1582 break; 2081 break;
1583 } 2082 }
1584 } 2083 }
2084
1585 return; 2085 return;
1586 } 2086 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2087}
1595 2088
1596void 2089void
1597rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
1598{ 2091{
1599 int reportmode = 0; 2092 int reportmode = 0;
1600 2093
1601 csrO = 0; /* reset csr Offset */ 2094 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2095 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2096 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2097
1605 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
1606 { 2099 {
1607 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
1608 scrollbar_show (0); 2101 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2102 }
2103
1614#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop();
1616#endif 2107#endif
2108
1617 if (ev.window == TermWin.vt) 2109 if (ev.window == vt)
1618 { 2110 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2112 return;
2113
2114#if ISO_14755
2115 // 5.4
2116 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2117 return;
2118#endif
2119
1619 if (reportmode) 2120 if (reportmode)
1620 { 2121 {
1621 /* mouse report from vt window */ 2122 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2123 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2124 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2138 MEvent.button = AnyButton;
1638 mouse_report (ev); 2139 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2140#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2141 return;
1641 } 2142 }
2143
1642 /* 2144 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2145 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2146 * when overriding mouse reporting
1645 */ 2147 */
1646 if (PrivateModes & PrivMode_mouse_report 2148 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2149 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2150 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2151 selection_extend (ev.x, ev.y, 0);
1650 2152
1651 switch (ev.button) 2153 switch (ev.button)
1652 { 2154 {
1653 case Button1: 2155 case Button1:
1654 case Button3: 2156 case Button3:
1655 selection_make (ev.time); 2157 selection_make (ev.time);
1656 break; 2158 break;
2159
1657 case Button2: 2160 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2163 break;
2164
1660#ifdef MOUSE_WHEEL 2165#ifdef MOUSE_WHEEL
1661 case Button4: 2166 case Button4:
1662 case Button5: 2167 case Button5:
1663 { 2168 {
1664 int i; 2169 int i;
1665 page_dirn v; 2170 page_dirn v;
1666 2171
1667 v = (ev.button == Button4) ? UP : DN; 2172 v = ev.button == Button4 ? UP : DN;
2173
1668 if (ev.state & ShiftMask) 2174 if (ev.state & ShiftMask)
1669 i = 1; 2175 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2176 else if (option (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2177 i = nrow - 1;
1672 else 2178 else
1673 i = 5; 2179 i = 5;
2180
1674# ifdef MOUSE_SLIP_WHEELING 2181# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2182 if (ev.state & ControlMask)
1676 { 2183 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2184 mouse_slip_wheel_speed += v ? -1 : 1;
2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187
2188 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2190
2191 slip_wheel_ev.start ();
2192 }
2193 else
2194 {
2195# endif
2196 scr_page (v, i);
2197 scrollbar_show (1);
2198# ifdef MOUSE_SLIP_WHEELING
1679 } 2199 }
1680# endif 2200# endif
1681# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1);
1689 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1);
1691 }
1692# endif
1693
1694 } 2201 }
1695 break; 2202 break;
1696#endif 2203#endif
1697
1698 }
1699 }
1700#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev);
1703#endif
1704}
1705
1706
1707#ifdef TRANSPARENT
1708/*
1709 * Check our parents are still who we think they are.
1710 * Do transparency updates if required
1711 */
1712int
1713rxvt_term::check_our_parents ()
1714{
1715 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after;
1717 Atom atype;
1718 unsigned char *prop = NULL;
1719 Window root, oldp, *list;
1720 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr;
1722
1723 pchanged = 0;
1724
1725 if (! (Options & Opt_transparent))
1726 return pchanged; /* Don't try any more */
1727
1728 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth;
1730
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1732 if (rootdepth != wattr.depth)
1733 {
1734 if (am_transparent)
1735 { 2204 }
1736 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt,
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0;
1740 }
1741 return pchanged; /* Don't try any more */
1742 }
1743
1744 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False);
1746
1747 /*
1748 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that.
1751 */
1752 i = (xa[XA_XROOTPMAPID] != 0
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success));
1756 if (!i || prop == NULL)
1757 have_pixmap = 0;
1758 else
1759 { 2205 }
1760 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop);
1762 XFree (prop);
1763 }
1764 if (have_pixmap)
1765 {
1766 /*
1767 * Copy display->root pixmap transparency
1768 */
1769 int sx, sy, nx, ny;
1770 unsigned int nw, nh;
1771 Window cr;
1772 XImage *image;
1773 GC gc;
1774 XGCValues gcvalue;
1775
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height;
1780 nx = ny = 0;
1781
1782 if (sx < 0)
1783 {
1784 nw += sx;
1785 nx = -sx;
1786 sx = 0;
1787 }
1788
1789 if (sy < 0)
1790 {
1791 nh += sy;
1792 ny = -sy;
1793 sy = 0;
1794 }
1795
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1800 ZPixmap);
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */
1803 allowedxerror = 0;
1804 if (image == NULL)
1805 {
1806 if (am_transparent && am_pixmap_trans)
1807 {
1808 pchanged = 1;
1809 if (TermWin.pixmap != None)
1810 {
1811 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None;
1813 }
1814 }
1815 am_pixmap_trans = 0;
1816 }
1817 else
1818 {
1819 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap);
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height,
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height);
1829 XFreeGC (display->display, gc);
1830 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1832 TermWin.pixmap);
1833 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1;
1835 am_transparent = am_pixmap_trans = 1;
1836 }
1837 }
1838
1839 if (!am_pixmap_trans)
1840 {
1841 unsigned int n;
1842 /*
1843 * InheritPixmap transparency
1844 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1847 i++)
1848 {
1849 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n);
1852 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
1854 if (TermWin.parent[i] == display->root)
1855 {
1856 if (oldp != None)
1857 pchanged = 1;
1858 break;
1859 }
1860 if (oldp != TermWin.parent[i])
1861 pchanged = 1;
1862 }
1863
1864 n = 0;
1865
1866 if (pchanged)
1867 {
1868 for (; n < (unsigned int)i; n++)
1869 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break;
1876 }
1877 }
1878 }
1879
1880 if (n > (int) (sizeof (TermWin.parent)
1881 / sizeof (TermWin.parent[0])))
1882 {
1883 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0],
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */
1890 }
1891 else
1892 {
1893 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1);
1903# endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
1907 ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1909 ParentRelative);
1910 am_transparent = 1;
1911 }
1912
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None;
1915 }
1916 return pchanged;
1917} 2206}
1918#endif
1919 2207
1920/*}}} */ 2208/*}}} */
1921 2209
1922bool 2210bool
1923rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
1924{ 2212{
1925 bool flag = false; 2213 bool flag = false;
1926 unicode_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
1928 2216
1929 for (;;) 2217 for (;;)
1930 { 2218 {
1931 if (ch == NOCHAR) 2219 if (ch == NOCHAR)
1932 { 2220 {
1933 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2222 ch = next_char ();
1935 }
1936 2223
1937 if (ch == NOCHAR) // TODO: improve 2224 if (ch == NOCHAR)
1938 break; 2225 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2226 }
2227
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2229 {
2230 if (!seen_input)
2231 {
2232 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs
2236 // then sometimes get the size wrong.
2237 // unfortunately other programs are even more buggy and dislike
2238 // being sent SIGWINCH, so only do it when we were in fact being
2239 // resized.
2240 if (seen_resize && cmd_pid)
2241 kill (-cmd_pid, SIGWINCH);
2242 }
2243
1942 /* Read a text string from the input buffer */ 2244 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2245 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2246 bool refreshnow = false;
1945 int nlines = 0; 2247 int nlines = 0;
1946 unicode_t *str = buf; 2248 wchar_t *str = buf;
1947 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2250
1950 for (;;) 2251 for (;;)
1951 { 2252 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2254 break;
2255
2256 *str++ = ch;
2257
2258 if (ch == C0_LF || str >= eol)
2259 {
2260 if (ch == C0_LF)
2261 nlines++;
2262
2263 refresh_count++;
2264
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 {
2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2270 {
2271 refreshnow = true;
2272 ch = NOCHAR;
2273 break;
2274 }
2275 }
2276
2277 // scr_add_lines only works for nlines <= nrow - 1.
2278 if (nlines >= nrow - 1)
2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2282 scr_add_lines (buf, str - buf, nlines);
2283
2284 nlines = 0;
2285 str = buf;
2286 eol = str + min (ncol, UBUFSIZ);
2287 }
2288
2289 if (str >= eol)
2290 {
2291 if (eol >= buf + UBUFSIZ)
2292 {
2293 ch = NOCHAR;
2294 break;
2295 }
2296 else
2297 eol = min (eol + ncol, buf + UBUFSIZ);
2298 }
2299
2300 }
2301
1952 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2303 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))
1956 break;
1957
1958 *str++ = ch;
1959
1960 if (ch == '\n')
1961 {
1962 nlines++;
1963 refresh_count++;
1964
1965 if (! (Options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
1967 {
1968 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR;
1971 break;
1972 }
1973
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1)
1976 {
1977 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0;
1979 str = buf;
1980 }
1981 }
1982
1983 if (str >= buf + UBUFSIZ)
1984 {
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2304 }
1989 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
1991 2309
1992 /* 2310 /*
1993 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
1996 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2314 */
2001 if (refreshnow) 2315 if (refreshnow)
2002 { 2316 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2317 flag = true;
2004 refresh_limit++;
2005
2006 scr_refresh (refresh_type); 2318 scr_refresh ();
2319 want_refresh = 1;
2007 } 2320 }
2008 2321
2009 } 2322 }
2010 else 2323 else
2011 { 2324 {
… …
2026 2339
2027 return flag; 2340 return flag;
2028} 2341}
2029 2342
2030// read the next character 2343// read the next character
2031unicode_t 2344wchar_t
2032rxvt_term::next_char () 2345rxvt_term::next_char () NOTHROW
2033{ 2346{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2347 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2348 {
2036 // assume 7-bit to be ascii ALWAYS 2349 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2351 return *cmdbuf_ptr++;
2039 2352
2040 wchar_t wc; 2353 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2355
2043 if (len == (size_t)-2) 2356 if (len == (size_t)-2)
2044 { 2357 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2358 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2359 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2360 break;
2048 } 2361 }
2049 2362
2050 if (len == (size_t)-1) 2363 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2365
2053 // assume wchar == unicode 2366 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2055 return wc; 2368 return wc & UNICODE_MASK;
2056 } 2369 }
2057 2370
2058 return NOCHAR; 2371 return NOCHAR;
2059} 2372}
2373
2374// read the next octet
2375uint32_t
2376rxvt_term::next_octet () NOTHROW
2377{
2378 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR;
2381}
2382
2383static class out_of_input out_of_input;
2060 2384
2061/* rxvt_cmd_getc () - Return next input character */ 2385/* rxvt_cmd_getc () - Return next input character */
2062/* 2386/*
2063 * Return the next input character after first passing any keyboard input 2387 * Return the next input character after first passing any keyboard input
2064 * to the command. 2388 * to the command.
2065 */ 2389 */
2066unicode_t 2390wchar_t
2067rxvt_term::cmd_getc () 2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2392{
2069 unicode_t c = next_char (); 2393 wchar_t c = next_char ();
2394
2395 if (c == NOCHAR)
2396 throw out_of_input;
2397
2398 return c;
2399}
2400
2401uint32_t
2402rxvt_term::cmd_get8 () THROW ((class out_of_input))
2403{
2404 uint32_t c = next_octet ();
2070 2405
2071 if (c == NOCHAR) 2406 if (c == NOCHAR)
2072 throw out_of_input; 2407 throw out_of_input;
2073 2408
2074 return c; 2409 return c;
… …
2138 { 2473 {
2139 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2140 break; /* done = 1 */ 2475 break; /* done = 1 */
2141 } 2476 }
2142 } 2477 }
2143 2478
2144 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2145 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2146 { 2481 {
2147 done = 1; 2482 done = 1;
2148 break; 2483 break;
… …
2156/*}}} */ 2491/*}}} */
2157 2492
2158/* *INDENT-OFF* */ 2493/* *INDENT-OFF* */
2159enum { 2494enum {
2160 C1_40 = 0x40, 2495 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2500};
2166/* *INDENT-ON* */ 2501/* *INDENT-ON* */
2167 2502
2168/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2169void 2504void
… …
2174 case C0_ESC: 2509 case C0_ESC:
2175 process_escape_seq (); 2510 process_escape_seq ();
2176 break; 2511 break;
2177 case C0_ENQ: /* terminal Status */ 2512 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2513 if (rs[Rs_answerbackstring])
2179 tt_write ( 2514 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2515 else
2183 tt_write ((unsigned char *)VT100_ANS, 2516 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2517 break;
2186 case C0_BEL: /* bell */ 2518 case C0_BEL: /* bell */
2187 scr_bell (); 2519 scr_bell ();
2188 break; 2520 break;
2189 case C0_BS: /* backspace */ 2521 case C0_BS: /* backspace */
… …
2205 break; 2537 break;
2206 case C0_SI: /* shift in - acs */ 2538 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2539 scr_charset_choose (0);
2208 break; 2540 break;
2209 2541
2542#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2543 // 8-bit controls
2211 case 0x90: /* DCS */ 2544 case 0x90: /* DCS */
2212 process_dcs_seq (); 2545 process_dcs_seq ();
2213 break; 2546 break;
2214 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2215 process_csi_seq (); 2548 process_csi_seq ();
2216 break; 2549 break;
2217 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
2218 process_osc_seq (); 2551 process_osc_seq ();
2219 break; 2552 break;
2553#endif
2220 } 2554 }
2221} 2555}
2222/*}}} */ 2556/*}}} */
2223 2557
2224 2558
… …
2286void 2620void
2287rxvt_term::process_escape_seq () 2621rxvt_term::process_escape_seq ()
2288{ 2622{
2289 unicode_t ch = cmd_getc (); 2623 unicode_t ch = cmd_getc ();
2290 2624
2291 if (PrivateModes & PrivMode_vt52) 2625 if (priv_modes & PrivMode_vt52)
2292 { 2626 {
2293 process_escape_vt52 (ch); 2627 process_escape_vt52 (ch);
2294 return; 2628 return;
2295 } 2629 }
2296 2630
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2646 break;
2313 case '+': 2647 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2649 break;
2316#ifndef NO_FRILLS 2650#if !ENABLE_MINIMAL
2317 case '6': 2651 case '6':
2318 scr_backindex (); 2652 scr_backindex ();
2319 break; 2653 break;
2320#endif 2654#endif
2321 case '7': 2655 case '7':
2322 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
2323 break; 2657 break;
2324 case '8': 2658 case '8':
2325 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
2326 break; 2660 break;
2327#ifndef NO_FRILLS 2661#if !ENABLE_MINIMAL
2328 case '9': 2662 case '9':
2329 scr_forwardindex (); 2663 scr_forwardindex ();
2330 break; 2664 break;
2331#endif 2665#endif
2332 case '=': 2666 case '=':
… …
2342 break; 2676 break;
2343 2677
2344 /* 8.3.87: NEXT LINE */ 2678 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2679 case C1_NEL: /* ESC E */
2346 { 2680 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2681 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 2683 }
2350 break; 2684 break;
2351 2685
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2686 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 2687 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 2697 case C1_RI: /* ESC M */
2364 scr_index (DN); 2698 scr_index (DN);
2365 break; 2699 break;
2366 2700
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2701 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2702 /*case C1_SS2: scr_single_shift (2); break; */
2369 2703
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2704 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2705 /*case C1_SS3: scr_single_shift (3); break; */
2372 2706
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2707 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2708 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2709 process_dcs_seq ();
2376 break; 2710 break;
2377 2711
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 2713 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 2715 break; /* steal obsolete ESC [ c */
2383 2716
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 2718 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 2719 process_csi_seq ();
… …
2391 process_osc_seq (); 2724 process_osc_seq ();
2392 break; 2725 break;
2393 2726
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2727 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 2728 case 'c':
2729 mbstate.reset ();
2396 scr_poweron (); 2730 scr_poweron ();
2397 scrollbar_show (1); 2731 scrollbar_show (1);
2398 break; 2732 break;
2399 2733
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 2746
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2747/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2748/* *INDENT-OFF* */
2415enum { 2749enum {
2416 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2754 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2755 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2777 };
2444/* *INDENT-ON* */ 2778/* *INDENT-ON* */
2445 2779
2446void 2780void
2447rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
2448{ 2782{
2449 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
2450 unsigned int nargs, p; 2784 unsigned int nargs, p;
2451 int n, ndef; 2785 int n, ndef;
2452 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
2453 2787
2454 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
2455 arg[--nargs] = 0;
2456 2789
2457 priv = 0; 2790 priv = 0;
2458 ch = cmd_getc (); 2791 ch = cmd_getc ();
2459 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2460 { /* '<' '=' '>' '?' */ 2793 { /* '<' '=' '>' '?' */
… …
2494 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
2495 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
2496 if (arg[p] == -1) 2829 if (arg[p] == -1)
2497 arg[p] = ndef; 2830 arg[p] = ndef;
2498 2831
2499#ifdef DEBUG_CMD
2500 fprintf (stderr, "CSI ");
2501 for (p = 0; p < nargs; p++)
2502 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2503 fprintf (stderr, "%c\n", ch);
2504#endif
2505
2506 /* 2832 /*
2507 * private mode handling 2833 * private mode handling
2508 */ 2834 */
2509 if (priv) 2835 if (priv)
2510 { 2836 {
2511 switch (priv) 2837 switch (priv)
2512 { 2838 {
2513 case '>': 2839 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2847 // that we do not support xterm mouse reporting (should be 95 when we do).
2848 //
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2849 tt_printf ("\033[>%d;94;0c", 'U');
2850 }
2516 break; 2851 break;
2517 case '?': 2852 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 2854 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 2855 break;
… …
2625 2960
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2961 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 2962 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 2963 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2964 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2965 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 2966 break;
2632 2967
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2968 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 2970 break;
2637 2971
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2972 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 2973 process_sgr_mode (nargs, arg);
2640 break; 2974 break;
… …
2646 tt_printf ("\033[0n"); 2980 tt_printf ("\033[0n");
2647 break; 2981 break;
2648 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
2649 scr_report_position (); 2983 scr_report_position ();
2650 break; 2984 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
2986 if (option (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 2988 break;
2655#endif
2656 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 2991 break;
2659 } 2992 }
2660 break; 2993 break;
2661 2994
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2995 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3028 break;
2696 3029
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3030 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3031 if (arg[0] == 4)
2699 scr_insert_mode (0); 3032 scr_insert_mode (0);
3033 else if (arg[0] == 20)
3034 priv_modes &= ~PrivMode_LFNL;
2700 break; 3035 break;
2701 3036
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3037 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3038 if (arg[0] == 4)
2704 scr_insert_mode (1); 3039 scr_insert_mode (1);
3040 else if (arg[0] == 20)
3041 priv_modes |= PrivMode_LFNL;
2705 break; 3042 break;
2706 3043
2707 /* 3044 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3045 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3046 */
… …
2721 break; 3058 break;
2722 case CSI_75: 3059 case CSI_75:
2723 scr_cursor (RESTORE); 3060 scr_cursor (RESTORE);
2724 break; 3061 break;
2725 3062
2726#ifndef NO_FRILLS 3063#if !ENABLE_MINIMAL
2727 case CSI_74: 3064 case CSI_74:
2728 process_window_ops (arg, nargs); 3065 process_window_ops (arg, nargs);
2729 break; 3066 break;
2730#endif 3067#endif
2731 3068
… …
2738 break; 3075 break;
2739 } 3076 }
2740} 3077}
2741/*}}} */ 3078/*}}} */
2742 3079
2743#ifndef NO_FRILLS 3080#if !ENABLE_MINIMAL
2744/* ARGSUSED */ 3081/* ARGSUSED */
2745void 3082void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3083rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3084{
2748 int x, y; 3085 int x, y;
2749 XWindowAttributes wattr; 3086 XWindowAttributes wattr;
2750 Window wdummy; 3087 Window wdummy;
3088
3089 dLocal (Display *, dpy);
2751 3090
2752 if (nargs == 0) 3091 if (nargs == 0)
2753 return; 3092 return;
2754 3093
2755 switch (args[0]) 3094 switch (args[0])
2756 { 3095 {
2757 /* 3096 /*
2758 * commands 3097 * commands
2759 */ 3098 */
2760 case 1: /* deiconify window */ 3099 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3100 XMapWindow (dpy, parent[0]);
2762 break; 3101 break;
2763 case 2: /* iconify window */ 3102 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3103 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3104 break;
2767 case 3: /* set position (pixels) */ 3105 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3106 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3107 break;
2770 case 4: /* set size (pixels) */ 3108 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3110 break;
2773 case 5: /* raise window */ 3111 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3112 XRaiseWindow (dpy, parent[0]);
2775 break; 3113 break;
2776 case 6: /* lower window */ 3114 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3115 XLowerWindow (dpy, parent[0]);
2778 break; 3116 break;
2779 case 7: /* refresh window */ 3117 case 7: /* refresh window */
2780 scr_touch (true); 3118 scr_touch (true);
2781 break; 3119 break;
2782 case 8: /* set size (chars) */ 3120 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3121 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3122 (unsigned int) (args[1] * fheight));
2785 break; 3123 break;
2786 3124
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3125 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3126 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3127 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3128 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3129 (unsigned int) (args[1] * fheight));
2792 break; 3130 break;
2793
2794 3131
2795 /* 3132 /*
2796 * reports - some output format copied from XTerm 3133 * reports - some output format copied from XTerm
2797 */ 3134 */
2798 case 11: /* report window state */ 3135 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3138 break;
2802 case 13: /* report window position */ 3139 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3141 XTranslateCoordinates (dpy, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3142 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3143 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3144 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3145 break;
2809 case 14: /* report window size (pixels) */ 3146 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3149 break;
2813 case 18: /* report text area size (chars) */ 3150 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3151 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3152 break;
2816 case 19: /* report window size (chars) */ 3153 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3154 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3155 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3157 {
3158 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s);
3162 }
2823 break; 3163 break;
2824 case 21: /* report window title */ 3164 case 21: /* report window title */
3165 {
3166 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s);
3170 }
2827 break; 3171 break;
2828#endif
2829 } 3172 }
2830} 3173}
2831#endif 3174#endif
2832 3175
2833/*----------------------------------------------------------------------*/ 3176/*----------------------------------------------------------------------*/
2834/* 3177/*
2835 * get input up until STRING TERMINATOR (or BEL) 3178 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3179 * ends_how is terminator used. returned input must be free()'d
2837 */ 3180 */
2838unsigned char * 3181char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3182rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3183{
2841 int seen_esc = 0; /* seen escape? */ 3184 unicode_t ch;
3185 bool seen_esc = false;
2842 unsigned int n = 0; 3186 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3187 wchar_t string[STRING_MAX];
2846 3188
2847 while ((ch = cmd_getc ())) 3189 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3190 {
2849 if (ch == C0_BEL 3191 if (seen_esc)
2850 || ch == CHAR_ST 3192 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3193 if (ch == 0x5c) /* 7bit ST */
2852 break; 3194 break;
2853 3195 else
3196 return NULL;
3197 }
2854 if (ch == C0_ESC) 3198 else if (ch == C0_ESC)
2855 { 3199 {
2856 seen_esc = 1; 3200 seen_esc = true;
2857 continue; 3201 continue;
2858 } 3202 }
3203 else if (ch == C0_BEL || ch == CHAR_ST)
3204 break;
2859 else if (ch == '\t') 3205 else if (ch == C0_SYN)
2860 ch = ' '; /* translate '\t' to space */ 3206 ch = cmd_get8 ();
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3207 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
2863 3209
2864 if (n < sizeof (string) - 1) 3210 seen_esc = false;
3211
3212 if (n >= STRING_MAX - 1)
3213 // stop at some sane length
3214 return NULL;
3215
2865 string[n++] = ch; 3216 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3217 }
2869 3218
2870 string[n++] = '\0'; 3219 string[n++] = '\0';
2871 3220
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3222
2877 return s; 3223 return rxvt_wcstombs (string);
2878} 3224}
2879 3225
2880/*----------------------------------------------------------------------*/ 3226/*----------------------------------------------------------------------*/
2881/* 3227/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3229 */
2884void 3230void
2885rxvt_term::process_dcs_seq () 3231rxvt_term::process_dcs_seq ()
2886{ 3232{
2887 unsigned char *s; 3233 char *s;
2888 unicode_t eh; 3234 unicode_t eh;
2889 3235
2890 /* 3236 /*
2891 * Not handled yet 3237 * Not handled yet
2892 */ 3238 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3257 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3258 arg = arg * 10 + (ch - '0');
2913 3259
2914 if (ch == ';') 3260 if (ch == ';')
2915 { 3261 {
2916 unsigned char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
2917 3263
2918 if (s) 3264 if (s)
2919 { 3265 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3266 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3267 free (s);
2934 } 3268 }
2935 } 3269 }
2936} 3270}
3271
3272void
3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3274{
3275 if (str[0] == '?' && !str[1])
3276 {
3277 rgba c;
3278 pix_colors_focused[color].get (c);
3279
3280#if XFT
3281 if (c.a != rgba::MAX_CC)
3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3283 else
3284#endif
3285 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3286 }
3287 else
3288 set_window_color (color, str);
3289}
3290
2937/* 3291/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3293 */
2960void 3294void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3295rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3296{
2963 int changed = 0;
2964 int color; 3297 int color;
2965 char *buf, *name; 3298 char *buf, *name;
3299 bool query = str[0] == '?' && !str[1];
3300 int saveop = op;
3301
3302 dLocal (Display *, dpy);
2966 3303
2967 assert (str != NULL); 3304 assert (str != NULL);
3305
3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3307 return;
3308
2968 switch (op) 3309 switch (op)
2969 { 3310 {
2970 case XTerm_name: 3311 case XTerm_name:
2971 set_title (str); 3312 set_title (str);
2972 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
2974 set_icon_name (str); 3315 set_icon_name (str);
2975 break; 3316 break;
2976 case XTerm_title: 3317 case XTerm_title:
2977 set_title (str); 3318 set_title (str);
2978 break; 3319 break;
3320 case XTerm_property:
3321 if (str[0] == '?')
3322 {
3323 Atom prop = display->atom (str + 1);
3324 Atom actual_type;
3325 int actual_format;
3326 unsigned long nitems;
3327 unsigned long bytes_after;
3328 unsigned char *value = 0;
3329 const char *str = "";
3330
3331 if (prop
3332 && XGetWindowProperty (dpy, parent[0],
3333 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None
3337 && actual_format == 8)
3338 str = (const char *)(value);
3339
3340 tt_printf ("\033]%d;%s%c", op, str, resp);
3341
3342 XFree (value);
3343 }
3344 else
3345 {
3346 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3347
3348 if (eq)
3349 {
3350 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1);
3352 }
3353 else
3354 XDeleteProperty (dpy, parent[0],
3355 display->atom (str));
3356 }
3357 break;
3358
2979 case XTerm_Color: 3359 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3360 for (buf = (char *)str; buf && *buf;)
2981 { 3361 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3362 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3363 break;
2984 3364
2985 *name++ = '\0'; 3365 *name++ = '\0';
2986 color = atoi (buf); 3366 color = atoi (buf) + minCOLOR;
2987 3367
2988 if (color < 0 || color >= TOTAL_COLORS) 3368 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3369 break;
2990 3370
2991 if ((buf = STRCHR (name, ';')) != NULL) 3371 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3372 *buf++ = '\0';
2993 3373
2994 set_window_color (color + minCOLOR, name); 3374 process_color_seq (op, color, name, resp);
2995 } 3375 }
3376 break;
3377 case XTerm_Color00:
3378 process_color_seq (op, Color_fg, str, resp);
3379 break;
3380 case XTerm_Color01:
3381 process_color_seq (op, Color_bg, str, resp);
2996 break; 3382 break;
2997#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3385 process_color_seq (op, Color_cursor, str, resp);
3000 break; 3386 break;
3001#endif 3387#endif
3002 case XTerm_Color_pointer: 3388 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3389 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break;
3391 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp);
3004 break; 3393 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3394#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str);
3008 break;
3009 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str);
3011 break;
3012 case XTerm_Color_RV: 3395 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3396 process_color_seq (op, Color_RV, str, resp);
3014 break; 3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp);
3401 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp);
3405 break;
3406 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp);
3408 break;
3015#endif 3409#endif
3016 3410#if ENABLE_TRANSPARENCY
3017 case XTerm_Menu: 3411 case URxvt_Color_tint:
3412 process_color_seq (op, Color_tint, str, resp);
3018 /* 3413 {
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3414 bool changed = false;
3020 * so DON'T do it here 3415 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3417 else
3418 changed = bgPixmap.unset_tint ();
3419 if (changed)
3420 update_background ();
3021 */ 3421 }
3422
3022 break; 3423 break;
3424#endif
3425
3426#if BG_IMAGE_FROM_FILE
3023 case XTerm_Pixmap: 3427 case Rxvt_Pixmap:
3024 if (*str != ';') 3428 if (!strcmp (str, "?"))
3025 { 3429 {
3026#if XPM_BACKGROUND 3430 char str[256];
3027 scale_pixmap (""); /* reset to default scaling */ 3431
3028 set_bgPixmap (str); /* change pixmap */ 3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3029#endif 3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3030 scr_touch (true); 3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST);
3031 } 3436 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3437 else
3033 { 3438 {
3439 int changed = 0;
3440
3441 if (*str != ';')
3442 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */
3446 changed++;
3447 str = strchr (str, ';');
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 }
3451 while (str)
3452 {
3034 str++; 3453 str++;
3035#if XPM_BACKGROUND 3454 if (bgPixmap.set_geometry (str))
3036 changed += scale_pixmap (str); 3455 changed++;
3037#endif 3456 str = strchr (str, ';');
3038 3457 }
3458 if (changed)
3459 update_background ();
3039 } 3460 }
3040 if (changed)
3041 {
3042#ifdef XPM_BACKGROUND
3043 resize_pixmap ();
3044#endif
3045 scr_touch (true);
3046 }
3047 break; 3461 break;
3462#endif
3048 3463
3049 case XTerm_restoreFG: 3464 case Rxvt_restoreFG:
3050 set_window_color (Color_fg, str); 3465 set_window_color (Color_fg, str);
3051 break; 3466 break;
3052 case XTerm_restoreBG: 3467 case Rxvt_restoreBG:
3053 set_window_color (Color_bg, str); 3468 set_window_color (Color_bg, str);
3054 break; 3469 break;
3470
3055 case XTerm_logfile: 3471 case XTerm_logfile:
3056 // TODO, when secure mode? 3472 // TODO, when secure mode?
3057 break; 3473 break;
3058 case XTerm_font: 3474
3059 change_font (str);
3060 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif
3080#if 0 3475#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3476 case Rxvt_dumpscreen: /* no error notices */
3082 { 3477 {
3083 int fd; 3478 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3479 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3480 {
3086 scr_dump (fd); 3481 scr_dump (fd);
3087 close (fd); 3482 close (fd);
3088 } 3483 }
3089 } 3484 }
3485 break;
3486#endif
3487 case XTerm_font:
3488 op = URxvt_font;
3489 case URxvt_font:
3490#if ENABLE_STYLES
3491 case URxvt_boldFont:
3492 case URxvt_italicFont:
3493 case URxvt_boldItalicFont:
3494#endif
3495 if (query)
3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3498 ? fontset[op - URxvt_font]->fontdesc : "",
3499 resp);
3500 else
3501 {
3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
3503
3504 res = strdup (str);
3505 allocated.push_back ((void *)res);
3506 set_fonts ();
3507 }
3508 break;
3509
3510 case URxvt_version:
3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
3519 case URxvt_locale:
3520 if (query)
3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3522 else
3523 {
3524 set_locale (str);
3525 pty->set_utf8_mode (enc_utf8);
3526 init_xlocale ();
3527 }
3528 break;
3529
3530 case URxvt_view_up:
3531 case URxvt_view_down:
3532 {
3533 int lines = atoi (str);
3534
3535 if (lines)
3536 scr_page (op == URxvt_view_up ? UP : DN, lines);
3537 else
3538 scr_erase_savelines ();
3539 }
3540
3541 break;
3542#endif
3543
3544#if ENABLE_PERL
3545 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3547 ; // no responses yet
3090 break; 3548 break;
3091#endif 3549#endif
3092 } 3550 }
3093} 3551}
3094/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
… …
3108{ 3566{
3109 int state; 3567 int state;
3110 3568
3111 if (mode == 's') 3569 if (mode == 's')
3112 { 3570 {
3113 SavedModes |= (PrivateModes & bit); 3571 SavedModes |= (priv_modes & bit);
3114 return -1; 3572 return -1;
3115 } 3573 }
3116 else 3574 else
3117 { 3575 {
3118 if (mode == 'r') 3576 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3578 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3579 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3580 PrivMode (state, bit);
3123 } 3581 }
3124 3582
3125 return state; 3583 return state;
3126} 3584}
3127 3585
3128/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3129void 3587void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 3589{
3132 unsigned int i, j; 3590 unsigned int i, j;
3133 int state; 3591 int state;
3134 3592
3135 static const struct 3593 static const struct
3136 { 3594 {
3137 const int argval; 3595 const int argval;
3138 const unsigned long bit; 3596 const unsigned long bit;
3139 }
3140
3141 argtopriv[] = { 3597 } argtopriv[] = {
3142 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
3143 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
3144 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3603 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3604 { 7, PrivMode_Autowrap },
3605 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3606 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3607 // 18, 19 printing-related
3151 { menuBar_esc, PrivMode_menuBar }, 3608 { 25, PrivMode_VisibleCursor },
3152#endif
3153#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3611#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3613 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3614 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3615 // 45 margin bell NYI
3163 // 46 start logging 3616 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3635 };
3183 3636
3184 if (nargs == 0) 3637 if (nargs == 0)
3185 return; 3638 return;
… …
3203 } 3656 }
3204 3657
3205 /* extra handling for values with state unkept */ 3658 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3659 switch (arg[i])
3207 { 3660 {
3661#if ENABLE_STYLES
3662 case 1021:
3663 set_option (Opt_intensityStyles, mode);
3664
3665 scr_touch (true);
3666 break;
3667#endif
3208 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
3209 case 1049: 3669 case 1049:
3670 if (option (Opt_secondaryScreen))
3210 if (mode == 0) 3671 if (mode == 0)
3211 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
3212 else if (mode == 1) 3673 else if (mode == 1)
3213 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3675 break;
3215 } 3676 }
3216 3677
3217 if (state >= 0) 3678 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3679 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3680 switch (arg[i])
… …
3225 * within VT52 mode 3686 * within VT52 mode
3226 */ 3687 */
3227 PrivMode (1, PrivMode_vt52); 3688 PrivMode (1, PrivMode_vt52);
3228 break; 3689 break;
3229 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3692 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 3693 break;
3233 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
3234 if (state) 3695 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 3696 break;
3239 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
3241 break; 3699 break;
3242 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 3701 scr_relative_origin (state);
3244 break; 3702 break;
3245 case 7: /* autowrap */ 3703 case 7: /* autowrap */
3246 scr_autowrap (state); 3704 scr_autowrap (state);
3247 break; 3705 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~PrivMode_MouseX11;
3252 break; 3710 break;
3253#ifdef menuBar_esc
3254 case menuBar_esc:
3255#ifdef MENUBAR
3256 map_menuBar (state);
3257#endif
3258 break;
3259#endif
3260#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
3261 case scrollBar_esc: 3712 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 3713 if (scrollbar_mapping (state))
3263 { 3714 {
3264 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
… …
3267 break; 3718 break;
3268#endif 3719#endif
3269 case 25: /* visible/invisible cursor */ 3720 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3721 scr_cursor_visible (state);
3271 break; 3722 break;
3272 /* case 35: - shift keys */ 3723 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3724 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3725 case 47: /* secondary screen */
3275 scr_change_screen (state); 3726 scr_change_screen (state);
3276 break; 3727 break;
3277 /* case 66: - application key pad */ 3728 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3729 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3730 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3732 priv_modes &= ~PrivMode_MouseX10;
3282 break; 3733 break;
3283#if 0 3734#if 0
3284 case 1001: 3735 case 1001:
3285 break; /* X11 mouse highlighting */ 3736 break; /* X11 mouse highlighting */
3286#endif 3737#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 3738 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 3739 set_option (Opt_scrollTtyOutput, !state);
3292 break; 3740 break;
3293 case 1011: /* scroll to bottom on key press */ 3741 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3742 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3743 break;
3299 case 1047: /* secondary screen w/ clearing */ 3744 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3745 if (option (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 3747 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 3748 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3749 break;
3750 case 1049: /* secondary screen w/ clearing first */
3751 scr_change_screen (state);
3752 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY)
3754 scr_erase_screen (2);
3755 break;
3306 default: 3756 default:
3307 break; 3757 break;
3308 } 3758 }
3309 } 3759 }
3310} 3760}
… …
3333 rendset = 0, rendstyle = ~RS_None; 3783 rendset = 0, rendstyle = ~RS_None;
3334 break; 3784 break;
3335 case 1: 3785 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3786 rendset = 1, rendstyle = RS_Bold;
3337 break; 3787 break;
3788 //case 2: // low intensity
3789 case 3:
3790 rendset = 1, rendstyle = RS_Italic;
3791 break;
3338 case 4: 3792 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3793 rendset = 1, rendstyle = RS_Uline;
3340 break; 3794 break;
3341 case 5: 3795 case 5: // slowly blinking
3796 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3797 rendset = 1, rendstyle = RS_Blink;
3343 break; 3798 break;
3799 //case 6: // scoansi light background
3344 case 7: 3800 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3801 rendset = 1, rendstyle = RS_RVid;
3346 break; 3802 break;
3347 case 8: 3803 case 8:
3348 // invisible. NYI 3804 // invisible. NYI
3349 break; 3805 break;
3350 case 22: 3806 //case 9: // crossed out
3807 //case 10: // scoansi acs off, primary font
3808 //case 11: // scoansi acs on, first alt font
3809 //case 12: // scoansi acs on, |0x80, second alt font
3810 //...
3811 //case 19: // ninth alt font
3812 //case 20: // gothic
3813 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 3814 rendset = 0, rendstyle = RS_Bold;
3815 break;
3816 case 22: // normal intensity
3817 rendset = 0, rendstyle = RS_Bold;
3818 break;
3819 case 23: // disable italic
3820 rendset = 0, rendstyle = RS_Italic;
3352 break; 3821 break;
3353 case 24: 3822 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3823 rendset = 0, rendstyle = RS_Uline;
3355 break; 3824 break;
3356 case 25: 3825 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3826 rendset = 0, rendstyle = RS_Blink;
3358 break; 3827 break;
3828 case 26: // variable spacing (iso 8613)
3829 rendset = 0, rendstyle = RS_Blink;
3830 break;
3359 case 27: 3831 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3832 rendset = 0, rendstyle = RS_RVid;
3361 break; 3833 break;
3362 case 28:
3363 // visible. NYI 3834 //case 28: // visible. NYI
3364 break; 3835 //case 29: // not crossed-out
3365 } 3836 }
3366 3837
3367 if (rendset != -1) 3838 if (rendset != -1)
3368 { 3839 {
3369 scr_rendition (rendset, rendstyle); 3840 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 3851 case 35:
3381 case 36: 3852 case 36:
3382 case 37: 3853 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3854 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 3855 break;
3385#ifdef TTY_256COLOR 3856 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 3857 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 3858 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3859 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 3860 i += 2;
3391 } 3861 }
3392 break; 3862 break;
3393#endif
3394 case 39: /* default fg */ 3863 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 3864 scr_color (Color_fg, Color_fg);
3396 break; 3865 break;
3397 3866
3398 case 40: 3867 case 40:
… …
3403 case 45: 3872 case 45:
3404 case 46: 3873 case 46:
3405 case 47: 3874 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3875 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 3876 break;
3408#ifdef TTY_256COLOR 3877 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 3878 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 3879 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3880 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 3881 i += 2;
3414 } 3882 }
3415 break; 3883 break;
3416#endif
3417 case 49: /* default bg */ 3884 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 3885 scr_color (Color_bg, Color_bg);
3419 break; 3886 break;
3420 3887
3421#ifndef NO_BRIGHTCOLOR 3888 //case 50: // not variable spacing
3889
3890#if !ENABLE_MINIMAL
3422 case 90: 3891 case 90:
3423 case 91: /* set bright fg color */ 3892 case 91: /* set bright fg color */
3424 case 92: 3893 case 92:
3425 case 93: 3894 case 93:
3426 case 94: 3895 case 94:
3427 case 95: 3896 case 95:
3428 case 96: 3897 case 96:
3429 case 97: 3898 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3899 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 3900 break;
3433 case 100: 3901 case 100:
3434 case 101: /* set bright bg color */ 3902 case 101: /* set bright bg color */
3435 case 102: 3903 case 102:
3436 case 103: 3904 case 103:
3437 case 104: 3905 case 104:
3438 case 105: 3906 case 105:
3439 case 106: 3907 case 106:
3440 case 107: 3908 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3909 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 3910 break;
3444#endif 3911#endif
3445
3446 } 3912 }
3447 } 3913 }
3448} 3914}
3449/*}}} */ 3915/*}}} */
3450 3916
3451/*{{{ process Rob Nation's own graphics mode sequences */ 3917/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 3918void
3453rxvt_term::process_graphics () 3919rxvt_term::process_graphics ()
3454{ 3920{
3455 unicode_t ch, cmd = cmd_getc (); 3921 unicode_t ch, cmd = cmd_getc ();
3456 3922
3457 if (cmd == 'Q') 3923 if (cmd == 'Q')
3458 { /* query graphics */ 3924 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 3926 return;
3461 } 3927 }
3462 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
3463 do 3929 do
3464 ch = cmd_getc (); 3930 ch = cmd_getc ();
… …
3474 */ 3940 */
3475void 3941void
3476rxvt_term::tt_printf (const char *fmt,...) 3942rxvt_term::tt_printf (const char *fmt,...)
3477{ 3943{
3478 va_list arg_ptr; 3944 va_list arg_ptr;
3479 unsigned char buf[256]; 3945 char buf[256];
3480 3946
3481 va_start (arg_ptr, fmt); 3947 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3948 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 3949 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 3950 tt_write (buf, strlen (buf));
3485} 3951}
3486 3952
3487/* ---------------------------------------------------------------------- */ 3953/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 3954/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 3955 * or generated by us in response to a query ESC sequence.
3490 */ 3956 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958
3491void 3959void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3960rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 3961{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3963 return;
3495 3964
3496 if (len) 3965 if (pty->pty < 0)
3966 return;
3967
3968 if (v_buflen == 0)
3969 {
3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3971
3972 if ((unsigned int)written == len)
3973 return;
3974
3975 data += written;
3976 len -= written;
3497 { 3977 }
3978
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3980
3981 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len;
3983
3984 pty_ev.set (EVENT_READ | EVENT_WRITE);
3985}
3986
3987void rxvt_term::pty_write ()
3988{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3990
3991 if (written > 0)
3992 {
3993 v_buflen -= written;
3994
3498 if (v_buflen == 0) 3995 if (v_buflen == 0)
3499 { 3996 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 3997 free (v_buffer);
3527 v_buffer = 0; 3998 v_buffer = 0;
3528 v_buflen = 0; 3999 v_buflen = 0;
3529 4000
3530 pty_ev.set (EVENT_READ); 4001 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4002 return;
3543 } 4003 }
4004
4005 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4006 }
4007 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4008 pty_ev.set (EVENT_READ);
3545} 4009}
3546 4010
3547/*----------------------- end-of-file (C source) -----------------------*/ 4011/*----------------------- end-of-file (C source) -----------------------*/
3548 4012

Diff Legend

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