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.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.244 by root, Fri Jan 6 17:09:27 2006 UTC

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

Diff Legend

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