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.342 by ayin, Fri Aug 3 23:32:14 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_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0,
106 XK_Home, 0x21f1,
107 XK_End, 0x21f2,
108
109 XK_Execute, 0x2318,
110 XK_Begin, 0x2320,
111 XK_Delete, 0x2326,
112 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380,
115 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389,
118 XK_Break, 0x238a,
119 XK_Escape, 0x238b,
120 XK_Undo, 0x238c,
121 XK_Print, 0x2399,
122
123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
131 XK_KP_Space, 0x2422,
132#endif
133 0,
134};
135
63void 136void
137rxvt_term::iso14755_54 (int x, int y)
138{
139 x = Pixel2Col (x);
140 y = Pixel2Row (y);
141
142 if (!IN_RANGE_EXC (x, 0, ncol)
143 || !IN_RANGE_EXC (y, 0, nrow))
144 return;
145
146 for (;;)
147 {
148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
151
152 if (t != NOCHAR || !x)
153 {
154 iso14755_51 (l.t[x], l.r[x], x, y);
155 iso14755buf = ISO_14755_54;
156 break;
157 }
158
159 x--;
160 }
161}
162
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181# endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216
217 for (int y = 0; y < len; y++)
218 {
219 char buf[9];
220
221 ch = *chr++;
222
223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '=');
226# if !UNICODE3
227 if (ch >= 0x10000)
228 ch = 0xfffd;
229# endif
230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r);
234 }
235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
246# if ENABLE_COMBINING
247 if (alloc)
248 delete [] alloc;
249# endif
250}
251#endif
252
253void
254rxvt_term::commit_iso14755 ()
255{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260
261 if (iso14755buf & ISO_14755_51)
262 {
263 char mb[16];
264 int len;
265
266 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20)
268 len = wcstombs (mb, ch, 16);
269 else
270 {
271 mb[0] = ch[0];
272 len = 1;
273 }
274
275 if (len > 0)
276 tt_write (mb, len);
277 else
278 scr_bell ();
279 }
280
281 iso14755buf = 0;
282}
283
284int
64rxvt_term::lookup_key (XKeyEvent &ev) 285rxvt_term::hex_keyval (XKeyEvent &ev)
286{
287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++)
290 {
291 KeySym k = XLookupKeysym (&ev, index);
292
293 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
294 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
295 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
296 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
297 }
298
299 return -1;
300}
301#endif
302
303void
304rxvt_term::key_press (XKeyEvent &ev)
65{ 305{
66 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
67 unsigned int newlen; 307 unsigned int newlen;
68 KeySym keysym; 308 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 309 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
74 316
75 /* 317 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
78 * 320 *
79 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
80 */ 322 */
81 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
84 326
85 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
86 { 328 {
87 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 338 Status status_return;
97 339
98#if 0 340#if 0
99#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
103 else 345 else
104#endif 346#endif
105#endif 347#endif
106 { 348 {
… …
108 350
109 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
113 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
116 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 361 SET_LOCALE (locale);
118 362
119 if (status_return == XLookupChars 363 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
142 } 386 }
143 else 387 else
144#endif 388#endif
145 { 389 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
148 } 392 }
149 393
150 if (valid_keysym) 394 if (valid_keysym)
151 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
152 if (TermWin.saveLines) 401 if (saveLines)
153 { 402 {
154#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 404 if (!ctrl && !meta)
156 {
157#else 405#else
158 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
407#endif
159 { 408 {
160#endif
161 int lnsppg; 409 int lnsppg;
162 410
163#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 413#else
166 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
167#endif 415#endif
168 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
169 { 417 {
170 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
171 return; 419 return;
… …
199 scr_move_to (0, 1); 447 scr_move_to (0, 1);
200 return; 448 return;
201 } 449 }
202 else if (keysym == XK_End) 450 else if (keysym == XK_End)
203 { 451 {
204 scr_move_to (1, 0); 452 scr_move_to (1, 1);
205 return; 453 return;
206 } 454 }
207 } 455 }
208#endif 456#endif
209 } 457 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 462 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 463 {
216 keysym += (XK_F11 - XK_F1); 464 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 465 shft = 0; /* turn off Shift */
218 } 466 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 468 {
221 switch (keysym) 469 switch (keysym)
222 { 470 {
223 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
226 return; 474 return;
475#if TODO
227 /* rxvt extras */ 476 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 478 change_font (FONT_UP);
230 return; 479 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 481 change_font (FONT_DN);
233 return; 482 return;
483#endif
234 } 484 }
235 } 485 }
236 } 486 }
237#ifdef PRINTPIPE 487
238 if (keysym == XK_Print) 488#if ENABLE_FRILLS || ISO_14755
239 { 489 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 490 if (shft && ctrl)
241 return;
242 } 491 {
243#endif 492 int hv;
244 493
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 494 if (iso14755buf & ISO_14755_51
246 { 495 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 496 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 497 {
250 unsigned int l; 498 commit_iso14755 ();
251 const unsigned char *kbuf0; 499 iso14755buf = ISO_14755_51;
252 500# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 501 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 502# endif
261 ) 503 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 504 }
266 505 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
513 else if ((hv = hex_keyval (ev)) >= 0)
514 {
515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
516 | hv | ISO_14755_51;
517# if ISO_14755
518 iso14755_51 (iso14755buf & ISO_14755_MASK);
519# endif
268 return; 520 return;
269 } 521 }
270 else 522 else
523 {
524# if ISO_14755
525 scr_overlay_off ();
271#endif 526# endif
527 iso14755buf = 0;
528 }
529 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED))
533 {
534 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif
539 }
540#endif
541
542#ifdef PRINTPIPE
543 if (keysym == XK_Print)
544 {
545 scr_printscreen (ctrl | shft);
546 return;
547 }
548#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
272 { 552 {
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, key_backspace);
286 break; 566 break;
287#endif 567#endif
288#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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, key_delete);
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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{
1038 flush_ev.stop ();
1039
660#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
661 if (want_full_refresh) 1041 if (want_full_refresh)
662 { 1042 {
663 want_full_refresh = 0; 1043 want_full_refresh = 0;
664 scr_clear (); 1044 scr_clear ();
665 scr_touch (false); 1045 scr_touch (false);
666 want_refresh = 1;
667 } 1046 }
668#endif 1047#endif
669 1048
670 if (want_refresh) 1049 if (want_refresh)
671 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
672 scr_refresh (refresh_type); 1089 scr_refresh ();
673 scrollbar_show (1); 1090 scrollbar_show (1);
674#ifdef USE_XIM 1091#ifdef USE_XIM
675 IMSendSpot (); 1092 IMSendSpot ();
676#endif 1093#endif
677
678 } 1094 }
679 1095
680 display->flush (); 1096 display->flush ();
681} 1097}
682 1098
683void 1099void
684rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
685{ 1101{
686 SET_R (this); 1102 make_current ();
687 SET_LOCALE (locale);
688 1103
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_count = 0;
689 flush (); 1116 flush ();
690} 1117}
691 1118
692#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
693void 1120void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1122{
696 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1124 want_refresh = 1;
698 1125
699 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1127}
701#endif 1128#endif
702 1129
703#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
704void 1131void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1138 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1139 }
713} 1140}
714#endif 1141#endif
715 1142
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void
1145rxvt_term::cont_scroll_cb (time_watcher &w)
1146{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1149 {
1150 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1152 }
1153}
1154#endif
1155
1156#ifdef SELECTION_SCROLLING
1157void
1158rxvt_term::sel_scroll_cb (time_watcher &w)
1159{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1165 }
1166}
1167#endif
1168
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void
1171rxvt_term::slip_wheel_cb (time_watcher &w)
1172{
1173 if (mouse_slip_wheel_speed == 0
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1182 }
1183}
1184#endif
1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
716bool 1211bool
717rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
718{ 1213{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1215
1216 if (CBUFSIZ == n)
1217 {
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1219 n = 0;
1220 }
720 1221
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
724 1225
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1227
727 if (n > 0) 1228 if (r > 0)
728 { 1229 {
729 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
730 return true; 1231 return true;
731 } 1232 }
732 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
733 destroy (); 1245 destroy ();
734 1246 }
1247
735 return false; 1248 return false;
736} 1249}
737 1250
738void 1251void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1253{
741 SET_R (this); 1254 make_current ();
742 SET_LOCALE (locale); 1255
1256 if (revents & EVENT_READ)
1257 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ())
1259 if (cmd_parse ())
1260 break;
743 1261
744 if (revents & EVENT_WRITE) 1262 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1263 pty_write ();
746 else if (revents & EVENT_READ) 1264}
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 1265
760 if (cmd_parse ()) 1266void
761 break; 1267rxvt_term::pointer_unblank ()
762 } 1268{
763 } 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1270 recolour_cursor ();
1271
1272#ifdef POINTER_BLANK
1273 hidden_pointer = 0;
1274
1275 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay);
1277#endif
764} 1278}
765 1279
766#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
767void 1281void
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 () 1282rxvt_term::pointer_blank ()
781{ 1283{
782 if (! (Options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
783 return; 1285 return;
784 1286
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
786 XFlush (display->display); 1288 XFlush (dpy);
787 1289
788 hidden_pointer = 1; 1290 hidden_pointer = 1;
789} 1291}
790 1292
791void 1293void
792rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
793{ 1295{
794 SET_R (this); 1296 make_current ();
795 SET_LOCALE (locale);
796 1297
797 pointer_blank (); 1298 pointer_blank ();
798} 1299}
799#endif 1300#endif
800 1301
… …
807 x = ev.x; 1308 x = ev.x;
808 y = ev.y; 1309 y = ev.y;
809 pixel_position (&x, &y); 1310 pixel_position (&x, &y);
810 1311
811 if (MEvent.button == AnyButton) 1312 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1313 button_number = 3;
814 }
815 else 1314 else
816 { 1315 {
817 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1318 if (button_number >= 3)
820 button_number += (64 - 3); 1319 button_number += (64 - 3);
821 } 1320 }
822 1321
823 if (PrivateModes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
824 { 1323 {
825 /* 1324 /*
826 * do not report ButtonRelease 1325 * do not report ButtonRelease
827 * no state info allowed 1326 * no state info allowed
828 */ 1327 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1342 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1343 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1344#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1345 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1346#endif
848
849 } 1347 }
850 1348
851#ifdef DEBUG_MOUSEREPORT 1349#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1350 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1351 if (key_state & 16)
854 fputc ('C', stderr); 1352 fputc ('C', stderr);
855 if (key_state & 4) 1353 if (key_state & 4)
856 fputc ('S', stderr); 1354 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1358 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1360 button_number,
863 x + 1, 1361 x + 1,
864 y + 1); 1362 y + 1);
865#else 1363#endif
1364
866 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
868 (32 + x + 1), 1367 (32 + x + 1),
869 (32 + y + 1)); 1368 (32 + y + 1));
870#endif
871} 1369}
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 1370
883/*{{{ process an X event */ 1371/*{{{ process an X event */
884void 1372void
885rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
886{ 1374{
887 SET_R (this); 1375 make_current ();
888 SET_LOCALE (locale);
889 1376
890#if defined(CURSOR_BLINK) 1377 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 1378
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1379 if (ev.xany.window == vt
900 } 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1381 && 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; 1382 return;
920#endif
921 1383
1384 // for XQueryPointer
922 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1387 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 1388
975 switch (ev.type) 1389 switch (ev.type)
976 { 1390 {
977 case KeyPress: 1391 case KeyPress:
978 lookup_key (ev.xkey); 1392 key_press (ev.xkey);
979 break; 1393 break;
980 1394
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1395 case KeyRelease:
983 { 1396 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; 1397 break;
995 }
996#endif
997 1398
998 case ButtonPress: 1399 case ButtonPress:
999 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1000 break; 1401 break;
1001 1402
… …
1003 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1004 break; 1405 break;
1005 1406
1006 case ClientMessage: 1407 case ClientMessage:
1007 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 && !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 { 1410 {
1017 /* Get Dnd data */ 1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1412 {
1019 int ActualFormat; 1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1414 {
1021 unsigned long Size, RemainingBytes; 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1416 {
1023 XGetWindowProperty (display->display, display->root, 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1418 destroy ();
1025 0L, 1000000L, 1419 }
1026 False, AnyPropertyType, 1420#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1424 &ev);
1030 XChangeProperty (display->display, display->root, 1425#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1426 }
1032 8, PropModeReplace, 1427 }
1033 data, STRLEN (data)); 1428#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1036 } 1437 }
1037#endif /* OFFIX_DND */
1038 break;
1039
1040 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping));
1042 break; 1438 break;
1043 1439
1044 /* 1440 /*
1045 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1065 break; 1461 break;
1066 } 1462 }
1067 break; 1463 break;
1068 1464
1069 case FocusIn: 1465 case FocusIn:
1070 if (!TermWin.focus) 1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1469 focus_in ();
1470 break;
1471
1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1476 focus_out ();
1477 break;
1478
1479 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0])
1071 { 1481 {
1072 TermWin.focus = 1; 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1483 ;
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 1484
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 {
1487 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 resize_pixmap ();
1494 scr_touch (true);
1495 }
1496#endif
1497 }
1498
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 check_our_parents ();
1504#endif
1083 } 1505 }
1084 break; 1506 break;
1085 1507
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 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: 1508 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1106 { 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1107 int height, width; 1511 && ev.xproperty.state == PropertyNewValue)
1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1513
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 }
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
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
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 }
1138 break; 1514 break;
1139 1515
1140 case SelectionClear: 1516 case SelectionClear:
1141 selection_clear (); 1517 selection_clear ();
1142 break; 1518 break;
1143 1519
1144 case SelectionNotify: 1520 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1521 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1523 break;
1149 1524
1150 case SelectionRequest: 1525 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1152 break; 1527 break;
1153 1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break;
1536
1154 case UnmapNotify: 1537 case UnmapNotify:
1155 TermWin.mapped = 0; 1538 mapped = 0;
1156#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1158#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1159 break; 1543 break;
1160 1544
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 1545#ifdef ENABLE_TRANSPARENCY
1169 case ReparentNotify: 1546 case ReparentNotify:
1170 rootwin_cb (ev); 1547 rootwin_cb (ev);
1171 break; 1548 break;
1172#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1173 1550
1174 case GraphicsExpose: 1551 case GraphicsExpose:
1175 case Expose: 1552 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1553 if (ev.xany.window == vt)
1177 { 1554 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1555 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1559
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1565
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1566 want_refresh = 1;
1189 } 1567 }
1190 else 1568 else
1191 { 1569 {
1192 XEvent unused_event; 1570 XEvent unused_event;
1193 1571
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1195 Expose, 1573 ;
1196 &unused_event)) ; 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1575 ;
1198 GraphicsExpose, 1576
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1201 { 1578 {
1202 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1203 scrollbar_show (0); 1580 scrollbar_show (0);
1204 } 1581 }
1205#ifdef MENUBAR 1582
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1583#ifdef ENABLE_TRANSPARENCY
1207 menubar_expose (); 1584 if (am_transparent && ev.xany.window == parent[0])
1585 XClearWindow (dpy, ev.xany.window);
1208#endif 1586#endif
1209 } 1587 }
1210 break; 1588 break;
1211 1589
1212 case MotionNotify: 1590 case MotionNotify:
1213#ifdef POINTER_BLANK 1591#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1592 if (hidden_pointer)
1215 pointer_unblank (); 1593 pointer_unblank ();
1216#endif 1594#endif
1217#if MENUBAR 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1218 if (isMenuBarWindow (ev.xany.window)) 1596 break;
1597
1598 if (ev.xany.window == vt)
1219 { 1599 {
1220 menubar_control (ev.xbutton); 1600 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1601 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1602 ; // 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))) 1603 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1604 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1605 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1232 ; 1606 ;
1233 1607
1234 XQueryPointer (display->display, TermWin.vt, 1608 XQueryPointer (dpy, vt,
1235 &unused_root, &unused_child, 1609 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1610 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1611 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1612 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1613#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1614 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1615 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1616 {
1243#endif 1617#endif
1618#if ISO_14755
1619 // 5.4
1620 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1621 {
1622 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1623 break;
1624 }
1625#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1626 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1627 ev.xbutton.state & Button3Mask ? 2 : 0);
1628
1246#ifdef SELECTION_SCROLLING 1629#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1630 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1631 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1632 {
1250 int dist; 1633 int dist;
1251
1252 pending_scroll_selection=1;
1253 1634
1254 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1256 */ 1637 */
1257 if (scroll_selection_delay<=0) 1638 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1639 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1640
1260 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1262 */ 1643 */
1263 selection_save_x=ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1645 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1646 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1647
1268 /* calc number of lines to scroll */ 1648 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1649 if (ev.xbutton.y < int_bwidth)
1270 { 1650 {
1271 scroll_selection_dir = UP; 1651 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1273 } 1653 }
1274 else 1654 else
1275 { 1655 {
1276 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1657 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1658 }
1659
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1660 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1;
1282 MIN_IT (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1284 } 1665 }
1285 else 1666 else
1286 { 1667 {
1287 /* we are within the text window, so we 1668 /* we are within the text window, so we
1288 * shouldn't be scrolling 1669 * shouldn't be scrolling
1289 */ 1670 */
1290 pending_scroll_selection = 0; 1671 if (sel_scroll_ev.active)
1672 sel_scroll_ev.stop();
1291 } 1673 }
1292#endif 1674#endif
1293#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1294
1295 } 1676 }
1296#endif 1677#endif
1297
1298 } 1678 }
1299 } 1679 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1681 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1303 MotionNotify, &ev)) ; 1683 MotionNotify, &ev))
1684 ;
1685
1304 XQueryPointer (display->display, scrollBar.win, 1686 XQueryPointer (dpy, scrollBar.win,
1305 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1689 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1690 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1692 scrollbar_size ());
1311 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1693 want_refresh = 1;
1313 scrollbar_show (1); 1694 scrollbar_show (1);
1314 } 1695 }
1315 break; 1696 break;
1316 } 1697 }
1317}
1318 1698
1699#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1709 }
1710#endif
1711
1712#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 {
1715 if (ev.type == MotionNotify
1716 || ev.type == ButtonPress
1717 || ev.type == ButtonRelease)
1718 if (hidden_pointer)
1719 pointer_unblank ();
1720
1721 if (ev.type == KeyPress && hidden_pointer == 0)
1722 pointer_blank ();
1723 }
1724#endif
1725}
1726
1727void
1728rxvt_term::focus_in ()
1729{
1730 if (!focus)
1731 {
1732 focus = 1;
1733 want_refresh = 1;
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1736
1737#if USE_XIM
1738 if (Input_Context != NULL)
1739 {
1740 IMSetPosition ();
1741 XSetICFocus (Input_Context);
1742 }
1743#endif
1744#if CURSOR_BLINK
1745 if (option (Opt_cursorBlink))
1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1747#endif
1748#if OFF_FOCUS_FADING
1749 if (rs[Rs_fade])
1750 {
1751 pix_colors = pix_colors_focused;
1752 scr_recolour ();
1753 }
1754#endif
1755#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell))
1757 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]);
1761 if (h != NULL)
1762 {
1763 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h);
1765 }
1766 }
1767#endif
1768 }
1769}
1770
1771void
1772rxvt_term::focus_out ()
1773{
1774 if (focus)
1775 {
1776 focus = 0;
1777 want_refresh = 1;
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1780
1781#if ENABLE_FRILLS || ISO_14755
1782 if (iso14755buf)
1783 {
1784 iso14755buf = 0;
1785# if ISO_14755
1786 scr_overlay_off ();
1787# endif
1788 }
1789#endif
1790#if USE_XIM
1791 if (Input_Context != NULL)
1792 XUnsetICFocus (Input_Context);
1793#endif
1794#if CURSOR_BLINK
1795 if (option (Opt_cursorBlink))
1796 cursor_blink_ev.stop ();
1797 hidden_cursor = 0;
1798#endif
1799#if OFF_FOCUS_FADING
1800 if (rs[Rs_fade])
1801 {
1802 pix_colors = pix_colors_unfocused;
1803 scr_recolour ();
1804 }
1805#endif
1806 }
1807}
1808
1809void
1810rxvt_term::update_fade_color (unsigned int idx)
1811{
1812#if OFF_FOCUS_FADING
1813 if (rs[Rs_fade])
1814 {
1815 rgba c;
1816 pix_colors [Color_fade].get (c);
1817 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1818 }
1819#endif
1820}
1821
1822#if ENABLE_TRANSPARENCY || ENABLE_PERL
1319void 1823void
1320rxvt_term::rootwin_cb (XEvent &ev) 1824rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1825{
1322 SET_R (this); 1826 make_current ();
1323 SET_LOCALE (locale);
1324 1827
1828 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1829 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1832# if ENABLE_TRANSPARENCY
1325 switch (ev.type) 1833 switch (ev.type)
1326 { 1834 {
1327 case PropertyNotify: 1835 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1836 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1837 * 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. 1838 * use the property to determine the pixmap. We use it later on.
1340 */ 1839 */
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]) 1840 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1842 return;
1346 }
1347 1843
1348 /* FALLTHROUGH */ 1844 /* FALLTHROUGH */
1349 case ReparentNotify: 1845 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ())
1351 if (am_transparent) 1846 if (option (Opt_transparent))
1352 want_full_refresh = 1; 1847 check_our_parents ();
1353 break; 1848 break;
1849 }
1354#endif 1850# endif
1355 }
1356} 1851}
1852#endif
1357 1853
1358void 1854void
1359rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
1360{ 1856{
1361 int reportmode = 0, clickintime; 1857 int reportmode = 0, clickintime;
1362 1858
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1859 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1860
1364 if (!bypass_keystate) 1861 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1862 reportmode = !! (priv_modes & PrivMode_mouse_report);
1863
1366 /* 1864 /*
1367 * VT window processing of button press 1865 * VT window processing of button press
1368 */ 1866 */
1369 if (ev.window == TermWin.vt) 1867 if (ev.window == vt)
1370 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1872#if ISO_14755
1873 // 5.4
1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1875 {
1876 iso14755_54 (ev.x, ev.y);
1877 return;
1878 }
1879#endif
1880
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1881 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1882
1372 if (reportmode) 1883 if (reportmode)
1373 { 1884 {
1374 /* mouse report from vt window */ 1885 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1379 { 1890 {
1380 /* same button, within alloted time */ 1891 /* same button, within alloted time */
1381 MEvent.clicks++; 1892 MEvent.clicks++;
1893
1382 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1383 { 1895 {
1384 /* only report double clicks */ 1896 /* only report double clicks */
1385 MEvent.clicks = 2; 1897 MEvent.clicks = 2;
1386 mouse_report (ev); 1898 mouse_report (ev);
… …
1405 } 1917 }
1406 else 1918 else
1407 { 1919 {
1408 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1922
1410 switch (ev.button) 1923 switch (ev.button)
1411 { 1924 {
1412 case Button1: 1925 case Button1:
1926 /* allow meta + click to select rectangular areas */
1927 /* should be done in screen.C */
1928#if ENABLE_FRILLS
1929 selection.rect = !!(ev.state & ModMetaMask);
1930#else
1931 selection.rect = false;
1932#endif
1933
1413 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1936 {
1416 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1418 else 1939 else
1419 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1955 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1437 else 1958 else
1438 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1960
1439 MEvent.button = Button3; 1961 MEvent.button = Button3;
1440 break; 1962 break;
1441 } 1963 }
1442 } 1964 }
1965
1443 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1444 return; 1967 return;
1445 } 1968 }
1446 1969
1447 /* 1970 /*
… …
1513 upordown = 1; /* down */ 2036 upordown = 1; /* down */
1514 } 2037 }
1515 if (upordown) 2038 if (upordown)
1516 { 2039 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2040#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2041 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 2042#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 2044 {
1522 if (upordown < 0) 2045 if (upordown < 0)
1523 scrollBar.setUp (); 2046 scrollBar.setUp ();
… …
1539 break; 2062 break;
1540 case R_SB_ALIGN_BOTTOM: 2063 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2064 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2065 break;
1543 } 2066 }
2067
1544 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2072
1549 scrollBar.setMotion (); 2073 scrollBar.setMotion ();
1550 break; 2074 break;
1551 2075
1552 case Button1: 2076 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2081 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
1559 { 2083 {
1560 if (scrollbar_above_slider (ev.y)) 2084 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2085# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2086 scr_page (UP, nrow - 1);
1563# else 2087# else
1564 scr_page (UP, TermWin.nrow / 4); 2088 scr_page (UP, nrow / 4);
1565# endif 2089# endif
1566 else if (scrollbar_below_slider (ev.y)) 2090 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2092 scr_page (DN, nrow - 1);
1569# else 2093# else
1570 scr_page (DN, TermWin.nrow / 4); 2094 scr_page (DN, nrow / 4);
1571# endif 2095# endif
1572 else 2096 else
1573 scrollBar.setMotion (); 2097 scrollBar.setMotion ();
1574 } 2098 }
1575 else 2099 else
1576 { 2100 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2102 (nrow
1579 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2104 / scrollbar_size ()));
1581 } 2105 }
2106
1582 break; 2107 break;
1583 } 2108 }
1584 } 2109 }
2110
1585 return; 2111 return;
1586 } 2112 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2113}
1595 2114
1596void 2115void
1597rxvt_term::button_release (XButtonEvent &ev) 2116rxvt_term::button_release (XButtonEvent &ev)
1598{ 2117{
1599 int reportmode = 0; 2118 int reportmode = 0;
1600 2119
1601 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2121 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2123
1605 if (scrollbar_isUpDn ()) 2124 if (scrollbar_isUpDn ())
1606 { 2125 {
1607 scrollBar.setIdle (); 2126 scrollBar.setIdle ();
1608 scrollbar_show (0); 2127 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2128 }
2129
1614#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2131 if (sel_scroll_ev.active)
2132 sel_scroll_ev.stop();
1616#endif 2133#endif
2134
1617 if (ev.window == TermWin.vt) 2135 if (ev.window == vt)
1618 { 2136 {
2137 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2138 return;
2139
2140#if ISO_14755
2141 // 5.4
2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143 return;
2144#endif
2145
1619 if (reportmode) 2146 if (reportmode)
1620 { 2147 {
1621 /* mouse report from vt window */ 2148 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2149 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2150 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2164 MEvent.button = AnyButton;
1638 mouse_report (ev); 2165 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2166#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2167 return;
1641 } 2168 }
2169
1642 /* 2170 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2171 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2172 * when overriding mouse reporting
1645 */ 2173 */
1646 if (PrivateModes & PrivMode_mouse_report 2174 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2175 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2176 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2177 selection_extend (ev.x, ev.y, 0);
1650 2178
1651 switch (ev.button) 2179 switch (ev.button)
1652 { 2180 {
1653 case Button1: 2181 case Button1:
1654 case Button3: 2182 case Button3:
1655 selection_make (ev.time); 2183 selection_make (ev.time);
1656 break; 2184 break;
2185
1657 case Button2: 2186 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2187 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2188 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2189 break;
2190
1660#ifdef MOUSE_WHEEL 2191#ifdef MOUSE_WHEEL
1661 case Button4: 2192 case Button4:
1662 case Button5: 2193 case Button5:
1663 { 2194 {
1664 int i; 2195 int i;
1665 page_dirn v; 2196 page_dirn v;
1666 2197
1667 v = (ev.button == Button4) ? UP : DN; 2198 v = ev.button == Button4 ? UP : DN;
2199
1668 if (ev.state & ShiftMask) 2200 if (ev.state & ShiftMask)
1669 i = 1; 2201 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2202 else if (option (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2203 i = nrow - 1;
1672 else 2204 else
1673 i = 5; 2205 i = 5;
2206
1674# ifdef MOUSE_SLIP_WHEELING 2207# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2208 if (ev.state & ControlMask)
1676 { 2209 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2210 mouse_slip_wheel_speed += v ? -1 : 1;
2211 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2212 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2213
2214 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2215 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2216
2217 slip_wheel_ev.start ();
2218 }
2219 else
2220 {
2221# endif
2222 scr_page (v, i);
2223 scrollbar_show (1);
2224# ifdef MOUSE_SLIP_WHEELING
1679 } 2225 }
1680# endif 2226# 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 } 2227 }
1695 break; 2228 break;
1696#endif 2229#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 { 2230 }
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 { 2231 }
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} 2232}
1918#endif
1919 2233
1920/*}}} */ 2234/*}}} */
1921 2235
1922bool 2236bool
1923rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
1924{ 2238{
1925 bool flag = false; 2239 bool flag = false;
1926 unicode_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
1928 2242
1929 for (;;) 2243 for (;;)
1930 { 2244 {
1931 if (ch == NOCHAR) 2245 if (ch == NOCHAR)
1932 { 2246 {
1933 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2248 ch = next_char ();
1935 }
1936 2249
1937 if (ch == NOCHAR) // TODO: improve 2250 if (ch == NOCHAR)
1938 break; 2251 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2252 }
2253
2254 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2255 {
2256 if (!seen_input)
2257 {
2258 seen_input = 1;
2259 // many badly-written programs (e.g. jed) contain a race condition:
2260 // they first read the screensize and then install a SIGWINCH handler.
2261 // some window managers resize the window early, and these programs
2262 // then sometimes get the size wrong.
2263 // unfortunately other programs are even more buggy and dislike
2264 // being sent SIGWINCH, so only do it when we were in fact being
2265 // resized.
2266 if (seen_resize && cmd_pid)
2267 kill (-cmd_pid, SIGWINCH);
2268 }
2269
1942 /* Read a text string from the input buffer */ 2270 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2271 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2272 bool refreshnow = false;
1945 int nlines = 0; 2273 int nlines = 0;
1946 unicode_t *str = buf; 2274 wchar_t *str = buf;
1947 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2276
1950 for (;;) 2277 for (;;)
1951 { 2278 {
2279 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2280 break;
2281
2282 *str++ = ch;
2283
2284 if (ch == C0_LF || str >= eol)
2285 {
2286 if (ch == C0_LF)
2287 nlines++;
2288
2289 refresh_count++;
2290
2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2292 {
2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2296 {
2297 refreshnow = true;
2298 ch = NOCHAR;
2299 break;
2300 }
2301 }
2302
2303 // scr_add_lines only works for nlines <= nrow - 1.
2304 if (nlines >= nrow - 1)
2305 {
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2308 scr_add_lines (buf, str - buf, nlines);
2309
2310 nlines = 0;
2311 str = buf;
2312 eol = str + min (ncol, UBUFSIZ);
2313 }
2314
2315 if (str >= eol)
2316 {
2317 if (eol >= buf + UBUFSIZ)
2318 {
2319 ch = NOCHAR;
2320 break;
2321 }
2322 else
2323 eol = min (eol + ncol, buf + UBUFSIZ);
2324 }
2325
2326 }
2327
1952 seq_begin = cmdbuf_ptr; 2328 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2329 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 } 2330 }
1989 2331
2332 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2334 scr_add_lines (buf, str - buf, nlines);
1991 2335
1992 /* 2336 /*
1993 * If there have been a lot of new lines, then update the screen 2337 * 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. 2338 * 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 2339 * 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 */ 2340 */
2001 if (refreshnow) 2341 if (refreshnow)
2002 { 2342 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2343 flag = true;
2004 refresh_limit++;
2005
2006 scr_refresh (refresh_type); 2344 scr_refresh ();
2345 want_refresh = 1;
2007 } 2346 }
2008 2347
2009 } 2348 }
2010 else 2349 else
2011 { 2350 {
… …
2026 2365
2027 return flag; 2366 return flag;
2028} 2367}
2029 2368
2030// read the next character 2369// read the next character
2031unicode_t 2370wchar_t
2032rxvt_term::next_char () 2371rxvt_term::next_char () NOTHROW
2033{ 2372{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2374 {
2036 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2039 2378
2040 wchar_t wc; 2379 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2381
2043 if (len == (size_t)-2) 2382 if (len == (size_t)-2)
2044 { 2383 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2384 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2386 break;
2048 } 2387 }
2049 2388
2050 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2391
2053 // assume wchar == unicode 2392 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
2055 return wc; 2394 return wc & UNICODE_MASK;
2056 } 2395 }
2057 2396
2058 return NOCHAR; 2397 return NOCHAR;
2059} 2398}
2399
2400// read the next octet
2401uint32_t
2402rxvt_term::next_octet () NOTHROW
2403{
2404 return cmdbuf_ptr < cmdbuf_endp
2405 ? (unsigned char)*cmdbuf_ptr++
2406 : NOCHAR;
2407}
2408
2409static class out_of_input out_of_input;
2060 2410
2061/* rxvt_cmd_getc () - Return next input character */ 2411/* rxvt_cmd_getc () - Return next input character */
2062/* 2412/*
2063 * Return the next input character after first passing any keyboard input 2413 * Return the next input character after first passing any keyboard input
2064 * to the command. 2414 * to the command.
2065 */ 2415 */
2066unicode_t 2416wchar_t
2067rxvt_term::cmd_getc () 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2418{
2069 unicode_t c = next_char (); 2419 wchar_t c = next_char ();
2420
2421 if (c == NOCHAR)
2422 throw out_of_input;
2423
2424 return c;
2425}
2426
2427uint32_t
2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2429{
2430 uint32_t c = next_octet ();
2070 2431
2071 if (c == NOCHAR) 2432 if (c == NOCHAR)
2072 throw out_of_input; 2433 throw out_of_input;
2073 2434
2074 return c; 2435 return c;
… …
2138 { 2499 {
2139 if ((buf[len++] = cmd_getc ()) == 'i') 2500 if ((buf[len++] = cmd_getc ()) == 'i')
2140 break; /* done = 1 */ 2501 break; /* done = 1 */
2141 } 2502 }
2142 } 2503 }
2143 2504
2144 for (i = 0; i < len; i++) 2505 for (i = 0; i < len; i++)
2145 if (putc (buf[i], fd) == EOF) 2506 if (putc (buf[i], fd) == EOF)
2146 { 2507 {
2147 done = 1; 2508 done = 1;
2148 break; 2509 break;
… …
2156/*}}} */ 2517/*}}} */
2157 2518
2158/* *INDENT-OFF* */ 2519/* *INDENT-OFF* */
2159enum { 2520enum {
2160 C1_40 = 0x40, 2521 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2522 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, 2523 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, 2524 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 2525 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2526};
2166/* *INDENT-ON* */ 2527/* *INDENT-ON* */
2167 2528
2168/*{{{ process non-printing single characters */ 2529/*{{{ process non-printing single characters */
2169void 2530void
… …
2174 case C0_ESC: 2535 case C0_ESC:
2175 process_escape_seq (); 2536 process_escape_seq ();
2176 break; 2537 break;
2177 case C0_ENQ: /* terminal Status */ 2538 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2539 if (rs[Rs_answerbackstring])
2179 tt_write ( 2540 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 2541 else
2183 tt_write ((unsigned char *)VT100_ANS, 2542 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2543 break;
2186 case C0_BEL: /* bell */ 2544 case C0_BEL: /* bell */
2187 scr_bell (); 2545 scr_bell ();
2188 break; 2546 break;
2189 case C0_BS: /* backspace */ 2547 case C0_BS: /* backspace */
… …
2205 break; 2563 break;
2206 case C0_SI: /* shift in - acs */ 2564 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2565 scr_charset_choose (0);
2208 break; 2566 break;
2209 2567
2568#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2569 // 8-bit controls
2211 case 0x90: /* DCS */ 2570 case 0x90: /* DCS */
2212 process_dcs_seq (); 2571 process_dcs_seq ();
2213 break; 2572 break;
2214 case 0x9b: /* CSI */ 2573 case 0x9b: /* CSI */
2215 process_csi_seq (); 2574 process_csi_seq ();
2216 break; 2575 break;
2217 case 0x9d: /* CSI */ 2576 case 0x9d: /* OSC */
2218 process_osc_seq (); 2577 process_osc_seq ();
2219 break; 2578 break;
2579#endif
2220 } 2580 }
2221} 2581}
2222/*}}} */ 2582/*}}} */
2223 2583
2224 2584
… …
2286void 2646void
2287rxvt_term::process_escape_seq () 2647rxvt_term::process_escape_seq ()
2288{ 2648{
2289 unicode_t ch = cmd_getc (); 2649 unicode_t ch = cmd_getc ();
2290 2650
2291 if (PrivateModes & PrivMode_vt52) 2651 if (priv_modes & PrivMode_vt52)
2292 { 2652 {
2293 process_escape_vt52 (ch); 2653 process_escape_vt52 (ch);
2294 return; 2654 return;
2295 } 2655 }
2296 2656
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2672 break;
2313 case '+': 2673 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2675 break;
2316#ifndef NO_FRILLS 2676#if !ENABLE_MINIMAL
2317 case '6': 2677 case '6':
2318 scr_backindex (); 2678 scr_backindex ();
2319 break; 2679 break;
2320#endif 2680#endif
2321 case '7': 2681 case '7':
2322 scr_cursor (SAVE); 2682 scr_cursor (SAVE);
2323 break; 2683 break;
2324 case '8': 2684 case '8':
2325 scr_cursor (RESTORE); 2685 scr_cursor (RESTORE);
2326 break; 2686 break;
2327#ifndef NO_FRILLS 2687#if !ENABLE_MINIMAL
2328 case '9': 2688 case '9':
2329 scr_forwardindex (); 2689 scr_forwardindex ();
2330 break; 2690 break;
2331#endif 2691#endif
2332 case '=': 2692 case '=':
… …
2342 break; 2702 break;
2343 2703
2344 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
2346 { 2706 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2707 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 2709 }
2350 break; 2710 break;
2351 2711
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 2713 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 2723 case C1_RI: /* ESC M */
2364 scr_index (DN); 2724 scr_index (DN);
2365 break; 2725 break;
2366 2726
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2727 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2728 /*case C1_SS2: scr_single_shift (2); break; */
2369 2729
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2730 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2731 /*case C1_SS3: scr_single_shift (3); break; */
2372 2732
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2733 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2734 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2735 process_dcs_seq ();
2376 break; 2736 break;
2377 2737
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 2739 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 2740 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 2741 break; /* steal obsolete ESC [ c */
2383 2742
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 2744 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 2745 process_csi_seq ();
… …
2391 process_osc_seq (); 2750 process_osc_seq ();
2392 break; 2751 break;
2393 2752
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2753 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 2754 case 'c':
2755 mbstate.reset ();
2396 scr_poweron (); 2756 scr_poweron ();
2397 scrollbar_show (1); 2757 scrollbar_show (1);
2398 break; 2758 break;
2399 2759
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2760 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 2772
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2773/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2774/* *INDENT-OFF* */
2415enum { 2775enum {
2416 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 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 , 2778 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, 2779 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, 2780 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, 2781 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, 2782 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, */ 2797 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, [, \, ], ^, _, */ 2798 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, */ 2799 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, */ 2800 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, */ 2801 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, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2803 };
2444/* *INDENT-ON* */ 2804/* *INDENT-ON* */
2445 2805
2446void 2806void
2447rxvt_term::process_csi_seq () 2807rxvt_term::process_csi_seq ()
… …
2449 unicode_t ch, priv, i; 2809 unicode_t ch, priv, i;
2450 unsigned int nargs, p; 2810 unsigned int nargs, p;
2451 int n, ndef; 2811 int n, ndef;
2452 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
2453 2813
2454 for (nargs = ESC_ARGS; nargs > 0;) 2814 memset (arg, 0, sizeof (arg));
2455 arg[--nargs] = 0; 2815 nargs = 0;
2456 2816
2457 priv = 0; 2817 priv = 0;
2458 ch = cmd_getc (); 2818 ch = cmd_getc ();
2459 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
2460 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
… …
2494 ndef = get_byte_array_bit (csi_defaults, i); 2854 ndef = get_byte_array_bit (csi_defaults, i);
2495 for (p = 0; p < nargs; p++) 2855 for (p = 0; p < nargs; p++)
2496 if (arg[p] == -1) 2856 if (arg[p] == -1)
2497 arg[p] = ndef; 2857 arg[p] = ndef;
2498 2858
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 /* 2859 /*
2507 * private mode handling 2860 * private mode handling
2508 */ 2861 */
2509 if (priv) 2862 if (priv)
2510 { 2863 {
2511 switch (priv) 2864 switch (priv)
2512 { 2865 {
2513 case '>': 2866 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 2867 if (ch == CSI_DA) /* secondary device attributes */
2868 {
2869 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2870 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2871 //
2872 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2873 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2874 // that we do not support xterm mouse reporting (should be 95 when we do).
2875 //
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2876 tt_printf ("\033[>%d;94;0c", 'U');
2877 }
2516 break; 2878 break;
2517 case '?': 2879 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 2882 break;
… …
2625 2987
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2988 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 2989 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 2990 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2991 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2992 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 2993 break;
2632 2994
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2995 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 2996 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 2997 break;
2637 2998
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3000 process_sgr_mode (nargs, arg);
2640 break; 3001 break;
… …
2646 tt_printf ("\033[0n"); 3007 tt_printf ("\033[0n");
2647 break; 3008 break;
2648 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
2649 scr_report_position (); 3010 scr_report_position ();
2650 break; 3011 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3013 if (option (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3015 break;
2655#endif
2656 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3018 break;
2659 } 3019 }
2660 break; 3020 break;
2661 3021
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3022 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3055 break;
2696 3056
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3057 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3058 if (arg[0] == 4)
2699 scr_insert_mode (0); 3059 scr_insert_mode (0);
3060 else if (arg[0] == 20)
3061 priv_modes &= ~PrivMode_LFNL;
2700 break; 3062 break;
2701 3063
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3064 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3065 if (arg[0] == 4)
2704 scr_insert_mode (1); 3066 scr_insert_mode (1);
3067 else if (arg[0] == 20)
3068 priv_modes |= PrivMode_LFNL;
2705 break; 3069 break;
2706 3070
2707 /* 3071 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3072 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3073 */
… …
2721 break; 3085 break;
2722 case CSI_75: 3086 case CSI_75:
2723 scr_cursor (RESTORE); 3087 scr_cursor (RESTORE);
2724 break; 3088 break;
2725 3089
2726#ifndef NO_FRILLS 3090#if !ENABLE_MINIMAL
2727 case CSI_74: 3091 case CSI_74:
2728 process_window_ops (arg, nargs); 3092 process_window_ops (arg, nargs);
2729 break; 3093 break;
2730#endif 3094#endif
2731 3095
… …
2738 break; 3102 break;
2739 } 3103 }
2740} 3104}
2741/*}}} */ 3105/*}}} */
2742 3106
2743#ifndef NO_FRILLS 3107#if !ENABLE_MINIMAL
2744/* ARGSUSED */ 3108/* ARGSUSED */
2745void 3109void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3110rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3111{
2748 int x, y; 3112 int x, y;
2749 XWindowAttributes wattr; 3113 XWindowAttributes wattr;
2750 Window wdummy; 3114 Window wdummy;
3115
3116 dLocal (Display *, dpy);
2751 3117
2752 if (nargs == 0) 3118 if (nargs == 0)
2753 return; 3119 return;
2754 3120
2755 switch (args[0]) 3121 switch (args[0])
2756 { 3122 {
2757 /* 3123 /*
2758 * commands 3124 * commands
2759 */ 3125 */
2760 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3127 XMapWindow (dpy, parent[0]);
2762 break; 3128 break;
2763 case 2: /* iconify window */ 3129 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3130 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3131 break;
2767 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3134 break;
2770 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3137 break;
2773 case 5: /* raise window */ 3138 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3139 XRaiseWindow (dpy, parent[0]);
2775 break; 3140 break;
2776 case 6: /* lower window */ 3141 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3142 XLowerWindow (dpy, parent[0]);
2778 break; 3143 break;
2779 case 7: /* refresh window */ 3144 case 7: /* refresh window */
2780 scr_touch (true); 3145 scr_touch (true);
2781 break; 3146 break;
2782 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3148 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3149 (unsigned int) (args[1] * fheight));
2785 break; 3150 break;
2786 3151
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3152 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3153 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3154 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3155 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3156 (unsigned int) (args[1] * fheight));
2792 break; 3157 break;
2793
2794 3158
2795 /* 3159 /*
2796 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
2797 */ 3161 */
2798 case 11: /* report window state */ 3162 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3165 break;
2802 case 13: /* report window position */ 3166 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3172 break;
2809 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3176 break;
2813 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3179 break;
2816 case 19: /* report window size (chars) */ 3180 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3182 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3184 {
3185 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3186 XGetIconName (dpy, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3188 XFree (s);
3189 }
2823 break; 3190 break;
2824 case 21: /* report window title */ 3191 case 21: /* report window title */
3192 {
3193 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3194 XFetchName (dpy, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196 XFree (s);
3197 }
2827 break; 3198 break;
2828#endif
2829 } 3199 }
2830} 3200}
2831#endif 3201#endif
2832 3202
2833/*----------------------------------------------------------------------*/ 3203/*----------------------------------------------------------------------*/
2834/* 3204/*
2835 * get input up until STRING TERMINATOR (or BEL) 3205 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3206 * ends_how is terminator used. returned input must be free()'d
2837 */ 3207 */
2838unsigned char * 3208char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3209rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3210{
2841 int seen_esc = 0; /* seen escape? */ 3211 unicode_t ch;
3212 bool seen_esc = false;
2842 unsigned int n = 0; 3213 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3214 wchar_t string[STRING_MAX];
2846 3215
2847 while ((ch = cmd_getc ())) 3216 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3217 {
2849 if (ch == C0_BEL 3218 if (seen_esc)
2850 || ch == CHAR_ST 3219 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3220 if (ch == 0x5c) /* 7bit ST */
2852 break; 3221 break;
2853 3222 else
3223 return NULL;
3224 }
2854 if (ch == C0_ESC) 3225 else if (ch == C0_ESC)
2855 { 3226 {
2856 seen_esc = 1; 3227 seen_esc = true;
2857 continue; 3228 continue;
2858 } 3229 }
3230 else if (ch == C0_BEL || ch == CHAR_ST)
3231 break;
2859 else if (ch == '\t') 3232 else if (ch == C0_SYN)
2860 ch = ' '; /* translate '\t' to space */ 3233 ch = cmd_get8 ();
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3234 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3235 return NULL; /* other control character - exit */
2863 3236
2864 if (n < sizeof (string) - 1) 3237 seen_esc = false;
3238
3239 if (n >= STRING_MAX - 1)
3240 // stop at some sane length
3241 return NULL;
3242
2865 string[n++] = ch; 3243 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3244 }
2869 3245
2870 string[n++] = '\0'; 3246 string[n++] = '\0';
2871 3247
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3248 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3249
2877 return s; 3250 return rxvt_wcstombs (string);
2878} 3251}
2879 3252
2880/*----------------------------------------------------------------------*/ 3253/*----------------------------------------------------------------------*/
2881/* 3254/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3255 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3256 */
2884void 3257void
2885rxvt_term::process_dcs_seq () 3258rxvt_term::process_dcs_seq ()
2886{ 3259{
2887 unsigned char *s; 3260 char *s;
2888 unicode_t eh; 3261 unicode_t eh;
2889 3262
2890 /* 3263 /*
2891 * Not handled yet 3264 * Not handled yet
2892 */ 3265 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3284 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3285 arg = arg * 10 + (ch - '0');
2913 3286
2914 if (ch == ';') 3287 if (ch == ';')
2915 { 3288 {
2916 unsigned char *s = get_to_st (eh); 3289 char *s = get_to_st (eh);
2917 3290
2918 if (s) 3291 if (s)
2919 { 3292 {
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); 3293 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3294 free (s);
2934 } 3295 }
2935 } 3296 }
2936} 3297}
3298
3299void
3300rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3301{
3302 if (str[0] == '?' && !str[1])
3303 {
3304 rgba c;
3305 pix_colors_focused[color].get (c);
3306
3307#if XFT
3308 if (c.a != rgba::MAX_CC)
3309 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3310 else
3311#endif
3312 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3313 }
3314 else
3315 set_window_color (color, str);
3316}
3317
2937/* 3318/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3319 * 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 */ 3320 */
2960void 3321void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3322rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3323{
2963 int changed = 0;
2964 int color; 3324 int color;
2965 char *buf, *name; 3325 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1];
3327 int saveop = op;
3328
3329 dLocal (Display *, dpy);
2966 3330
2967 assert (str != NULL); 3331 assert (str != NULL);
3332
3333 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3334 return;
3335
2968 switch (op) 3336 switch (op)
2969 { 3337 {
2970 case XTerm_name: 3338 case XTerm_name:
2971 set_title (str); 3339 set_title (str);
2972 /* FALLTHROUGH */ 3340 /* FALLTHROUGH */
… …
2974 set_icon_name (str); 3342 set_icon_name (str);
2975 break; 3343 break;
2976 case XTerm_title: 3344 case XTerm_title:
2977 set_title (str); 3345 set_title (str);
2978 break; 3346 break;
3347 case XTerm_property:
3348 if (str[0] == '?')
3349 {
3350 Atom prop = display->atom (str + 1);
3351 Atom actual_type;
3352 int actual_format;
3353 unsigned long nitems;
3354 unsigned long bytes_after;
3355 unsigned char *value = 0;
3356 const char *str = "";
3357
3358 if (prop
3359 && XGetWindowProperty (dpy, parent[0],
3360 prop, 0, 1<<16, 0, AnyPropertyType,
3361 &actual_type, &actual_format,
3362 &nitems, &bytes_after, &value) == Success
3363 && actual_type != None
3364 && actual_format == 8)
3365 str = (const char *)(value);
3366
3367 tt_printf ("\033]%d;%s%c", op, str, resp);
3368
3369 XFree (value);
3370 }
3371 else
3372 {
3373 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3374
3375 if (eq)
3376 {
3377 *eq = 0;
3378 set_utf8_property (display->atom (str), eq + 1);
3379 }
3380 else
3381 XDeleteProperty (dpy, parent[0],
3382 display->atom (str));
3383 }
3384 break;
3385
2979 case XTerm_Color: 3386 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3387 for (buf = (char *)str; buf && *buf;)
2981 { 3388 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3389 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3390 break;
2984 3391
2985 *name++ = '\0'; 3392 *name++ = '\0';
2986 color = atoi (buf); 3393 color = atoi (buf) + minCOLOR;
2987 3394
2988 if (color < 0 || color >= TOTAL_COLORS) 3395 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3396 break;
2990 3397
2991 if ((buf = STRCHR (name, ';')) != NULL) 3398 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3399 *buf++ = '\0';
2993 3400
2994 set_window_color (color + minCOLOR, name); 3401 process_color_seq (op, color, name, resp);
2995 } 3402 }
3403 break;
3404 case XTerm_Color00:
3405 process_color_seq (op, Color_fg, str, resp);
3406 break;
3407 case XTerm_Color01:
3408 process_color_seq (op, Color_bg, str, resp);
2996 break; 3409 break;
2997#ifndef NO_CURSORCOLOR 3410#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3411 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3412 process_color_seq (op, Color_cursor, str, resp);
3000 break; 3413 break;
3001#endif 3414#endif
3002 case XTerm_Color_pointer: 3415 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3416 process_color_seq (op, Color_pointer_fg, str, resp);
3417 break;
3418 case XTerm_Color_pointer_bg:
3419 process_color_seq (op, Color_pointer_bg, str, resp);
3004 break; 3420 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#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: 3422 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3423 process_color_seq (op, Color_RV, str, resp);
3014 break; 3424 break;
3015#endif 3425 case Rxvt_Color_BD:
3016 3426 case URxvt_Color_BD:
3017 case XTerm_Menu: 3427 process_color_seq (op, Color_BD, str, resp);
3018 /*
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break; 3428 break;
3023 case XTerm_Pixmap: 3429 case Rxvt_Color_UL:
3024 if (*str != ';') 3430 case URxvt_Color_UL:
3025 { 3431 process_color_seq (op, Color_UL, str, resp);
3432 break;
3433 case URxvt_Color_IT:
3434 process_color_seq (op, Color_IT, str, resp);
3435 break;
3436#endif
3437#if ENABLE_TRANSPARENCY
3438 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp);
3440
3441 check_our_parents ();
3442
3443 if (am_transparent)
3444 want_full_refresh = want_refresh = 1;
3445
3446 break;
3447#endif
3448
3026#if XPM_BACKGROUND 3449#if XPM_BACKGROUND
3450 case Rxvt_Pixmap:
3451 {
3452 if (*str != ';')
3453 {
3027 scale_pixmap (""); /* reset to default scaling */ 3454 bgPixmap.handle_geometry (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3455 set_bgPixmap (str); /* change pixmap */
3029#endif
3030 scr_touch (true); 3456 scr_touch (true);
3031 } 3457 }
3458
3459 int changed = 0;
3460
3032 while ((str = STRCHR (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3033 { 3462 {
3034 str++; 3463 str++;
3035#if XPM_BACKGROUND 3464 changed += bgPixmap.handle_geometry (str);
3036 changed += scale_pixmap (str);
3037#endif
3038
3039 } 3465 }
3466
3040 if (changed) 3467 if (changed)
3041 { 3468 {
3042#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3469 resize_pixmap ();
3044#endif
3045 scr_touch (true); 3470 scr_touch (true);
3046 } 3471 }
3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473 if (option (Opt_transparent))
3474 check_our_parents ();
3475#endif
3476 }
3047 break; 3477 break;
3478#endif
3048 3479
3049 case XTerm_restoreFG: 3480 case Rxvt_restoreFG:
3050 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3051 break; 3482 break;
3052 case XTerm_restoreBG: 3483 case Rxvt_restoreBG:
3053 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3054 break; 3485 break;
3486
3055 case XTerm_logfile: 3487 case XTerm_logfile:
3056 // TODO, when secure mode? 3488 // TODO, when secure mode?
3057 break; 3489 break;
3058 case XTerm_font: 3490
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 3491#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3492 case Rxvt_dumpscreen: /* no error notices */
3082 { 3493 {
3083 int fd; 3494 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3495 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3496 {
3086 scr_dump (fd); 3497 scr_dump (fd);
3087 close (fd); 3498 close (fd);
3088 } 3499 }
3089 } 3500 }
3501 break;
3502#endif
3503 case XTerm_font:
3504 op = URxvt_font;
3505 case URxvt_font:
3506#if ENABLE_STYLES
3507 case URxvt_boldFont:
3508 case URxvt_italicFont:
3509 case URxvt_boldItalicFont:
3510#endif
3511 if (query)
3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3514 ? fontset[op - URxvt_font]->fontdesc : "",
3515 resp);
3516 else
3517 {
3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
3519
3520 res = strdup (str);
3521 allocated.push_back ((void *)res);
3522 set_fonts ();
3523 }
3524 break;
3525
3526 case URxvt_version:
3527 if (query)
3528 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3529 op,
3530 rs[Rs_name], VERSION[0], VERSION[2],
3531 resp);
3532 break;
3533
3534#if !ENABLE_MINIMAL
3535 case URxvt_locale:
3536 if (query)
3537 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3538 else
3539 {
3540 set_locale (str);
3541 pty->set_utf8_mode (enc_utf8);
3542 init_xlocale ();
3543 }
3544 break;
3545
3546 case URxvt_view_up:
3547 case URxvt_view_down:
3548 {
3549 int lines = atoi (str);
3550
3551 if (lines)
3552 scr_page (op == URxvt_view_up ? UP : DN, lines);
3553 else
3554 scr_erase_savelines ();
3555 }
3556
3557 break;
3558#endif
3559
3560#if ENABLE_PERL
3561 case URxvt_perl:
3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3563 ; // no responses yet
3090 break; 3564 break;
3091#endif 3565#endif
3092 } 3566 }
3093} 3567}
3094/*----------------------------------------------------------------------*/ 3568/*----------------------------------------------------------------------*/
… …
3108{ 3582{
3109 int state; 3583 int state;
3110 3584
3111 if (mode == 's') 3585 if (mode == 's')
3112 { 3586 {
3113 SavedModes |= (PrivateModes & bit); 3587 SavedModes |= (priv_modes & bit);
3114 return -1; 3588 return -1;
3115 } 3589 }
3116 else 3590 else
3117 { 3591 {
3118 if (mode == 'r') 3592 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3593 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3594 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3595 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3596 PrivMode (state, bit);
3123 } 3597 }
3124 3598
3125 return state; 3599 return state;
3126} 3600}
3127 3601
3128/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3129void 3603void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 3605{
3132 unsigned int i, j; 3606 unsigned int i, j;
3133 int state; 3607 int state;
3134 3608
3135 static const struct 3609 static const struct
… …
3144 { 3, PrivMode_132 }, 3618 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3619 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3621 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3622 { 7, PrivMode_Autowrap },
3623 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3624 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3625 // 18, 19 printing-related
3151 { menuBar_esc, PrivMode_menuBar }, 3626 { 25, PrivMode_VisibleCursor },
3152#endif
3153#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3629#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3631 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3632 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3633 // 45 margin bell NYI
3163 // 46 start logging 3634 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3649 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3650 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3651 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3652 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3653 };
3183 3654
3184 if (nargs == 0) 3655 if (nargs == 0)
3185 return; 3656 return;
… …
3203 } 3674 }
3204 3675
3205 /* extra handling for values with state unkept */ 3676 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3677 switch (arg[i])
3207 { 3678 {
3679#if ENABLE_STYLES
3680 case 1021:
3681 set_option (Opt_intensityStyles, mode);
3682
3683 scr_touch (true);
3684 break;
3685#endif
3208 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
3209 case 1049: 3687 case 1049:
3688 if (option (Opt_secondaryScreen))
3210 if (mode == 0) 3689 if (mode == 0)
3211 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
3212 else if (mode == 1) 3691 else if (mode == 1)
3213 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3693 break;
3215 } 3694 }
3216 3695
3217 if (state >= 0) 3696 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3697 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3698 switch (arg[i])
… …
3225 * within VT52 mode 3704 * within VT52 mode
3226 */ 3705 */
3227 PrivMode (1, PrivMode_vt52); 3706 PrivMode (1, PrivMode_vt52);
3228 break; 3707 break;
3229 case 3: /* 80/132 */ 3708 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3709 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3710 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 3711 break;
3233 case 4: /* smooth scrolling */ 3712 case 4: /* smooth scrolling */
3234 if (state) 3713 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 3714 break;
3239 case 5: /* reverse video */ 3715 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 3716 scr_rvideo_mode (state);
3241 break; 3717 break;
3242 case 6: /* relative/absolute origins */ 3718 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 3719 scr_relative_origin (state);
3244 break; 3720 break;
3245 case 7: /* autowrap */ 3721 case 7: /* autowrap */
3246 scr_autowrap (state); 3722 scr_autowrap (state);
3247 break; 3723 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~PrivMode_MouseX11;
3252 break; 3728 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 3729#ifdef scrollBar_esc
3261 case scrollBar_esc: 3730 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
3263 { 3732 {
3264 resize_all_windows (0, 0, 0); 3733 resize_all_windows (0, 0, 0);
… …
3267 break; 3736 break;
3268#endif 3737#endif
3269 case 25: /* visible/invisible cursor */ 3738 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3739 scr_cursor_visible (state);
3271 break; 3740 break;
3272 /* case 35: - shift keys */ 3741 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3742 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3743 case 47: /* secondary screen */
3275 scr_change_screen (state); 3744 scr_change_screen (state);
3276 break; 3745 break;
3277 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~PrivMode_MouseX10;
3282 break; 3751 break;
3283#if 0 3752#if 0
3284 case 1001: 3753 case 1001:
3285 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
3286#endif 3755#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 3756 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 3757 set_option (Opt_scrollTtyOutput, !state);
3292 break; 3758 break;
3293 case 1011: /* scroll to bottom on key press */ 3759 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3760 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3761 break;
3299 case 1047: /* secondary screen w/ clearing */ 3762 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3763 if (option (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 3764 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 3765 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 3766 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3767 break;
3768 case 1049: /* secondary screen w/ clearing first */
3769 scr_change_screen (state);
3770 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY)
3772 scr_erase_screen (2);
3773 break;
3306 default: 3774 default:
3307 break; 3775 break;
3308 } 3776 }
3309 } 3777 }
3310} 3778}
… …
3333 rendset = 0, rendstyle = ~RS_None; 3801 rendset = 0, rendstyle = ~RS_None;
3334 break; 3802 break;
3335 case 1: 3803 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3804 rendset = 1, rendstyle = RS_Bold;
3337 break; 3805 break;
3806 //case 2: // low intensity
3807 case 3:
3808 rendset = 1, rendstyle = RS_Italic;
3809 break;
3338 case 4: 3810 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3811 rendset = 1, rendstyle = RS_Uline;
3340 break; 3812 break;
3341 case 5: 3813 case 5: // slowly blinking
3814 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3815 rendset = 1, rendstyle = RS_Blink;
3343 break; 3816 break;
3817 //case 6: // scoansi light background
3344 case 7: 3818 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3819 rendset = 1, rendstyle = RS_RVid;
3346 break; 3820 break;
3347 case 8: 3821 case 8:
3348 // invisible. NYI 3822 // invisible. NYI
3349 break; 3823 break;
3350 case 22: 3824 //case 9: // crossed out
3825 //case 10: // scoansi acs off, primary font
3826 //case 11: // scoansi acs on, first alt font
3827 //case 12: // scoansi acs on, |0x80, second alt font
3828 //...
3829 //case 19: // ninth alt font
3830 //case 20: // gothic
3831 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 3832 rendset = 0, rendstyle = RS_Bold;
3833 break;
3834 case 22: // normal intensity
3835 rendset = 0, rendstyle = RS_Bold;
3836 break;
3837 case 23: // disable italic
3838 rendset = 0, rendstyle = RS_Italic;
3352 break; 3839 break;
3353 case 24: 3840 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3841 rendset = 0, rendstyle = RS_Uline;
3355 break; 3842 break;
3356 case 25: 3843 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3844 rendset = 0, rendstyle = RS_Blink;
3358 break; 3845 break;
3846 case 26: // variable spacing (iso 8613)
3847 rendset = 0, rendstyle = RS_Blink;
3848 break;
3359 case 27: 3849 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3850 rendset = 0, rendstyle = RS_RVid;
3361 break; 3851 break;
3362 case 28:
3363 // visible. NYI 3852 //case 28: // visible. NYI
3364 break; 3853 //case 29: // not crossed-out
3365 } 3854 }
3366 3855
3367 if (rendset != -1) 3856 if (rendset != -1)
3368 { 3857 {
3369 scr_rendition (rendset, rendstyle); 3858 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 3869 case 35:
3381 case 36: 3870 case 36:
3382 case 37: 3871 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3872 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 3873 break;
3385#ifdef TTY_256COLOR 3874 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 3875 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 3876 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3877 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 3878 i += 2;
3391 } 3879 }
3392 break; 3880 break;
3393#endif
3394 case 39: /* default fg */ 3881 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 3882 scr_color (Color_fg, Color_fg);
3396 break; 3883 break;
3397 3884
3398 case 40: 3885 case 40:
… …
3403 case 45: 3890 case 45:
3404 case 46: 3891 case 46:
3405 case 47: 3892 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3893 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 3894 break;
3408#ifdef TTY_256COLOR 3895 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 3896 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 3897 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3898 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 3899 i += 2;
3414 } 3900 }
3415 break; 3901 break;
3416#endif
3417 case 49: /* default bg */ 3902 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 3903 scr_color (Color_bg, Color_bg);
3419 break; 3904 break;
3420 3905
3421#ifndef NO_BRIGHTCOLOR 3906 //case 50: // not variable spacing
3907
3908#if !ENABLE_MINIMAL
3422 case 90: 3909 case 90:
3423 case 91: /* set bright fg color */ 3910 case 91: /* set bright fg color */
3424 case 92: 3911 case 92:
3425 case 93: 3912 case 93:
3426 case 94: 3913 case 94:
3427 case 95: 3914 case 95:
3428 case 96: 3915 case 96:
3429 case 97: 3916 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 3918 break;
3433 case 100: 3919 case 100:
3434 case 101: /* set bright bg color */ 3920 case 101: /* set bright bg color */
3435 case 102: 3921 case 102:
3436 case 103: 3922 case 103:
3437 case 104: 3923 case 104:
3438 case 105: 3924 case 105:
3439 case 106: 3925 case 106:
3440 case 107: 3926 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3927 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 3928 break;
3444#endif 3929#endif
3445
3446 } 3930 }
3447 } 3931 }
3448} 3932}
3449/*}}} */ 3933/*}}} */
3450 3934
3451/*{{{ process Rob Nation's own graphics mode sequences */ 3935/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 3936void
3453rxvt_term::process_graphics () 3937rxvt_term::process_graphics ()
3454{ 3938{
3455 unicode_t ch, cmd = cmd_getc (); 3939 unicode_t ch, cmd = cmd_getc ();
3456 3940
3457 if (cmd == 'Q') 3941 if (cmd == 'Q')
3458 { /* query graphics */ 3942 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 3943 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 3944 return;
3461 } 3945 }
3462 /* swallow other graphics sequences until terminating ':' */ 3946 /* swallow other graphics sequences until terminating ':' */
3463 do 3947 do
3464 ch = cmd_getc (); 3948 ch = cmd_getc ();
… …
3474 */ 3958 */
3475void 3959void
3476rxvt_term::tt_printf (const char *fmt,...) 3960rxvt_term::tt_printf (const char *fmt,...)
3477{ 3961{
3478 va_list arg_ptr; 3962 va_list arg_ptr;
3479 unsigned char buf[256]; 3963 char buf[256];
3480 3964
3481 va_start (arg_ptr, fmt); 3965 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3966 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 3967 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 3968 tt_write (buf, strlen (buf));
3485} 3969}
3486 3970
3487/* ---------------------------------------------------------------------- */ 3971/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 3972/* 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. 3973 * or generated by us in response to a query ESC sequence.
3490 */ 3974 */
3975const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3976
3491void 3977void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3978rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 3979{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3980 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3981 return;
3495 3982
3496 if (len) 3983 if (pty->pty < 0)
3984 return;
3985
3986 if (v_buflen == 0)
3987 {
3988 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3989
3990 if ((unsigned int)written == len)
3991 return;
3992
3993 data += written;
3994 len -= written;
3497 { 3995 }
3996
3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3998
3999 memcpy (v_buffer + v_buflen, data, len);
4000 v_buflen += len;
4001
4002 pty_ev.set (EVENT_READ | EVENT_WRITE);
4003}
4004
4005void rxvt_term::pty_write ()
4006{
4007 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4008
4009 if (written > 0)
4010 {
4011 v_buflen -= written;
4012
3498 if (v_buflen == 0) 4013 if (v_buflen == 0)
3499 { 4014 {
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); 4015 free (v_buffer);
3527 v_buffer = 0; 4016 v_buffer = 0;
3528 v_buflen = 0; 4017 v_buflen = 0;
3529 4018
3530 pty_ev.set (EVENT_READ); 4019 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; 4020 return;
3543 } 4021 }
4022
4023 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4024 }
4025 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4026 pty_ev.set (EVENT_READ);
3545} 4027}
3546 4028
3547/*----------------------- end-of-file (C source) -----------------------*/ 4029/*----------------------- end-of-file (C source) -----------------------*/
3548 4030

Diff Legend

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