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.343 by sasha, Fri Aug 10 22:10:36 2007 UTC

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

Diff Legend

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