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

Diff Legend

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