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.328 by ayin, Mon Jun 11 17:40:15 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 ENABLE_OVERLAY
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 ENABLE_OVERLAY
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_End
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 ENABLE_OVERLAY
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 ENABLE_OVERLAY
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 TRANSPARENT
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_limit = 1;
1116 refresh_count = 0;
689 flush (); 1117 flush ();
690} 1118}
691 1119
692#ifdef CURSOR_BLINK 1120#ifdef CURSOR_BLINK
693void 1121void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1123{
696 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1125 want_refresh = 1;
698 1126
699 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1128}
701#endif 1129#endif
702 1130
703#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
704void 1132void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1139 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1140 }
713} 1141}
714#endif 1142#endif
715 1143
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void
1146rxvt_term::cont_scroll_cb (time_watcher &w)
1147{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1150 {
1151 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1153 }
1154}
1155#endif
1156
1157#ifdef SELECTION_SCROLLING
1158void
1159rxvt_term::sel_scroll_cb (time_watcher &w)
1160{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1166 }
1167}
1168#endif
1169
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void
1172rxvt_term::slip_wheel_cb (time_watcher &w)
1173{
1174 if (mouse_slip_wheel_speed == 0
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1183 }
1184}
1185#endif
1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
716bool 1212bool
717rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
718{ 1214{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1216
1217 if (CBUFSIZ == n)
1218 {
1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1220 n = 0;
1221 }
720 1222
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
724 1226
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1228
727 if (n > 0) 1229 if (r > 0)
728 { 1230 {
729 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
730 return true; 1232 return true;
731 } 1233 }
732 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
733 destroy (); 1246 destroy ();
1247 }
734 1248
735 return false; 1249 return false;
736} 1250}
737 1251
738void 1252void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1254{
741 SET_R (this); 1255 make_current ();
742 SET_LOCALE (locale); 1256
1257 if (revents & EVENT_READ)
1258 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ())
1260 if (cmd_parse ())
1261 break;
743 1262
744 if (revents & EVENT_WRITE) 1263 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1264 pty_write ();
746 else if (revents & EVENT_READ) 1265}
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 1266
760 if (cmd_parse ()) 1267void
761 break; 1268rxvt_term::pointer_unblank ()
762 } 1269{
763 } 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1271 recolour_cursor ();
1272
1273#ifdef POINTER_BLANK
1274 hidden_pointer = 0;
1275
1276 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay);
1278#endif
764} 1279}
765 1280
766#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
767void 1282void
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 () 1283rxvt_term::pointer_blank ()
781{ 1284{
782 if (! (Options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
783 return; 1286 return;
784 1287
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
786 XFlush (display->display); 1289 XFlush (dpy);
787 1290
788 hidden_pointer = 1; 1291 hidden_pointer = 1;
789} 1292}
790 1293
791void 1294void
792rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
793{ 1296{
794 SET_R (this); 1297 make_current ();
795 SET_LOCALE (locale);
796 1298
797 pointer_blank (); 1299 pointer_blank ();
798} 1300}
799#endif 1301#endif
800 1302
… …
807 x = ev.x; 1309 x = ev.x;
808 y = ev.y; 1310 y = ev.y;
809 pixel_position (&x, &y); 1311 pixel_position (&x, &y);
810 1312
811 if (MEvent.button == AnyButton) 1313 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1314 button_number = 3;
814 }
815 else 1315 else
816 { 1316 {
817 button_number = MEvent.button - Button1; 1317 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1318 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1319 if (button_number >= 3)
820 button_number += (64 - 3); 1320 button_number += (64 - 3);
821 } 1321 }
822 1322
823 if (PrivateModes & PrivMode_MouseX10) 1323 if (priv_modes & PrivMode_MouseX10)
824 { 1324 {
825 /* 1325 /*
826 * do not report ButtonRelease 1326 * do not report ButtonRelease
827 * no state info allowed 1327 * no state info allowed
828 */ 1328 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1343 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1344 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1345#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1346 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1347#endif
848
849 } 1348 }
850 1349
851#ifdef DEBUG_MOUSEREPORT 1350#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1351 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1352 if (key_state & 16)
854 fputc ('C', stderr); 1353 fputc ('C', stderr);
855 if (key_state & 4) 1354 if (key_state & 4)
856 fputc ('S', stderr); 1355 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1359 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1360 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1361 button_number,
863 x + 1, 1362 x + 1,
864 y + 1); 1363 y + 1);
865#else 1364#endif
1365
866 tt_printf ("\033[M%c%c%c", 1366 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
868 (32 + x + 1), 1368 (32 + x + 1),
869 (32 + y + 1)); 1369 (32 + y + 1));
870#endif
871} 1370}
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 1371
883/*{{{ process an X event */ 1372/*{{{ process an X event */
884void 1373void
885rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
886{ 1375{
887 SET_R (this); 1376 make_current ();
888 SET_LOCALE (locale);
889 1377
890#if defined(CURSOR_BLINK) 1378 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 1379
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
900 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1382 && 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; 1383 return;
920#endif
921 1384
1385 // for XQueryPointer
922 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1388 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 1389
975 switch (ev.type) 1390 switch (ev.type)
976 { 1391 {
977 case KeyPress: 1392 case KeyPress:
978 lookup_key (ev.xkey); 1393 key_press (ev.xkey);
979 break; 1394 break;
980 1395
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1396 case KeyRelease:
983 { 1397 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; 1398 break;
995 }
996#endif
997 1399
998 case ButtonPress: 1400 case ButtonPress:
999 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1000 break; 1402 break;
1001 1403
… …
1003 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1004 break; 1406 break;
1005 1407
1006 case ClientMessage: 1408 case ClientMessage:
1007 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !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 { 1411 {
1017 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1413 {
1019 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1415 {
1021 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1417 {
1023 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1419 destroy ();
1025 0L, 1000000L, 1420 }
1026 False, AnyPropertyType, 1421#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1425 &ev);
1030 XChangeProperty (display->display, display->root, 1426#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1427 }
1032 8, PropModeReplace, 1428 }
1033 data, STRLEN (data)); 1429#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1437#endif
1036 } 1438 }
1037#endif /* OFFIX_DND */
1038 break; 1439 break;
1039 1440
1040 case MappingNotify: 1441 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1443 break;
1043 1444
1044 /* 1445 /*
1045 * XXX: this is not the _current_ arrangement 1446 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1447 * Here's my conclusion:
… …
1065 break; 1466 break;
1066 } 1467 }
1067 break; 1468 break;
1068 1469
1069 case FocusIn: 1470 case FocusIn:
1070 if (!TermWin.focus) 1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1481 focus_out ();
1482 break;
1483
1484 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0])
1071 { 1486 {
1072 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1488 ;
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 1489
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 {
1492 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 }
1502
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1083 } 1509 }
1084 break; 1510 break;
1085 1511
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: 1512 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1106 { 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1107 int height, width; 1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1517
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; 1518 break;
1139 1519
1140 case SelectionClear: 1520 case SelectionClear:
1141 selection_clear (); 1521 selection_clear ();
1142 break; 1522 break;
1143 1523
1144 case SelectionNotify: 1524 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1525 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1527 break;
1149 1528
1150 case SelectionRequest: 1529 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1152 break; 1531 break;
1153 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1154 case UnmapNotify: 1541 case UnmapNotify:
1155 TermWin.mapped = 0; 1542 mapped = 0;
1156#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1158#endif 1545#endif
1159 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1160
1161 case MapNotify:
1162 TermWin.mapped = 1;
1163#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif
1166 break; 1547 break;
1167 1548
1168#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1169 case ReparentNotify: 1550 case ReparentNotify:
1170 rootwin_cb (ev); 1551 rootwin_cb (ev);
1171 break; 1552 break;
1172#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1173 1554
1174 case GraphicsExpose: 1555 case GraphicsExpose:
1175 case Expose: 1556 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1177 { 1558 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1559 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1563
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1569
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1570 want_refresh = 1;
1189 } 1571 }
1190 else 1572 else
1191 { 1573 {
1192 XEvent unused_event; 1574 XEvent unused_event;
1193 1575
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1195 Expose, 1577 ;
1196 &unused_event)) ; 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1579 ;
1198 GraphicsExpose, 1580
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1201 { 1582 {
1202 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1203 scrollbar_show (0); 1584 scrollbar_show (0);
1204 } 1585 }
1205#ifdef MENUBAR 1586
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1587#ifdef TRANSPARENT
1207 menubar_expose (); 1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1208#endif 1590#endif
1209 } 1591 }
1210 break; 1592 break;
1211 1593
1212 case MotionNotify: 1594 case MotionNotify:
1213#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1596 if (hidden_pointer)
1215 pointer_unblank (); 1597 pointer_unblank ();
1216#endif 1598#endif
1217#if MENUBAR 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1218 if (isMenuBarWindow (ev.xany.window)) 1600 break;
1601
1602 if (ev.xany.window == vt)
1219 { 1603 {
1220 menubar_control (ev.xbutton); 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1606 ; // 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))) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1608 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1232 ; 1610 ;
1233 1611
1234 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (dpy, vt,
1235 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1615 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1616 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1618 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1619 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1620 {
1243#endif 1621#endif
1622#if ISO_14755
1623 // 5.4
1624 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1625 {
1626 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1627 break;
1628 }
1629#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1632
1246#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1636 {
1250 int dist; 1637 int dist;
1251
1252 pending_scroll_selection=1;
1253 1638
1254 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
1256 */ 1641 */
1257 if (scroll_selection_delay<=0) 1642 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1644
1260 /* save the event params so we can highlight 1645 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1646 * the selection in the pending-scroll loop
1262 */ 1647 */
1263 selection_save_x=ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1651
1268 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1270 { 1654 {
1271 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1273 } 1657 }
1274 else 1658 else
1275 { 1659 {
1276 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1661 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1662 }
1663
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1664 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1;
1282 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1284 } 1669 }
1285 else 1670 else
1286 { 1671 {
1287 /* we are within the text window, so we 1672 /* we are within the text window, so we
1288 * shouldn't be scrolling 1673 * shouldn't be scrolling
1289 */ 1674 */
1290 pending_scroll_selection = 0; 1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop();
1291 } 1677 }
1292#endif 1678#endif
1293#ifdef MOUSE_THRESHOLD 1679#ifdef MOUSE_THRESHOLD
1294
1295 } 1680 }
1296#endif 1681#endif
1297
1298 } 1682 }
1299 } 1683 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1685 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1303 MotionNotify, &ev)) ; 1687 MotionNotify, &ev))
1688 ;
1689
1304 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1305 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1693 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1694 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1696 scrollbar_size ());
1311 scr_refresh (refresh_type); 1697 want_refresh = 1;
1312 refresh_limit = 0; 1698 refresh_limit = 0;
1313 scrollbar_show (1); 1699 scrollbar_show (1);
1314 } 1700 }
1315 break; 1701 break;
1316 } 1702 }
1317}
1318 1703
1704#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1706 {
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif
1716
1717#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 {
1720 if (ev.type == MotionNotify
1721 || ev.type == ButtonPress
1722 || ev.type == ButtonRelease)
1723 if (hidden_pointer)
1724 pointer_unblank ();
1725
1726 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank ();
1728 }
1729#endif
1730}
1731
1732void
1733rxvt_term::focus_in ()
1734{
1735 if (!focus)
1736 {
1737 focus = 1;
1738 want_refresh = 1;
1739
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM
1743 if (Input_Context != NULL)
1744 {
1745 IMSetPosition ();
1746 XSetICFocus (Input_Context);
1747 }
1748#endif
1749#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1752#endif
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 pix_colors = pix_colors_focused;
1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif
1773 }
1774}
1775
1776void
1777rxvt_term::focus_out ()
1778{
1779 if (focus)
1780 {
1781 focus = 0;
1782 want_refresh = 1;
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785
1786#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf)
1788 {
1789 iso14755buf = 0;
1790# if ENABLE_OVERLAY
1791 scr_overlay_off ();
1792# endif
1793 }
1794#endif
1795#if USE_XIM
1796 if (Input_Context != NULL)
1797 XUnsetICFocus (Input_Context);
1798#endif
1799#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop ();
1802 hidden_cursor = 0;
1803#endif
1804#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade])
1806 {
1807 pix_colors = pix_colors_unfocused;
1808 scr_recolour ();
1809 }
1810#endif
1811 }
1812}
1813
1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1319void 1828void
1320rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1830{
1322 SET_R (this); 1831 make_current ();
1323 SET_LOCALE (locale);
1324 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1325 switch (ev.type) 1838 switch (ev.type)
1326 { 1839 {
1327 case PropertyNotify: 1840 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 /* 1841 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1842 * 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. 1843 * use the property to determine the pixmap. We use it later on.
1340 */ 1844 */
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]) 1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1847 return;
1346 }
1347 1848
1348 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1349 case ReparentNotify: 1850 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ())
1351 if (am_transparent) 1851 if (option (Opt_transparent))
1352 want_full_refresh = 1; 1852 check_our_parents ();
1353 break; 1853 break;
1854 }
1354#endif 1855# endif
1355 }
1356} 1856}
1857#endif
1357 1858
1358void 1859void
1359rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1360{ 1861{
1361 int reportmode = 0, clickintime; 1862 int reportmode = 0, clickintime;
1362 1863
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1864 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1865
1364 if (!bypass_keystate) 1866 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1867 reportmode = !! (priv_modes & PrivMode_mouse_report);
1868
1366 /* 1869 /*
1367 * VT window processing of button press 1870 * VT window processing of button press
1368 */ 1871 */
1369 if (ev.window == TermWin.vt) 1872 if (ev.window == vt)
1370 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1877#if ISO_14755
1878 // 5.4
1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1880 {
1881 iso14755_54 (ev.x, ev.y);
1882 return;
1883 }
1884#endif
1885
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1886 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1887
1372 if (reportmode) 1888 if (reportmode)
1373 { 1889 {
1374 /* mouse report from vt window */ 1890 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1379 { 1895 {
1380 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1381 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1382 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1383 { 1900 {
1384 /* only report double clicks */ 1901 /* only report double clicks */
1385 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1386 mouse_report (ev); 1903 mouse_report (ev);
… …
1405 } 1922 }
1406 else 1923 else
1407 { 1924 {
1408 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1927
1410 switch (ev.button) 1928 switch (ev.button)
1411 { 1929 {
1412 case Button1: 1930 case Button1:
1931 /* allow meta + click to select rectangular areas */
1932 /* should be done in screen.C */
1933#if ENABLE_FRILLS
1934 selection.rect = !!(ev.state & ModMetaMask);
1935#else
1936 selection.rect = false;
1937#endif
1938
1413 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1941 {
1416 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1418 else 1944 else
1419 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1960 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1437 else 1963 else
1438 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1965
1439 MEvent.button = Button3; 1966 MEvent.button = Button3;
1440 break; 1967 break;
1441 } 1968 }
1442 } 1969 }
1970
1443 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1444 return; 1972 return;
1445 } 1973 }
1446 1974
1447 /* 1975 /*
… …
1513 upordown = 1; /* down */ 2041 upordown = 1; /* down */
1514 } 2042 }
1515 if (upordown) 2043 if (upordown)
1516 { 2044 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 2047#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2048 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 2049 {
1522 if (upordown < 0) 2050 if (upordown < 0)
1523 scrollBar.setUp (); 2051 scrollBar.setUp ();
… …
1539 break; 2067 break;
1540 case R_SB_ALIGN_BOTTOM: 2068 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2069 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2070 break;
1543 } 2071 }
2072
1544 if (scrollBar.style == R_SB_XTERM 2073 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2074 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2075 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2077
1549 scrollBar.setMotion (); 2078 scrollBar.setMotion ();
1550 break; 2079 break;
1551 2080
1552 case Button1: 2081 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2082 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2086 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != R_SB_XTERM)
1559 { 2088 {
1560 if (scrollbar_above_slider (ev.y)) 2089 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2091 scr_page (UP, nrow - 1);
1563# else 2092# else
1564 scr_page (UP, TermWin.nrow / 4); 2093 scr_page (UP, nrow / 4);
1565# endif 2094# endif
1566 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2097 scr_page (DN, nrow - 1);
1569# else 2098# else
1570 scr_page (DN, TermWin.nrow / 4); 2099 scr_page (DN, nrow / 4);
1571# endif 2100# endif
1572 else 2101 else
1573 scrollBar.setMotion (); 2102 scrollBar.setMotion ();
1574 } 2103 }
1575 else 2104 else
1576 { 2105 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2107 (nrow
1579 * scrollbar_position (ev.y) 2108 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2109 / scrollbar_size ()));
1581 } 2110 }
2111
1582 break; 2112 break;
1583 } 2113 }
1584 } 2114 }
2115
1585 return; 2116 return;
1586 } 2117 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2118}
1595 2119
1596void 2120void
1597rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
1598{ 2122{
1599 int reportmode = 0; 2123 int reportmode = 0;
1600 2124
1601 csrO = 0; /* reset csr Offset */ 2125 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2126 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2127 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2128
1605 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
1606 { 2130 {
1607 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
1608 scrollbar_show (0); 2132 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2133 }
2134
1614#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop();
1616#endif 2138#endif
2139
1617 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1618 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2145#if ISO_14755
2146 // 5.4
2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2148 return;
2149#endif
2150
1619 if (reportmode) 2151 if (reportmode)
1620 { 2152 {
1621 /* mouse report from vt window */ 2153 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
1638 mouse_report (ev); 2170 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2172 return;
1641 } 2173 }
2174
1642 /* 2175 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2177 * when overriding mouse reporting
1645 */ 2178 */
1646 if (PrivateModes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2180 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
1650 2183
1651 switch (ev.button) 2184 switch (ev.button)
1652 { 2185 {
1653 case Button1: 2186 case Button1:
1654 case Button3: 2187 case Button3:
1655 selection_make (ev.time); 2188 selection_make (ev.time);
1656 break; 2189 break;
2190
1657 case Button2: 2191 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2194 break;
2195
1660#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
1661 case Button4: 2197 case Button4:
1662 case Button5: 2198 case Button5:
1663 { 2199 {
1664 int i; 2200 int i;
1665 page_dirn v; 2201 page_dirn v;
1666 2202
1667 v = (ev.button == Button4) ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2204
1668 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
1669 i = 1; 2206 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2208 i = nrow - 1;
1672 else 2209 else
1673 i = 5; 2210 i = 5;
2211
1674# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
1676 { 2214 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218
2219 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2221
2222 slip_wheel_ev.start ();
2223 }
2224 else
2225 {
2226# endif
2227 scr_page (v, i);
2228 scrollbar_show (1);
2229# ifdef MOUSE_SLIP_WHEELING
1679 } 2230 }
1680# endif 2231# 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 } 2232 }
1695 break; 2233 break;
1696#endif 2234#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 { 2235 }
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 { 2236 }
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} 2237}
1918#endif
1919 2238
1920/*}}} */ 2239/*}}} */
1921 2240
1922bool 2241bool
1923rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
1924{ 2243{
1925 bool flag = false; 2244 bool flag = false;
1926 unicode_t ch = NOCHAR; 2245 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2246 char *seq_begin; // remember start of esc-sequence here
1928 2247
1929 for (;;) 2248 for (;;)
1930 { 2249 {
1931 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
1932 { 2251 {
1933 seq_begin = cmdbuf_ptr; 2252 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2253 ch = next_char ();
1935 }
1936 2254
1937 if (ch == NOCHAR) // TODO: improve 2255 if (ch == NOCHAR)
1938 break; 2256 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2257 }
2258
2259 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2260 {
2261 if (!seen_input)
2262 {
2263 seen_input = 1;
2264 // many badly-written programs (e.g. jed) contain a race condition:
2265 // they first read the screensize and then install a SIGWINCH handler.
2266 // some window managers resize the window early, and these programs
2267 // then sometimes get the size wrong.
2268 // unfortunately other programs are even more buggy and dislike
2269 // being sent SIGWINCH, so only do it when we were in fact being
2270 // resized.
2271 if (seen_resize && cmd_pid)
2272 kill (-cmd_pid, SIGWINCH);
2273 }
2274
1942 /* Read a text string from the input buffer */ 2275 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2276 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2277 bool refreshnow = false;
1945 int nlines = 0; 2278 int nlines = 0;
1946 unicode_t *str = buf; 2279 wchar_t *str = buf;
1947 2280 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2281
1950 for (;;) 2282 for (;;)
1951 { 2283 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2284 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2285 break;
1957 2286
1958 *str++ = ch; 2287 *str++ = ch;
1959 2288
1960 if (ch == '\n') 2289 if (ch == C0_LF || str >= eol)
1961 { 2290 {
2291 if (ch == C0_LF)
1962 nlines++; 2292 nlines++;
2293
1963 refresh_count++; 2294 refresh_count++;
1964 2295
1965 if (! (Options & Opt_jumpScroll) 2296 if (!option (Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2297 || (refresh_count >= refresh_limit * (nrow - 1)))
1967 { 2298 {
1968 refreshnow = true; 2299 refreshnow = true;
1969 flag = true; 2300 refresh_count = 0;
1970 ch = NOCHAR; 2301 ch = NOCHAR;
1971 break; 2302 break;
1972 } 2303 }
1973 2304
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2305 // scr_add_lines only works for nlines <= nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2306 if (nlines >= nrow - 1)
1976 { 2307 {
2308 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2309 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1977 scr_add_lines (buf, nlines, str - buf); 2310 scr_add_lines (buf, str - buf, nlines);
2311
1978 nlines = 0; 2312 nlines = 0;
1979 str = buf; 2313 str = buf;
2314 eol = str + min (ncol, UBUFSIZ);
1980 } 2315 }
2316
2317 if (str >= eol)
2318 {
2319 if (eol >= buf + UBUFSIZ)
2320 {
2321 ch = NOCHAR;
2322 break;
2323 }
2324 else
2325 eol = min (eol + ncol, buf + UBUFSIZ);
2326 }
2327
1981 } 2328 }
1982 2329
1983 if (str >= buf + UBUFSIZ) 2330 seq_begin = cmdbuf_ptr;
1984 { 2331 ch = next_char ();
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2332 }
1989 2333
2334 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2336 scr_add_lines (buf, str - buf, nlines);
1991 2337
1992 /* 2338 /*
1993 * If there have been a lot of new lines, then update the screen 2339 * 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. 2340 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2341 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2342 * 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 */ 2343 */
2001 if (refreshnow) 2344 if (refreshnow)
2002 { 2345 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2347 refresh_limit++;
2005 2348 else
2349 {
2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2006 scr_refresh (refresh_type); 2352 scr_refresh ();
2353 want_refresh = 1;
2354 }
2007 } 2355 }
2008 2356
2009 } 2357 }
2010 else 2358 else
2011 { 2359 {
… …
2026 2374
2027 return flag; 2375 return flag;
2028} 2376}
2029 2377
2030// read the next character 2378// read the next character
2031unicode_t 2379wchar_t
2032rxvt_term::next_char () 2380rxvt_term::next_char () NOTHROW
2033{ 2381{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2383 {
2036 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2039 2387
2040 wchar_t wc; 2388 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2390
2043 if (len == (size_t)-2) 2391 if (len == (size_t)-2)
2044 { 2392 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2393 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2394 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2395 break;
2048 } 2396 }
2049 2397
2050 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2399 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2400
2053 // assume wchar == unicode 2401 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2402 cmdbuf_ptr += len;
2055 return wc; 2403 return wc & UNICODE_MASK;
2056 } 2404 }
2057 2405
2058 return NOCHAR; 2406 return NOCHAR;
2059} 2407}
2408
2409// read the next octet
2410uint32_t
2411rxvt_term::next_octet () NOTHROW
2412{
2413 return cmdbuf_ptr < cmdbuf_endp
2414 ? (unsigned char)*cmdbuf_ptr++
2415 : NOCHAR;
2416}
2417
2418static class out_of_input out_of_input;
2060 2419
2061/* rxvt_cmd_getc () - Return next input character */ 2420/* rxvt_cmd_getc () - Return next input character */
2062/* 2421/*
2063 * Return the next input character after first passing any keyboard input 2422 * Return the next input character after first passing any keyboard input
2064 * to the command. 2423 * to the command.
2065 */ 2424 */
2066unicode_t 2425wchar_t
2067rxvt_term::cmd_getc () 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2427{
2069 unicode_t c = next_char (); 2428 wchar_t c = next_char ();
2429
2430 if (c == NOCHAR)
2431 throw out_of_input;
2432
2433 return c;
2434}
2435
2436uint32_t
2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2438{
2439 uint32_t c = next_octet ();
2070 2440
2071 if (c == NOCHAR) 2441 if (c == NOCHAR)
2072 throw out_of_input; 2442 throw out_of_input;
2073 2443
2074 return c; 2444 return c;
… …
2156/*}}} */ 2526/*}}} */
2157 2527
2158/* *INDENT-OFF* */ 2528/* *INDENT-OFF* */
2159enum { 2529enum {
2160 C1_40 = 0x40, 2530 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2531 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2532 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2533 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2534 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2535};
2166/* *INDENT-ON* */ 2536/* *INDENT-ON* */
2167 2537
2168/*{{{ process non-printing single characters */ 2538/*{{{ process non-printing single characters */
2169void 2539void
… …
2174 case C0_ESC: 2544 case C0_ESC:
2175 process_escape_seq (); 2545 process_escape_seq ();
2176 break; 2546 break;
2177 case C0_ENQ: /* terminal Status */ 2547 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2548 if (rs[Rs_answerbackstring])
2179 tt_write ( 2549 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 2550 else
2183 tt_write ((unsigned char *)VT100_ANS, 2551 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2552 break;
2186 case C0_BEL: /* bell */ 2553 case C0_BEL: /* bell */
2187 scr_bell (); 2554 scr_bell ();
2188 break; 2555 break;
2189 case C0_BS: /* backspace */ 2556 case C0_BS: /* backspace */
… …
2205 break; 2572 break;
2206 case C0_SI: /* shift in - acs */ 2573 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2574 scr_charset_choose (0);
2208 break; 2575 break;
2209 2576
2577#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2578 // 8-bit controls
2211 case 0x90: /* DCS */ 2579 case 0x90: /* DCS */
2212 process_dcs_seq (); 2580 process_dcs_seq ();
2213 break; 2581 break;
2214 case 0x9b: /* CSI */ 2582 case 0x9b: /* CSI */
2215 process_csi_seq (); 2583 process_csi_seq ();
2216 break; 2584 break;
2217 case 0x9d: /* CSI */ 2585 case 0x9d: /* CSI */
2218 process_osc_seq (); 2586 process_osc_seq ();
2219 break; 2587 break;
2588#endif
2220 } 2589 }
2221} 2590}
2222/*}}} */ 2591/*}}} */
2223 2592
2224 2593
… …
2286void 2655void
2287rxvt_term::process_escape_seq () 2656rxvt_term::process_escape_seq ()
2288{ 2657{
2289 unicode_t ch = cmd_getc (); 2658 unicode_t ch = cmd_getc ();
2290 2659
2291 if (PrivateModes & PrivMode_vt52) 2660 if (priv_modes & PrivMode_vt52)
2292 { 2661 {
2293 process_escape_vt52 (ch); 2662 process_escape_vt52 (ch);
2294 return; 2663 return;
2295 } 2664 }
2296 2665
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2680 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2681 break;
2313 case '+': 2682 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2683 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2684 break;
2316#ifndef NO_FRILLS 2685#if !ENABLE_MINIMAL
2317 case '6': 2686 case '6':
2318 scr_backindex (); 2687 scr_backindex ();
2319 break; 2688 break;
2320#endif 2689#endif
2321 case '7': 2690 case '7':
2322 scr_cursor (SAVE); 2691 scr_cursor (SAVE);
2323 break; 2692 break;
2324 case '8': 2693 case '8':
2325 scr_cursor (RESTORE); 2694 scr_cursor (RESTORE);
2326 break; 2695 break;
2327#ifndef NO_FRILLS 2696#if !ENABLE_MINIMAL
2328 case '9': 2697 case '9':
2329 scr_forwardindex (); 2698 scr_forwardindex ();
2330 break; 2699 break;
2331#endif 2700#endif
2332 case '=': 2701 case '=':
… …
2342 break; 2711 break;
2343 2712
2344 /* 8.3.87: NEXT LINE */ 2713 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2714 case C1_NEL: /* ESC E */
2346 { 2715 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2716 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2717 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 2718 }
2350 break; 2719 break;
2351 2720
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2721 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 2722 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 2732 case C1_RI: /* ESC M */
2364 scr_index (DN); 2733 scr_index (DN);
2365 break; 2734 break;
2366 2735
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2736 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2737 /*case C1_SS2: scr_single_shift (2); break; */
2369 2738
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2739 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2740 /*case C1_SS3: scr_single_shift (3); break; */
2372 2741
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2742 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2743 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2744 process_dcs_seq ();
2376 break; 2745 break;
2377 2746
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 2748 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 2750 break; /* steal obsolete ESC [ c */
2383 2751
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 2753 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 2754 process_csi_seq ();
… …
2391 process_osc_seq (); 2759 process_osc_seq ();
2392 break; 2760 break;
2393 2761
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2762 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 2763 case 'c':
2764 mbstate.reset ();
2396 scr_poweron (); 2765 scr_poweron ();
2397 scrollbar_show (1); 2766 scrollbar_show (1);
2398 break; 2767 break;
2399 2768
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2769 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 2781
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2782/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2783/* *INDENT-OFF* */
2415enum { 2784enum {
2416 CSI_ICH = 0x40, 2785 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2786 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 , 2787 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, 2788 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, 2789 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, 2790 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, 2791 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, */ 2806 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, [, \, ], ^, _, */ 2807 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, */ 2808 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, */ 2809 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, */ 2810 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, {, |, }, ~, */ 2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2812 };
2444/* *INDENT-ON* */ 2813/* *INDENT-ON* */
2445 2814
2446void 2815void
2447rxvt_term::process_csi_seq () 2816rxvt_term::process_csi_seq ()
… …
2494 ndef = get_byte_array_bit (csi_defaults, i); 2863 ndef = get_byte_array_bit (csi_defaults, i);
2495 for (p = 0; p < nargs; p++) 2864 for (p = 0; p < nargs; p++)
2496 if (arg[p] == -1) 2865 if (arg[p] == -1)
2497 arg[p] = ndef; 2866 arg[p] = ndef;
2498 2867
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 /* 2868 /*
2507 * private mode handling 2869 * private mode handling
2508 */ 2870 */
2509 if (priv) 2871 if (priv)
2510 { 2872 {
2511 switch (priv) 2873 switch (priv)
2512 { 2874 {
2513 case '>': 2875 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 2876 if (ch == CSI_DA) /* secondary device attributes */
2877 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2883 // that we do not support xterm mouse reporting (should be 95 when we do).
2884 //
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2885 tt_printf ("\033[>%d;94;0c", 'U');
2886 }
2516 break; 2887 break;
2517 case '?': 2888 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 2890 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 2891 break;
… …
2625 2996
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2997 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 2998 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 2999 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3000 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3001 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3002 break;
2632 3003
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3004 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3005 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3006 break;
2637 3007
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3008 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3009 process_sgr_mode (nargs, arg);
2640 break; 3010 break;
… …
2646 tt_printf ("\033[0n"); 3016 tt_printf ("\033[0n");
2647 break; 3017 break;
2648 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
2649 scr_report_position (); 3019 scr_report_position ();
2650 break; 3020 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3022 if (option (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3024 break;
2655#endif
2656 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3027 break;
2659 } 3028 }
2660 break; 3029 break;
2661 3030
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3031 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3064 break;
2696 3065
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3066 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3067 if (arg[0] == 4)
2699 scr_insert_mode (0); 3068 scr_insert_mode (0);
3069 else if (arg[0] == 20)
3070 priv_modes &= ~PrivMode_LFNL;
2700 break; 3071 break;
2701 3072
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3073 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3074 if (arg[0] == 4)
2704 scr_insert_mode (1); 3075 scr_insert_mode (1);
3076 else if (arg[0] == 20)
3077 priv_modes |= PrivMode_LFNL;
2705 break; 3078 break;
2706 3079
2707 /* 3080 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3081 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3082 */
… …
2721 break; 3094 break;
2722 case CSI_75: 3095 case CSI_75:
2723 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
2724 break; 3097 break;
2725 3098
2726#ifndef NO_FRILLS 3099#if !ENABLE_MINIMAL
2727 case CSI_74: 3100 case CSI_74:
2728 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
2729 break; 3102 break;
2730#endif 3103#endif
2731 3104
… …
2738 break; 3111 break;
2739 } 3112 }
2740} 3113}
2741/*}}} */ 3114/*}}} */
2742 3115
2743#ifndef NO_FRILLS 3116#if !ENABLE_MINIMAL
2744/* ARGSUSED */ 3117/* ARGSUSED */
2745void 3118void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3120{
2748 int x, y; 3121 int x, y;
2749 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
2750 Window wdummy; 3123 Window wdummy;
3124
3125 dLocal (Display *, dpy);
2751 3126
2752 if (nargs == 0) 3127 if (nargs == 0)
2753 return; 3128 return;
2754 3129
2755 switch (args[0]) 3130 switch (args[0])
2756 { 3131 {
2757 /* 3132 /*
2758 * commands 3133 * commands
2759 */ 3134 */
2760 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3136 XMapWindow (dpy, parent[0]);
2762 break; 3137 break;
2763 case 2: /* iconify window */ 3138 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3139 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3140 break;
2767 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3143 break;
2770 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3146 break;
2773 case 5: /* raise window */ 3147 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3148 XRaiseWindow (dpy, parent[0]);
2775 break; 3149 break;
2776 case 6: /* lower window */ 3150 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3151 XLowerWindow (dpy, parent[0]);
2778 break; 3152 break;
2779 case 7: /* refresh window */ 3153 case 7: /* refresh window */
2780 scr_touch (true); 3154 scr_touch (true);
2781 break; 3155 break;
2782 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3157 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3158 (unsigned int) (args[1] * fheight));
2785 break; 3159 break;
2786 3160
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3162 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3164 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3165 (unsigned int) (args[1] * fheight));
2792 break; 3166 break;
2793
2794 3167
2795 /* 3168 /*
2796 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
2797 */ 3170 */
2798 case 11: /* report window state */ 3171 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3174 break;
2802 case 13: /* report window position */ 3175 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3181 break;
2809 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3185 break;
2813 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3188 break;
2816 case 19: /* report window size (chars) */ 3189 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3191 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3193 {
3194 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3195 XGetIconName (dpy, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3197 XFree (s);
3198 }
2823 break; 3199 break;
2824 case 21: /* report window title */ 3200 case 21: /* report window title */
3201 {
3202 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3203 XFetchName (dpy, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3205 XFree (s);
3206 }
2827 break; 3207 break;
2828#endif
2829 } 3208 }
2830} 3209}
2831#endif 3210#endif
2832 3211
2833/*----------------------------------------------------------------------*/ 3212/*----------------------------------------------------------------------*/
2834/* 3213/*
2835 * get input up until STRING TERMINATOR (or BEL) 3214 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3215 * ends_how is terminator used. returned input must be free()'d
2837 */ 3216 */
2838unsigned char * 3217char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3218rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3219{
2841 int seen_esc = 0; /* seen escape? */ 3220 unicode_t ch;
3221 bool seen_esc = false;
2842 unsigned int n = 0; 3222 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3223 wchar_t string[STRING_MAX];
2846 3224
2847 while ((ch = cmd_getc ())) 3225 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3226 {
2849 if (ch == C0_BEL 3227 if (seen_esc)
2850 || ch == CHAR_ST 3228 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3229 if (ch == 0x5c) /* 7bit ST */
2852 break; 3230 break;
2853 3231 else
3232 return NULL;
3233 }
2854 if (ch == C0_ESC) 3234 else if (ch == C0_ESC)
2855 { 3235 {
2856 seen_esc = 1; 3236 seen_esc = true;
2857 continue; 3237 continue;
2858 } 3238 }
3239 else if (ch == C0_BEL || ch == CHAR_ST)
3240 break;
2859 else if (ch == '\t') 3241 else if (ch == C0_SYN)
2860 ch = ' '; /* translate '\t' to space */ 3242 ch = cmd_get8 ();
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3243 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
2863 3245
2864 if (n < sizeof (string) - 1) 3246 seen_esc = false;
3247
3248 if (n >= STRING_MAX - 1)
3249 // stop at some sane length
3250 return NULL;
3251
2865 string[n++] = ch; 3252 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3253 }
2869 3254
2870 string[n++] = '\0'; 3255 string[n++] = '\0';
2871 3256
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3257 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3258
2877 return s; 3259 return rxvt_wcstombs (string);
2878} 3260}
2879 3261
2880/*----------------------------------------------------------------------*/ 3262/*----------------------------------------------------------------------*/
2881/* 3263/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3265 */
2884void 3266void
2885rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
2886{ 3268{
2887 unsigned char *s; 3269 char *s;
2888 unicode_t eh; 3270 unicode_t eh;
2889 3271
2890 /* 3272 /*
2891 * Not handled yet 3273 * Not handled yet
2892 */ 3274 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3293 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3294 arg = arg * 10 + (ch - '0');
2913 3295
2914 if (ch == ';') 3296 if (ch == ';')
2915 { 3297 {
2916 unsigned char *s = get_to_st (eh); 3298 char *s = get_to_st (eh);
2917 3299
2918 if (s) 3300 if (s)
2919 { 3301 {
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); 3302 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3303 free (s);
2934 } 3304 }
2935 } 3305 }
2936} 3306}
3307
3308void
3309rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3310{
3311 if (str[0] == '?' && !str[1])
3312 {
3313 rgba c;
3314 pix_colors_focused[color].get (c);
3315
3316#if XFT
3317 if (c.a != rgba::MAX_CC)
3318 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3319 else
3320#endif
3321 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3322 }
3323 else
3324 set_window_color (color, str);
3325}
3326
2937/* 3327/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3328 * 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 */ 3329 */
2960void 3330void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3331rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3332{
2963 int changed = 0;
2964 int color; 3333 int color;
2965 char *buf, *name; 3334 char *buf, *name;
3335 bool query = str[0] == '?' && !str[1];
3336 int saveop = op;
3337
3338 dLocal (Display *, dpy);
2966 3339
2967 assert (str != NULL); 3340 assert (str != NULL);
3341
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return;
3344
2968 switch (op) 3345 switch (op)
2969 { 3346 {
2970 case XTerm_name: 3347 case XTerm_name:
2971 set_title (str); 3348 set_title (str);
2972 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
… …
2974 set_icon_name (str); 3351 set_icon_name (str);
2975 break; 3352 break;
2976 case XTerm_title: 3353 case XTerm_title:
2977 set_title (str); 3354 set_title (str);
2978 break; 3355 break;
3356 case XTerm_property:
3357 if (str[0] == '?')
3358 {
3359 Atom prop = display->atom (str + 1);
3360 Atom actual_type;
3361 int actual_format;
3362 unsigned long nitems;
3363 unsigned long bytes_after;
3364 unsigned char *value = 0;
3365 const char *str = "";
3366
3367 if (prop
3368 && XGetWindowProperty (dpy, parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None
3373 && actual_format == 8)
3374 str = (const char *)(value);
3375
3376 tt_printf ("\033]%d;%s%c", op, str, resp);
3377
3378 XFree (value);
3379 }
3380 else
3381 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383
3384 if (eq)
3385 {
3386 *eq = 0;
3387 set_utf8_property (display->atom (str), eq + 1);
3388 }
3389 else
3390 XDeleteProperty (dpy, parent[0],
3391 display->atom (str));
3392 }
3393 break;
3394
2979 case XTerm_Color: 3395 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3396 for (buf = (char *)str; buf && *buf;)
2981 { 3397 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3398 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3399 break;
2984 3400
2985 *name++ = '\0'; 3401 *name++ = '\0';
2986 color = atoi (buf); 3402 color = atoi (buf) + minCOLOR;
2987 3403
2988 if (color < 0 || color >= TOTAL_COLORS) 3404 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3405 break;
2990 3406
2991 if ((buf = STRCHR (name, ';')) != NULL) 3407 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3408 *buf++ = '\0';
2993 3409
2994 set_window_color (color + minCOLOR, name); 3410 process_color_seq (op, color, name, resp);
2995 } 3411 }
3412 break;
3413 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp);
3415 break;
3416 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp);
2996 break; 3418 break;
2997#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3421 process_color_seq (op, Color_cursor, str, resp);
3000 break; 3422 break;
3001#endif 3423#endif
3002 case XTerm_Color_pointer: 3424 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break;
3427 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp);
3004 break; 3429 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#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: 3431 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3432 process_color_seq (op, Color_RV, str, resp);
3014 break; 3433 break;
3434 case Rxvt_Color_BD:
3435 case URxvt_Color_BD:
3436 process_color_seq (op, Color_BD, str, resp);
3437 break;
3438 case Rxvt_Color_UL:
3439 case URxvt_Color_UL:
3440 process_color_seq (op, Color_UL, str, resp);
3441 break;
3442 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp);
3444 break;
3015#endif 3445#endif
3446#if TRANSPARENT && TINTING
3447 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp);
3016 3449
3017 case XTerm_Menu: 3450 check_our_parents ();
3451
3452 if (am_transparent)
3453 want_full_refresh = want_refresh = 1;
3454
3455 break;
3456#endif
3457
3458 case Rxvt_Pixmap:
3018 /* 3459 {
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break;
3023 case XTerm_Pixmap:
3024 if (*str != ';') 3460 if (*str != ';')
3025 { 3461 {
3026#if XPM_BACKGROUND 3462#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3463 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3464 set_bgPixmap (str); /* change pixmap */
3029#endif
3030 scr_touch (true); 3465 scr_touch (true);
3466#endif
3031 } 3467 }
3468
3469 int changed = 0;
3470
3032 while ((str = STRCHR (str, ';')) != NULL) 3471 while ((str = strchr (str, ';')) != NULL)
3033 { 3472 {
3034 str++; 3473 str++;
3035#if XPM_BACKGROUND 3474#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3475 changed += scale_pixmap (str);
3037#endif 3476#endif
3038
3039 } 3477 }
3478
3040 if (changed) 3479 if (changed)
3041 { 3480 {
3042#ifdef XPM_BACKGROUND 3481#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3482 resize_pixmap ();
3044#endif
3045 scr_touch (true); 3483 scr_touch (true);
3484#endif
3046 } 3485 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option(Opt_transparent))
3488 check_our_parents ();
3489#endif
3490
3491 }
3047 break; 3492 break;
3048 3493
3049 case XTerm_restoreFG: 3494 case Rxvt_restoreFG:
3050 set_window_color (Color_fg, str); 3495 set_window_color (Color_fg, str);
3051 break; 3496 break;
3052 case XTerm_restoreBG: 3497 case Rxvt_restoreBG:
3053 set_window_color (Color_bg, str); 3498 set_window_color (Color_bg, str);
3054 break; 3499 break;
3500
3055 case XTerm_logfile: 3501 case XTerm_logfile:
3056 // TODO, when secure mode? 3502 // TODO, when secure mode?
3057 break; 3503 break;
3058 case XTerm_font: 3504
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 3505#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3506 case Rxvt_dumpscreen: /* no error notices */
3082 { 3507 {
3083 int fd; 3508 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3509 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3510 {
3086 scr_dump (fd); 3511 scr_dump (fd);
3087 close (fd); 3512 close (fd);
3088 } 3513 }
3089 } 3514 }
3515 break;
3516#endif
3517 case XTerm_font:
3518 op = URxvt_font;
3519 case URxvt_font:
3520#if ENABLE_STYLES
3521 case URxvt_boldFont:
3522 case URxvt_italicFont:
3523 case URxvt_boldItalicFont:
3524#endif
3525 if (query)
3526 tt_printf ("\33]%d;%-.250s%c", saveop,
3527 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3528 ? fontset[op - URxvt_font]->fontdesc : "",
3529 resp);
3530 else
3531 {
3532 const char *&res = rs[Rs_font + (op - URxvt_font)];
3533
3534 res = strdup (str);
3535 allocated.push_back ((void *)res);
3536 set_fonts ();
3537 }
3538 break;
3539
3540 case URxvt_version:
3541 if (query)
3542 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3543 op,
3544 rs[Rs_name], VERSION[0], VERSION[2],
3545 resp);
3546 break;
3547
3548#if !ENABLE_MINIMAL
3549 case URxvt_locale:
3550 if (query)
3551 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3552 else
3553 {
3554 set_locale (str);
3555 pty->set_utf8_mode (enc_utf8);
3556 init_xlocale ();
3557 }
3558 break;
3559
3560 case URxvt_view_up:
3561 case URxvt_view_down:
3562 {
3563 int lines = atoi (str);
3564
3565 if (lines)
3566 scr_page (op == URxvt_view_up ? UP : DN, lines);
3567 else
3568 scr_erase_savelines ();
3569 }
3570
3571 break;
3572#endif
3573
3574#if ENABLE_PERL
3575 case URxvt_perl:
3576 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3577 ; // no responses yet
3090 break; 3578 break;
3091#endif 3579#endif
3092 } 3580 }
3093} 3581}
3094/*----------------------------------------------------------------------*/ 3582/*----------------------------------------------------------------------*/
… …
3108{ 3596{
3109 int state; 3597 int state;
3110 3598
3111 if (mode == 's') 3599 if (mode == 's')
3112 { 3600 {
3113 SavedModes |= (PrivateModes & bit); 3601 SavedModes |= (priv_modes & bit);
3114 return -1; 3602 return -1;
3115 } 3603 }
3116 else 3604 else
3117 { 3605 {
3118 if (mode == 'r') 3606 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3607 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3608 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3609 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3610 PrivMode (state, bit);
3123 } 3611 }
3124 3612
3125 return state; 3613 return state;
3126} 3614}
3127 3615
3128/* we're not using priv _yet_ */ 3616/* we're not using priv _yet_ */
3129void 3617void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3618rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 3619{
3132 unsigned int i, j; 3620 unsigned int i, j;
3133 int state; 3621 int state;
3134 3622
3135 static const struct 3623 static const struct
… …
3144 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap },
3637 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3639 // 18, 19 printing-related
3151 { menuBar_esc, PrivMode_menuBar }, 3640 { 25, PrivMode_VisibleCursor },
3152#endif
3153#ifdef scrollBar_esc 3641#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3642 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3643#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3644 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3645 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3646 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3647 // 45 margin bell NYI
3163 // 46 start logging 3648 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3664 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3667 };
3183 3668
3184 if (nargs == 0) 3669 if (nargs == 0)
3185 return; 3670 return;
… …
3203 } 3688 }
3204 3689
3205 /* extra handling for values with state unkept */ 3690 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3691 switch (arg[i])
3207 { 3692 {
3693#if ENABLE_STYLES
3694 case 1021:
3695 set_option (Opt_intensityStyles, mode);
3696
3697 scr_touch (true);
3698 break;
3699#endif
3208 case 1048: /* alternative cursor save */ 3700 case 1048: /* alternative cursor save */
3209 case 1049: 3701 case 1049:
3702 if (option (Opt_secondaryScreen))
3210 if (mode == 0) 3703 if (mode == 0)
3211 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
3212 else if (mode == 1) 3705 else if (mode == 1)
3213 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3707 break;
3215 } 3708 }
3216 3709
3217 if (state >= 0) 3710 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3711 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3712 switch (arg[i])
… …
3225 * within VT52 mode 3718 * within VT52 mode
3226 */ 3719 */
3227 PrivMode (1, PrivMode_vt52); 3720 PrivMode (1, PrivMode_vt52);
3228 break; 3721 break;
3229 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3724 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 3725 break;
3233 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
3234 if (state) 3727 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 3728 break;
3239 case 5: /* reverse video */ 3729 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 3730 scr_rvideo_mode (state);
3241 break; 3731 break;
3242 case 6: /* relative/absolute origins */ 3732 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 3733 scr_relative_origin (state);
3244 break; 3734 break;
3245 case 7: /* autowrap */ 3735 case 7: /* autowrap */
3246 scr_autowrap (state); 3736 scr_autowrap (state);
3247 break; 3737 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3738 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3739 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3741 priv_modes &= ~PrivMode_MouseX11;
3252 break; 3742 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 3743#ifdef scrollBar_esc
3261 case scrollBar_esc: 3744 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 3745 if (scrollbar_mapping (state))
3263 { 3746 {
3264 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
… …
3267 break; 3750 break;
3268#endif 3751#endif
3269 case 25: /* visible/invisible cursor */ 3752 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3753 scr_cursor_visible (state);
3271 break; 3754 break;
3272 /* case 35: - shift keys */ 3755 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3756 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3757 case 47: /* secondary screen */
3275 scr_change_screen (state); 3758 scr_change_screen (state);
3276 break; 3759 break;
3277 /* case 66: - application key pad */ 3760 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3761 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3762 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3763 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3764 priv_modes &= ~PrivMode_MouseX10;
3282 break; 3765 break;
3283#if 0 3766#if 0
3284 case 1001: 3767 case 1001:
3285 break; /* X11 mouse highlighting */ 3768 break; /* X11 mouse highlighting */
3286#endif 3769#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 3770 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 3771 set_option (Opt_scrollTtyOutput, !state);
3292 break; 3772 break;
3293 case 1011: /* scroll to bottom on key press */ 3773 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3774 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3775 break;
3299 case 1047: /* secondary screen w/ clearing */ 3776 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3777 if (option (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 3779 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 3780 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3781 break;
3782 case 1049: /* secondary screen w/ clearing first */
3783 scr_change_screen (state);
3784 if (option (Opt_secondaryScreen))
3785 if (current_screen != PRIMARY)
3786 scr_erase_screen (2);
3787 break;
3306 default: 3788 default:
3307 break; 3789 break;
3308 } 3790 }
3309 } 3791 }
3310} 3792}
… …
3333 rendset = 0, rendstyle = ~RS_None; 3815 rendset = 0, rendstyle = ~RS_None;
3334 break; 3816 break;
3335 case 1: 3817 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3818 rendset = 1, rendstyle = RS_Bold;
3337 break; 3819 break;
3820 //case 2: // low intensity
3821 case 3:
3822 rendset = 1, rendstyle = RS_Italic;
3823 break;
3338 case 4: 3824 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3825 rendset = 1, rendstyle = RS_Uline;
3340 break; 3826 break;
3341 case 5: 3827 case 5: // slowly blinking
3828 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3829 rendset = 1, rendstyle = RS_Blink;
3343 break; 3830 break;
3831 //case 6: // scoansi light background
3344 case 7: 3832 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3833 rendset = 1, rendstyle = RS_RVid;
3346 break; 3834 break;
3347 case 8: 3835 case 8:
3348 // invisible. NYI 3836 // invisible. NYI
3349 break; 3837 break;
3350 case 22: 3838 //case 9: // crossed out
3839 //case 10: // scoansi acs off, primary font
3840 //case 11: // scoansi acs on, first alt font
3841 //case 12: // scoansi acs on, |0x80, second alt font
3842 //...
3843 //case 19: // ninth alt font
3844 //case 20: // gothic
3845 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 3846 rendset = 0, rendstyle = RS_Bold;
3847 break;
3848 case 22: // normal intensity
3849 rendset = 0, rendstyle = RS_Bold;
3850 break;
3851 case 23: // disable italic
3852 rendset = 0, rendstyle = RS_Italic;
3352 break; 3853 break;
3353 case 24: 3854 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3855 rendset = 0, rendstyle = RS_Uline;
3355 break; 3856 break;
3356 case 25: 3857 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3858 rendset = 0, rendstyle = RS_Blink;
3358 break; 3859 break;
3860 case 26: // variable spacing (iso 8613)
3861 rendset = 0, rendstyle = RS_Blink;
3862 break;
3359 case 27: 3863 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3864 rendset = 0, rendstyle = RS_RVid;
3361 break; 3865 break;
3362 case 28:
3363 // visible. NYI 3866 //case 28: // visible. NYI
3364 break; 3867 //case 29: // not crossed-out
3365 } 3868 }
3366 3869
3367 if (rendset != -1) 3870 if (rendset != -1)
3368 { 3871 {
3369 scr_rendition (rendset, rendstyle); 3872 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 3883 case 35:
3381 case 36: 3884 case 36:
3382 case 37: 3885 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3886 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 3887 break;
3385#ifdef TTY_256COLOR 3888 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 3889 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 3890 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3891 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 3892 i += 2;
3391 } 3893 }
3392 break; 3894 break;
3393#endif
3394 case 39: /* default fg */ 3895 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 3896 scr_color (Color_fg, Color_fg);
3396 break; 3897 break;
3397 3898
3398 case 40: 3899 case 40:
… …
3403 case 45: 3904 case 45:
3404 case 46: 3905 case 46:
3405 case 47: 3906 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3907 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 3908 break;
3408#ifdef TTY_256COLOR 3909 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 3910 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 3911 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3912 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 3913 i += 2;
3414 } 3914 }
3415 break; 3915 break;
3416#endif
3417 case 49: /* default bg */ 3916 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 3917 scr_color (Color_bg, Color_bg);
3419 break; 3918 break;
3420 3919
3421#ifndef NO_BRIGHTCOLOR 3920 //case 50: // not variable spacing
3921
3922#if !ENABLE_MINIMAL
3422 case 90: 3923 case 90:
3423 case 91: /* set bright fg color */ 3924 case 91: /* set bright fg color */
3424 case 92: 3925 case 92:
3425 case 93: 3926 case 93:
3426 case 94: 3927 case 94:
3427 case 95: 3928 case 95:
3428 case 96: 3929 case 96:
3429 case 97: 3930 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3931 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 3932 break;
3433 case 100: 3933 case 100:
3434 case 101: /* set bright bg color */ 3934 case 101: /* set bright bg color */
3435 case 102: 3935 case 102:
3436 case 103: 3936 case 103:
3437 case 104: 3937 case 104:
3438 case 105: 3938 case 105:
3439 case 106: 3939 case 106:
3440 case 107: 3940 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3941 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 3942 break;
3444#endif 3943#endif
3445
3446 } 3944 }
3447 } 3945 }
3448} 3946}
3449/*}}} */ 3947/*}}} */
3450 3948
3451/*{{{ process Rob Nation's own graphics mode sequences */ 3949/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 3950void
3453rxvt_term::process_graphics () 3951rxvt_term::process_graphics ()
3454{ 3952{
3455 unicode_t ch, cmd = cmd_getc (); 3953 unicode_t ch, cmd = cmd_getc ();
3456 3954
3457 if (cmd == 'Q') 3955 if (cmd == 'Q')
3458 { /* query graphics */ 3956 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 3957 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 3958 return;
3461 } 3959 }
3462 /* swallow other graphics sequences until terminating ':' */ 3960 /* swallow other graphics sequences until terminating ':' */
3463 do 3961 do
3464 ch = cmd_getc (); 3962 ch = cmd_getc ();
… …
3474 */ 3972 */
3475void 3973void
3476rxvt_term::tt_printf (const char *fmt,...) 3974rxvt_term::tt_printf (const char *fmt,...)
3477{ 3975{
3478 va_list arg_ptr; 3976 va_list arg_ptr;
3479 unsigned char buf[256]; 3977 char buf[256];
3480 3978
3481 va_start (arg_ptr, fmt); 3979 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 3981 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 3982 tt_write (buf, strlen (buf));
3485} 3983}
3486 3984
3487/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* 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. 3987 * or generated by us in response to a query ESC sequence.
3490 */ 3988 */
3989const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3990
3491void 3991void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 3993{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return;
3495 3996
3496 if (len) 3997 if (pty->pty < 0)
3998 return;
3999
4000 if (v_buflen == 0)
4001 {
4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4003
4004 if ((unsigned int)written == len)
4005 return;
4006
4007 data += written;
4008 len -= written;
3497 { 4009 }
4010
4011 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4012
4013 memcpy (v_buffer + v_buflen, data, len);
4014 v_buflen += len;
4015
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017}
4018
4019void rxvt_term::pty_write ()
4020{
4021 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4022
4023 if (written > 0)
4024 {
4025 v_buflen -= written;
4026
3498 if (v_buflen == 0) 4027 if (v_buflen == 0)
3499 { 4028 {
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); 4029 free (v_buffer);
3527 v_buffer = 0; 4030 v_buffer = 0;
3528 v_buflen = 0; 4031 v_buflen = 0;
3529 4032
3530 pty_ev.set (EVENT_READ); 4033 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; 4034 return;
3543 } 4035 }
4036
4037 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4038 }
4039 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4040 pty_ev.set (EVENT_READ);
3545} 4041}
3546 4042
3547/*----------------------- end-of-file (C source) -----------------------*/ 4043/*----------------------- end-of-file (C source) -----------------------*/
3548 4044

Diff Legend

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