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.249 by root, Sun Jan 8 01:02:15 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_STR_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
1156 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 1319 unsigned int unused_mask;
1159 1320
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) 1321 switch (ev.type)
1210 { 1322 {
1211 case KeyPress: 1323 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1324#if ISO_14755
1325 if (!(iso14755buf & ISO_14755_52))
1326#endif
1327 lookup_key (ev.xkey);
1328
1329 break;
1330
1331 case KeyRelease:
1332 {
1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1334 KeySym ks;
1335
1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337#endif
1338
1339#if ENABLE_FRILLS || ISO_14755
1340 // ISO 14755 support
1341 if (iso14755buf)
1342 if (iso14755buf & ISO_14755_52)
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347# if ISO_14755
1348 // iso14755 part 5.2 handling: release time
1349 // first: controls
1350 if ((ev.xkey.state & ControlMask)
1351 && ((ks >= 0x40 && ks <= 0x5f)
1352 || (ks >= 0x61 && ks <= 0x7f)))
1353 {
1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1355 commit_iso14755 ();
1356 goto skip_switch;
1357 }
1358
1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360 if (i[0] == ks)
1361 {
1362 iso14755buf = ISO_14755_51 | i[1];
1363 commit_iso14755 ();
1364 goto skip_switch;
1365 }
1366
1367 scr_bell ();
1368# endif
1369 iso14755buf = 0;
1370 break;
1371 }
1372 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1373 {
1374# if ENABLE_OVERLAY
1375 scr_overlay_off ();
1376# endif
1377 if (iso14755buf & ISO_14755_51)
1378 commit_iso14755 ();
1379#if ISO_14755
1380 else if (iso14755buf & ISO_14755_STARTED)
1381 {
1382 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1383
1384 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1385 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1386 }
1387# endif
1388 else
1389 iso14755buf = 0;
1390 }
1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1213 break; 1395 break;
1214 1396
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease:
1217 {
1218 if (!(ev->xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1399 slip_wheel_ev.stop ();
1400 else if (ks == XK_Control_L || ks == XK_Control_R)
1219 mouse_slip_wheel_speed = 0; 1401 mouse_slip_wheel_speed = 0;
1220 else 1402#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; 1403 break;
1229 } 1404 }
1230#endif
1231 1405
1232 case ButtonPress: 1406 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1407 button_press (ev.xbutton);
1234 break; 1408 break;
1235 1409
1236 case ButtonRelease: 1410 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1411 button_release (ev.xbutton);
1238 break; 1412 break;
1239 1413
1240 case ClientMessage: 1414 case ClientMessage:
1241 if (ev->xclient.format == 32 1415 if (ev.xclient.format == 32
1416 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1417 {
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1418 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1243 destroy (); 1419 destroy ();
1420#if ENABLE_EWMH
1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1422 XSendEvent (disp, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1424 &ev);
1425#endif
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1244#ifdef OFFIX_DND 1436#ifdef OFFIX_DND
1245 /* OffiX Dnd (drag 'n' drop) protocol */ 1437 /* OffiX Dnd (drag 'n' drop) protocol */
1246 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1438 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1247 && (ev->xclient.data.l[0] == DndFile 1439 && (ev.xclient.data.l[0] == DndFile
1248 || ev->xclient.data.l[0] == DndDir 1440 || ev.xclient.data.l[0] == DndDir
1249 || ev->xclient.data.l[0] == DndLink)) 1441 || ev.xclient.data.l[0] == DndLink))
1250 { 1442 {
1251 /* Get Dnd data */ 1443 /* Get Dnd data */
1252 Atom ActualType; 1444 Atom ActualType;
1253 int ActualFormat; 1445 int ActualFormat;
1254 unsigned char *data; 1446 unsigned char *data;
1255 unsigned long Size, RemainingBytes; 1447 unsigned long Size, RemainingBytes;
1256 1448
1257 XGetWindowProperty(Xdisplay, Xroot, 1449 XGetWindowProperty (disp, display->root,
1258 xa[XA_DNDSELECTION], 1450 xa[XA_DNDSELECTION],
1259 0L, 1000000L, 1451 0L, 1000000L,
1260 False, AnyPropertyType, 1452 False, AnyPropertyType,
1261 &ActualType, &ActualFormat, 1453 &ActualType, &ActualFormat,
1262 &Size, &RemainingBytes, 1454 &Size, &RemainingBytes,
1263 &data); 1455 &data);
1264 XChangeProperty(Xdisplay, Xroot, 1456 set_string_property (XA_CUT_BUFFER0, data);
1265 XA_CUT_BUFFER0, XA_STRING, 1457 XFree (data);
1266 8, PropModeReplace,
1267 data, STRLEN(data));
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1458 selection_paste (display->root, XA_CUT_BUFFER0, true);
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1459 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1270 } 1460 }
1271#endif /* OFFIX_DND */ 1461#endif /* OFFIX_DND */
1272 break; 1462 break;
1273 1463
1274 case MappingNotify: 1464 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping)); 1465 XRefreshKeyboardMapping (&ev.xmapping);
1276 break; 1466 break;
1277 1467
1278 /* 1468 /*
1279 * XXX: this is not the _current_ arrangement 1469 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1470 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1474 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1475 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1476 * which ought to make things real slow!
1287 */ 1477 */
1288 case VisibilityNotify: 1478 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1479 switch (ev.xvisibility.state)
1290 { 1480 {
1291 case VisibilityUnobscured: 1481 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1482 refresh_type = FAST_REFRESH;
1293 break; 1483 break;
1294 case VisibilityPartiallyObscured: 1484 case VisibilityPartiallyObscured:
… …
1299 break; 1489 break;
1300 } 1490 }
1301 break; 1491 break;
1302 1492
1303 case FocusIn: 1493 case FocusIn:
1304 if (!TermWin.focus) 1494 focus_in ();
1495 break;
1496
1497 case FocusOut:
1498 focus_out ();
1499 break;
1500
1501 case ConfigureNotify:
1502 if (ev.xconfigure.window == parent[0])
1305 { 1503 {
1306 TermWin.focus = 1; 1504 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1307 want_refresh = 1; 1505 ;
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 1506
1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1508 {
1509 seen_resize = 1;
1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511 }
1512
1513#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1514 if (OPTION (Opt_transparent))
1515 check_our_parents ();
1516#endif
1317 } 1517 }
1318 break; 1518 break;
1319 1519
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: 1520 case PropertyNotify:
1339 if (ev->xconfigure.window == TermWin.parent[0]) 1521 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1340 { 1522 && ev.xproperty.state == PropertyNewValue)
1341 int height, width; 1523 selection_property (ev.xproperty.window, ev.xproperty.atom);
1342 1524
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; 1525 break;
1373 1526
1374 case SelectionClear: 1527 case SelectionClear:
1375 selection_clear (); 1528 selection_clear ();
1376 break; 1529 break;
1377 1530
1378 case SelectionNotify: 1531 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1532 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1533 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1381 ev->xselection.property, True);
1382 break; 1534 break;
1383 1535
1384 case SelectionRequest: 1536 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1537 selection_send (ev.xselectionrequest);
1538 break;
1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1386 break; 1546 break;
1387 1547
1388 case UnmapNotify: 1548 case UnmapNotify:
1389 TermWin.mapped = 0; 1549 mapped = 0;
1390#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1391 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1392#endif 1552#endif
1393 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1394
1395 case MapNotify:
1396 TermWin.mapped = 1;
1397#ifdef TEXT_BLINK
1398 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1399#endif
1400 break;
1401
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; 1554 break;
1409 } 1555
1410#ifdef TRANSPARENT 1556#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: 1557 case ReparentNotify:
1422 if ((Options & Opt_transparent) && check_our_parents ()) 1558 rootwin_cb (ev);
1423 { 1559 break;
1424 if (am_transparent)
1425 want_full_refresh = 1;
1426 }
1427#endif /* TRANSPARENT */ 1560#endif /* TRANSPARENT */
1428 break;
1429 1561
1430 case GraphicsExpose: 1562 case GraphicsExpose:
1431 case Expose: 1563 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1433 { 1565 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1566 do
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1438 // don't understand this, so commented it out 1570
1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1572
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1576
1442 // ev->xexpose.width, TermWin.height, False); 1577 scr_refresh (refresh_type);
1443#endif
1444 want_refresh = 1;
1445 } 1578 }
1446 else 1579 else
1447 { 1580 {
1448 XEvent unused_xevent; 1581 XEvent unused_event;
1449 1582
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1451 Expose, 1584 ;
1452 &unused_xevent)) ;
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1585 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1454 GraphicsExpose, 1586 ;
1455 &unused_xevent)) ; 1587
1456 if (isScrollbarWindow(ev->xany.window)) 1588 if (isScrollbarWindow (ev.xany.window))
1457 { 1589 {
1458 scrollBar.setIdle(); 1590 scrollBar.setIdle ();
1459 scrollbar_show (0); 1591 scrollbar_show (0);
1460 } 1592 }
1461#ifdef MENUBAR 1593#ifdef MENUBAR
1462 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1594 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1463 menubar_expose (); 1595 menubar_expose ();
1464#endif 1596#endif
1465#ifdef RXVT_GRAPHICS
1466 Gr_expose (ev->xany.window);
1467#endif
1468 1597
1598#ifdef TRANSPARENT
1599 if (am_transparent && ev.xany.window == parent[0])
1600 XClearWindow (disp, ev.xany.window);
1601#endif
1469 } 1602 }
1470 break; 1603 break;
1471 1604
1472 case MotionNotify: 1605 case MotionNotify:
1473#ifdef POINTER_BLANK 1606#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1607 if (hidden_pointer)
1475 pointer_unblank (); 1608 pointer_unblank ();
1476#endif 1609#endif
1477#if MENUBAR 1610#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) 1611 if (isMenuBarWindow (ev.xany.window))
1479 { 1612 {
1480 menubar_control (&(ev->xbutton)); 1613 menubar_control (ev.xbutton);
1481 break; 1614 break;
1482 } 1615 }
1483#endif 1616#endif
1484 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1485 break; 1618 break;
1486 1619
1487 if (ev->xany.window == TermWin.vt) 1620 if (ev.xany.window == vt)
1488 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1489 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1490 { 1625 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1627 ;
1628
1493 XQueryPointer(Xdisplay, TermWin.vt, 1629 XQueryPointer (disp, vt,
1494 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1497 &unused_mask); 1633 &ev.xbutton.state);
1498#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1635 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1636 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1637 {
1502#endif 1638#endif
1639#if ISO_14755
1640 // 5.4
1641 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1642 {
1643 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1644 break;
1645 }
1646#endif
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1647 selection_extend (ev.xbutton.x, ev.xbutton.y,
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1648 ev.xbutton.state & Button3Mask ? 2 : 0);
1649
1505#ifdef SELECTION_SCROLLING 1650#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1651 if (ev.xbutton.y < int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1652 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1508 { 1653 {
1509 int dist; 1654 int dist;
1510
1511 pending_scroll_selection=1;
1512 1655
1513 /* don't clobber the current delay if we are 1656 /* don't clobber the current delay if we are
1514 * already in the middle of scrolling. 1657 * already in the middle of scrolling.
1515 */ 1658 */
1516 if (scroll_selection_delay<=0) 1659 if (!sel_scroll_ev.active)
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1518 1661
1519 /* save the event params so we can highlight 1662 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1663 * the selection in the pending-scroll loop
1521 */ 1664 */
1522 selection_save_x=ev->xbutton.x; 1665 selection_save_x = ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1666 selection_save_y = ev.xbutton.y;
1524 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1667 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1668
1527 /* calc number of lines to scroll */ 1669 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1670 if (ev.xbutton.y < int_bwidth)
1529 { 1671 {
1530 scroll_selection_dir = UP; 1672 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1673 dist = int_bwidth - ev.xbutton.y;
1532 } 1674 }
1533 else 1675 else
1534 { 1676 {
1535 scroll_selection_dir = DN; 1677 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1678 dist = ev.xbutton.y - (int_bwidth + height);
1537 (TermWin.int_bwidth + TermWin.height);
1538 } 1679 }
1680
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1681 scroll_selection_lines = Pixel2Height (dist)
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1682 / SELECTION_SCROLL_LINE_SPEEDUP
1683 + 1;
1541 MIN_IT(scroll_selection_lines, 1684 min_it (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1685 SELECTION_SCROLL_MAX_LINES);
1543 } 1686 }
1544 else 1687 else
1545 { 1688 {
1546 /* we are within the text window, so we 1689 /* we are within the text window, so we
1547 * shouldn't be scrolling 1690 * shouldn't be scrolling
1548 */ 1691 */
1549 pending_scroll_selection = 0; 1692 if (sel_scroll_ev.active)
1693 sel_scroll_ev.stop();
1550 } 1694 }
1551#endif 1695#endif
1552#ifdef MOUSE_THRESHOLD 1696#ifdef MOUSE_THRESHOLD
1553
1554 } 1697 }
1555#endif 1698#endif
1556
1557 } 1699 }
1558 } 1700 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1702 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1703 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1562 MotionNotify, ev)) ; 1704 MotionNotify, &ev))
1705 ;
1706
1563 XQueryPointer(Xdisplay, scrollBar.win, 1707 XQueryPointer (disp, scrollBar.win,
1564 &unused_root, &unused_child, 1708 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1709 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1710 &ev.xbutton.x, &ev.xbutton.y,
1567 &unused_mask); 1711 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1713 scrollbar_size ());
1570 scr_refresh (refresh_type); 1714 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1715 refresh_limit = 0;
1572 scrollbar_show (1); 1716 scrollbar_show (1);
1573 } 1717 }
1574 break; 1718 break;
1575 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1576} 1749}
1577 1750
1578void 1751void
1752rxvt_term::focus_in ()
1753{
1754 if (!focus)
1755 {
1756 focus = 1;
1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM
1762 if (Input_Context != NULL)
1763 {
1764 IMSetStatusPosition ();
1765 XSetICFocus (Input_Context);
1766 }
1767#endif
1768#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_focused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::focus_out ()
1784{
1785 if (focus)
1786 {
1787 focus = 0;
1788 want_refresh = 1;
1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1795 iso14755buf = 0;
1796# if ENABLE_OVERLAY
1797 scr_overlay_off ();
1798# endif
1799 }
1800#endif
1801#if USE_XIM
1802 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context);
1804#endif
1805#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink))
1807 cursor_blink_ev.stop ();
1808 hidden_cursor = 0;
1809#endif
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 pix_colors = pix_colors_unfocused;
1814 scr_recolour ();
1815 }
1816#endif
1817 }
1818}
1819
1820#if TRANSPARENT
1821void
1822rxvt_term::rootwin_cb (XEvent &ev)
1823{
1824 SET_R (this);
1825 SET_LOCALE (locale);
1826
1827 switch (ev.type)
1828 {
1829 case PropertyNotify:
1830 /*
1831 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on.
1833 */
1834 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1835 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1836 return;
1837
1838 /* FALLTHROUGH */
1839 case ReparentNotify:
1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1841 want_refresh = want_full_refresh = 1;
1842 break;
1843 }
1844}
1845#endif
1846
1847void
1579rxvt_term::button_press (XButtonEvent *ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1580{ 1849{
1581 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1582 1851
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1584 if (!bypass_keystate) 1854 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1856
1586 /* 1857 /*
1587 * VT window processing of button press 1858 * VT window processing of button press
1588 */ 1859 */
1589 if (ev->window == TermWin.vt) 1860 if (ev.window == vt)
1590 { 1861 {
1591#if RXVT_GRAPHICS 1862#if ISO_14755
1592 if (ev->subwindow != None) 1863 // 5.4
1593 rxvt_Gr_ButtonPress (ev->x, ev->y); 1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1594 else 1865 {
1595#endif 1866 iso14755_54 (ev.x, ev.y);
1596 1867 return;
1597 { 1868 }
1869#endif
1870
1598 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1871 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1872
1599 if (reportmode) 1873 if (reportmode)
1874 {
1875 /* mouse report from vt window */
1876 /* save the xbutton state (for ButtonRelease) */
1877 MEvent.state = ev.state;
1878#ifdef MOUSE_REPORT_DOUBLECLICK
1879 if (ev.button == MEvent.button && clickintime)
1600 { 1880 {
1601 /* mouse report from vt window */ 1881 /* same button, within alloted time */
1602 /* save the xbutton state (for ButtonRelease) */ 1882 MEvent.clicks++;
1603 MEvent.state = ev->state; 1883
1604#ifdef MOUSE_REPORT_DOUBLECLICK 1884 if (MEvent.clicks > 1)
1605 if (ev->button == MEvent.button && clickintime)
1606 { 1885 {
1607 /* same button, within alloted time */
1608 MEvent.clicks++;
1609 if (MEvent.clicks > 1)
1610 {
1611 /* only report double clicks */ 1886 /* only report double clicks */
1612 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1613 mouse_report (ev); 1888 mouse_report (ev);
1614 1889
1615 /* don't report the release */ 1890 /* don't report the release */
1616 MEvent.clicks = 0; 1891 MEvent.clicks = 0;
1617 MEvent.button = AnyButton; 1892 MEvent.button = AnyButton;
1618 }
1619 } 1893 }
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 } 1894 }
1633 else 1895 else
1634 { 1896 {
1635 if (ev->button != MEvent.button) 1897 /* different button, or time expired */
1636 MEvent.clicks = 0; 1898 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; 1899 MEvent.button = ev.button;
1659 break; 1900 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 } 1901 }
1670 MEvent.time = ev->time; 1902#else
1671 return; 1903 MEvent.button = ev.button;
1904 mouse_report (ev);
1905#endif /* MOUSE_REPORT_DOUBLECLICK */
1906
1907 }
1908 else
1909 {
1910 if (ev.button != MEvent.button)
1911 MEvent.clicks = 0;
1912
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914 switch (ev.button)
1915 {
1916 case Button1:
1917 /* allow meta + click to select rectangular areas */
1918 /* should be done in screen.C */
1919#if ENABLE_FRILLS
1920 selection.rect = !!(ev.state & ModMetaMask);
1921#else
1922 selection.rect = false;
1923#endif
1924
1925 /* allow shift+left click to extend selection */
1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1927 {
1928 if (MEvent.button == Button1 && clickintime)
1929 selection_rotate (ev.x, ev.y);
1930 else
1931 selection_extend (ev.x, ev.y, 1);
1932 }
1933 else
1934 {
1935 if (MEvent.button == Button1 && clickintime)
1936 MEvent.clicks++;
1937 else
1938 MEvent.clicks = 1;
1939
1940 selection_click (MEvent.clicks, ev.x, ev.y);
1941 }
1942
1943 MEvent.button = Button1;
1944 break;
1945
1946 case Button3:
1947 if (MEvent.button == Button3 && clickintime)
1948 selection_rotate (ev.x, ev.y);
1949 else
1950 selection_extend (ev.x, ev.y, 1);
1951
1952 MEvent.button = Button3;
1953 break;
1954 }
1672 } 1955 }
1956
1957 MEvent.time = ev.time;
1958 return;
1673 } 1959 }
1674 1960
1675 /* 1961 /*
1676 * Scrollbar window processing of button press 1962 * Scrollbar window processing of button press
1677 */ 1963 */
1678 if (isScrollbarWindow(ev->window)) 1964 if (isScrollbarWindow (ev.window))
1679 { 1965 {
1680 scrollBar.setIdle (); 1966 scrollBar.setIdle ();
1681 /* 1967 /*
1682 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1969 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1698 */ 1984 */
1699 if ((scrollBar.style == R_SB_NEXT 1985 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1986 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1987 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1988 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1989 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1990 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1991 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1992 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1993 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1994 tt_printf ("\033[B");
1709 else 1995 else
1710 switch (ev->button) 1996 switch (ev.button)
1711 { 1997 {
1712 case Button2: 1998 case Button2:
1713 tt_printf("\014"); 1999 tt_printf ("\014");
1714 break; 2000 break;
1715 case Button1: 2001 case Button1:
1716 tt_printf("\033[6~"); 2002 tt_printf ("\033[6~");
1717 break; 2003 break;
1718 case Button3: 2004 case Button3:
1719 tt_printf("\033[5~"); 2005 tt_printf ("\033[5~");
1720 break; 2006 break;
1721 } 2007 }
1722 } 2008 }
1723 else 2009 else
1724#endif /* NO_SCROLLBAR_REPORT */ 2010#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 2012 {
1727 char upordown = 0; 2013 char upordown = 0;
1728 2014
1729 if (scrollBar.style == R_SB_NEXT) 2015 if (scrollBar.style == R_SB_NEXT)
1730 { 2016 {
1731 if (scrollbarnext_upButton(ev->y)) 2017 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 2018 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 2019 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 2020 upordown = 1; /* down */
1735 } 2021 }
1736 else if (scrollBar.style == R_SB_RXVT) 2022 else if (scrollBar.style == R_SB_RXVT)
1737 { 2023 {
1738 if (scrollbarrxvt_upButton(ev->y)) 2024 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 2025 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 2026 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 2027 upordown = 1; /* down */
1742 } 2028 }
1743 if (upordown) 2029 if (upordown)
1744 { 2030 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1746 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2032 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1747#endif 2033#endif
1748 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
1749 { 2035 {
1750 if (upordown < 0) 2036 if (upordown < 0)
1751 scrollBar.setUp (); 2037 scrollBar.setUp ();
1752 else 2038 else
1753 scrollBar.setDn (); 2039 scrollBar.setDn ();
1754 } 2040 }
1755 } 2041 }
1756 else 2042 else
1757 switch (ev->button) 2043 switch (ev.button)
1758 { 2044 {
1759 case Button2: 2045 case Button2:
1760 switch (scrollbar_align) 2046 switch (scrollbar_align)
1761 { 2047 {
1762 case R_SB_ALIGN_TOP: 2048 case R_SB_ALIGN_TOP:
… …
1767 break; 2053 break;
1768 case R_SB_ALIGN_BOTTOM: 2054 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 2055 csrO = scrollBar.bot - scrollBar.top;
1770 break; 2056 break;
1771 } 2057 }
2058
1772 if (scrollBar.style == R_SB_XTERM 2059 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 2060 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 2061 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 2062 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1776 scrollbar_size()); 2063
1777 scrollBar.setMotion (); 2064 scrollBar.setMotion ();
1778 break; 2065 break;
1779 2066
1780 case Button1: 2067 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2068 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 2069 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 2070 /* FALLTHROUGH */
1784 2071
1785 case Button3: 2072 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 2073 if (scrollBar.style != R_SB_XTERM)
1787 { 2074 {
1788 if (scrollbar_above_slider(ev->y)) 2075 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 2077 scr_page (UP, nrow - 1);
1791# else 2078# else
1792 scr_page (UP, TermWin.nrow / 4); 2079 scr_page (UP, nrow / 4);
1793# endif 2080# endif
1794 else if (scrollbar_below_slider(ev->y)) 2081 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 2083 scr_page (DN, nrow - 1);
1797# else 2084# else
1798 scr_page (DN, TermWin.nrow / 4); 2085 scr_page (DN, nrow / 4);
1799# endif 2086# endif
1800 else 2087 else
1801 scrollBar.setMotion (); 2088 scrollBar.setMotion ();
1802 } 2089 }
1803 else 2090 else
1804 { 2091 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 2092 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 2093 (nrow
1807 * scrollbar_position(ev->y) 2094 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 2095 / scrollbar_size ()));
1809 } 2096 }
2097
1810 break; 2098 break;
1811 } 2099 }
1812 } 2100 }
2101
1813 return; 2102 return;
1814 } 2103 }
2104
1815#if MENUBAR 2105#if MENUBAR
1816 /* 2106 /*
1817 * Menubar window processing of button press 2107 * Menubar window processing of button press
1818 */ 2108 */
1819 if (isMenuBarWindow(ev->window)) 2109 if (isMenuBarWindow (ev.window))
1820 menubar_control (ev); 2110 menubar_control (ev);
1821#endif 2111#endif
1822} 2112}
1823 2113
1824void 2114void
1825rxvt_term::button_release (XButtonEvent *ev) 2115rxvt_term::button_release (XButtonEvent &ev)
1826{ 2116{
1827 int reportmode = 0; 2117 int reportmode = 0;
1828 2118
1829 csrO = 0; /* reset csr Offset */ 2119 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 2120 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
1832 2122
1833 if (scrollbar_isUpDn()) 2123 if (scrollbar_isUpDn ())
1834 { 2124 {
1835 scrollBar.setIdle (); 2125 scrollBar.setIdle ();
1836 scrollbar_show (0); 2126 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2127#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH; 2128 refresh_type &= ~SMOOTH_REFRESH;
1839#endif 2129#endif
1840
1841 } 2130 }
2131
1842#ifdef SELECTION_SCROLLING 2132#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 2133 if (sel_scroll_ev.active)
2134 sel_scroll_ev.stop();
1844#endif 2135#endif
2136
1845 if (ev->window == TermWin.vt) 2137 if (ev.window == vt)
1846 { 2138 {
1847#ifdef RXVT_GRAPHICS 2139#if ISO_14755
1848 if (ev->subwindow != None) 2140 // 5.4
1849 rxvt_Gr_ButtonRelease(ev->x, ev->y); 2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 else 2142 return;
1851#endif 2143#endif
1852
1853 {
1854 if (reportmode) 2144 if (reportmode)
2145 {
2146 /* mouse report from vt window */
2147 /* don't report release of wheel "buttons" */
2148 if (ev.button >= 4)
2149 return;
2150#ifdef MOUSE_REPORT_DOUBLECLICK
2151 /* only report the release of 'slow' single clicks */
2152 if (MEvent.button != AnyButton
2153 && (ev.button != MEvent.button
2154 || (ev.time - MEvent.time
2155 > MULTICLICK_TIME / 2)))
1855 { 2156 {
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; 2157 MEvent.clicks = 0;
1868 MEvent.button = AnyButton;
1869 mouse_report (ev);
1870 }
1871#else /* MOUSE_REPORT_DOUBLECLICK */
1872 MEvent.button = AnyButton; 2158 MEvent.button = AnyButton;
1873 mouse_report (ev); 2159 mouse_report (ev);
2160 }
2161#else /* MOUSE_REPORT_DOUBLECLICK */
2162 MEvent.button = AnyButton;
2163 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 return; 2165 return;
1876 } 2166 }
2167
1877 /* 2168 /*
1878 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
1879 * when overriding mouse reporting 2170 * when overriding mouse reporting
1880 */ 2171 */
1881 if (PrivateModes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1882 && bypass_keystate 2173 && bypass_keystate
1883 && ev->button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1884 selection_extend (ev->x, ev->y, 0); 2175 selection_extend (ev.x, ev.y, 0);
1885 2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2179
1886 switch (ev->button) 2180 switch (ev.button)
2181 {
2182 case Button1:
2183 case Button3:
2184 selection_make (ev.time);
2185 break;
2186 case Button2:
2187 selection_request (ev.time, ev.x, ev.y);
2188 break;
2189#ifdef MOUSE_WHEEL
2190 case Button4:
2191 case Button5:
1887 { 2192 {
1888 case Button1: 2193 int i;
1889 case Button3: 2194 page_dirn v;
1890 selection_make (ev->time); 2195
2196 v = ev.button == Button4 ? UP : DN;
2197
2198 if (ev.state & ShiftMask)
1891 break; 2199 i = 1;
1892 case Button2: 2200 else if (OPTION (Opt_mouseWheelScrollPage))
1893 selection_request (ev->time, ev->x, ev->y); 2201 i = nrow - 1;
2202 else
1894 break; 2203 i = 5;
2204
1895#ifdef MOUSE_WHEEL 2205# ifdef MOUSE_SLIP_WHEELING
1896 case Button4: 2206 if (ev.state & ControlMask)
1897 case Button5:
1898 { 2207 {
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); 2208 mouse_slip_wheel_speed += v ? -1 : 1;
2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2211
2212 if (slip_wheel_ev.at < NOW)
1913 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2214
2215 slip_wheel_ev.start ();
1914 } 2216 }
2217 else
2218 {
1915# endif 2219# endif
1916# ifdef JUMP_MOUSE_WHEEL 2220# ifdef JUMP_MOUSE_WHEEL
1917 scr_page (v, i); 2221 scr_page (v, i);
1918 scr_refresh (SMOOTH_REFRESH); 2222 scr_refresh (SMOOTH_REFRESH);
1919 scrollbar_show (1); 2223 scrollbar_show (1);
… …
1923 scr_page (v, 1); 2227 scr_page (v, 1);
1924 scr_refresh (SMOOTH_REFRESH); 2228 scr_refresh (SMOOTH_REFRESH);
1925 scrollbar_show (1); 2229 scrollbar_show (1);
1926 } 2230 }
1927# endif 2231# endif
1928 2232# ifdef MOUSE_SLIP_WHEELING
1929 } 2233 }
1930 break;
1931#endif 2234#endif
1932
1933 } 2235 }
2236 break;
2237#endif
1934 } 2238 }
1935 } 2239 }
1936#ifdef MENUBAR 2240#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window)) 2241 else if (isMenuBarWindow (ev.window))
1938 menubar_control (ev); 2242 menubar_control (ev);
1939#endif 2243#endif
1940} 2244}
1941 2245
1942
1943#ifdef TRANSPARENT 2246#ifdef TRANSPARENT
2247#if TINTING
2248/* taken from aterm-0.4.2 */
2249
2250typedef uint32_t RUINT32T;
2251
2252void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2253{
2254 int sh_r, sh_g, sh_b;
2255 RUINT32T mask_r, mask_g, mask_b;
2256 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2257 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2258 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2259 int i;
2260
2261 Visual *visual = display->visual;
2262
2263 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2264
2265 /* for convenience */
2266 mask_r = visual->red_mask;
2267 mask_g = visual->green_mask;
2268 mask_b = visual->blue_mask;
2269
2270 /* boring lookup table pre-initialization */
2271 switch (srcImage->bits_per_pixel) {
2272 case 15:
2273 if ((mask_r != 0x7c00) ||
2274 (mask_g != 0x03e0) ||
2275 (mask_b != 0x001f))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2278 lookup_r = lookup;
2279 lookup_g = lookup+32;
2280 lookup_b = lookup+32+32;
2281 sh_r = 10;
2282 sh_g = 5;
2283 sh_b = 0;
2284 break;
2285 case 16:
2286 if ((mask_r != 0xf800) ||
2287 (mask_g != 0x07e0) ||
2288 (mask_b != 0x001f))
2289 return;
2290 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2291 lookup_r = lookup;
2292 lookup_g = lookup+32;
2293 lookup_b = lookup+32+64;
2294 sh_r = 11;
2295 sh_g = 5;
2296 sh_b = 0;
2297 break;
2298 case 24:
2299 if ((mask_r != 0xff0000) ||
2300 (mask_g != 0x00ff00) ||
2301 (mask_b != 0x0000ff))
2302 return;
2303 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2304 lookup_r = lookup;
2305 lookup_g = lookup+256;
2306 lookup_b = lookup+256+256;
2307 sh_r = 16;
2308 sh_g = 8;
2309 sh_b = 0;
2310 break;
2311 case 32:
2312 if ((mask_r != 0xff0000) ||
2313 (mask_g != 0x00ff00) ||
2314 (mask_b != 0x0000ff))
2315 return;
2316 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2317 lookup_r = lookup;
2318 lookup_g = lookup+256;
2319 lookup_b = lookup+256+256;
2320 sh_r = 16;
2321 sh_g = 8;
2322 sh_b = 0;
2323 break;
2324 default:
2325 return; /* we do not support this color depth */
2326 }
2327
2328 /* prepare limits for color transformation (each channel is handled separately) */
2329 if (shade < 0) {
2330 shade = -shade;
2331 if (shade < 0) shade = 0;
2332 if (shade > 100) shade = 100;
2333
2334 lower_lim_r = 65535-rm;
2335 lower_lim_g = 65535-gm;
2336 lower_lim_b = 65535-bm;
2337
2338 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2339 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2340 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2341
2342 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2343 } else {
2344 if (shade < 0) shade = 0;
2345 if (shade > 100) shade = 100;
2346
2347 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2348
2349 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2350 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2351 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2352 }
2353
2354 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2355 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2356 {
2357 unsigned int tmp;
2358
2359 tmp = lower_lim_r;
2360 lower_lim_r = lower_lim_b;
2361 lower_lim_b = tmp;
2362
2363 tmp = upper_lim_r;
2364 upper_lim_r = upper_lim_b;
2365 upper_lim_b = tmp;
2366 }
2367
2368 /* fill our lookup tables */
2369 for (i = 0; i <= mask_r>>sh_r; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2373 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2374 lookup_r[i] = (tmp/65535)<<sh_r;
2375 }
2376 for (i = 0; i <= mask_g>>sh_g; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2380 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2381 lookup_g[i] = (tmp/65535)<<sh_g;
2382 }
2383 for (i = 0; i <= mask_b>>sh_b; i++)
2384 {
2385 RUINT32T tmp;
2386 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2387 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2388 lookup_b[i] = (tmp/65535)<<sh_b;
2389 }
2390
2391 /* apply table to input image (replacing colors by newly calculated ones) */
2392 switch (srcImage->bits_per_pixel)
2393 {
2394 case 15:
2395 {
2396 unsigned short *p1, *pf, *p, *pl;
2397 p1 = (unsigned short *) srcImage->data;
2398 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399 while (p1 < pf)
2400 {
2401 p = p1;
2402 pl = p1 + srcImage->width;
2403 for (; p < pl; p++)
2404 {
2405 *p = lookup_r[(*p & 0x7c00)>>10] |
2406 lookup_g[(*p & 0x03e0)>> 5] |
2407 lookup_b[(*p & 0x001f)];
2408 }
2409 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2410 }
2411 break;
2412 }
2413 case 16:
2414 {
2415 unsigned short *p1, *pf, *p, *pl;
2416 p1 = (unsigned short *) srcImage->data;
2417 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xf800)>>11] |
2425 lookup_g[(*p & 0x07e0)>> 5] |
2426 lookup_b[(*p & 0x001f)];
2427 }
2428 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 case 24:
2433 {
2434 unsigned char *p1, *pf, *p, *pl;
2435 p1 = (unsigned char *) srcImage->data;
2436 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2437 while (p1 < pf)
2438 {
2439 p = p1;
2440 pl = p1 + srcImage->width * 3;
2441 for (; p < pl; p += 3)
2442 {
2443 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2444 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2445 p[2] = lookup_r[(p[2] & 0x0000ff)];
2446 }
2447 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2448 }
2449 break;
2450 }
2451 case 32:
2452 {
2453 RUINT32T *p1, *pf, *p, *pl;
2454 p1 = (RUINT32T *) srcImage->data;
2455 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2456
2457 while (p1 < pf)
2458 {
2459 p = p1;
2460 pl = p1 + srcImage->width;
2461 for (; p < pl; p++)
2462 {
2463 *p = lookup_r[(*p & 0xff0000)>>16] |
2464 lookup_g[(*p & 0x00ff00)>> 8] |
2465 lookup_b[(*p & 0x0000ff)] |
2466 (*p & ~0xffffff);
2467 }
2468 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2469 }
2470 break;
2471 }
2472 }
2473
2474 free (lookup);
2475}
2476#endif
2477
1944/* 2478/*
1945 * Check our parents are still who we think they are. 2479 * Check our parents are still who we think they are.
1946 * Do transparency updates if required 2480 * Do transparency updates if required
1947 */ 2481 */
1948int 2482int
1949rxvt_term::check_our_parents () 2483rxvt_term::check_our_parents ()
1950{ 2484{
1951 int i, pchanged, aformat, have_pixmap, rootdepth; 2485 int i, pchanged, aformat, have_pixmap, rootdepth;
1952 unsigned long nitems, bytes_after; 2486 unsigned long nitems, bytes_after;
1953 Atom atype; 2487 Atom atype;
1954 unsigned char *prop = NULL; 2488 unsigned char *prop = NULL;
1955 Window root, oldp, *list; 2489 Window root, oldp, *list;
1956 Pixmap rootpixmap = None; 2490 Pixmap rootpixmap = None;
1957 XWindowAttributes wattr, wrootattr; 2491 XWindowAttributes wattr, wrootattr;
2492 dDisp;
1958 2493
1959 pchanged = 0; 2494 pchanged = 0;
1960 2495
1961 if (!(Options & Opt_transparent)) 2496 if (!OPTION (Opt_transparent))
1962 return pchanged; /* Don't try any more */ 2497 return pchanged; /* Don't try any more */
1963 2498
1964 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 2499 XGetWindowAttributes (disp, display->root, &wrootattr);
1965 rootdepth = wrootattr.depth; 2500 rootdepth = wrootattr.depth;
1966 2501
1967 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2502 XGetWindowAttributes (disp, parent[0], &wattr);
2503
1968 if (rootdepth != wattr.depth) 2504 if (rootdepth != wattr.depth)
1969 { 2505 {
1970 if (am_transparent) 2506 if (am_transparent)
1971 { 2507 {
1972 pchanged = 1; 2508 pchanged = 1;
1973 XSetWindowBackground(Xdisplay, TermWin.vt, 2509 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1974 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0; 2510 am_transparent = am_pixmap_trans = 0;
1976 } 2511 }
2512
1977 return pchanged; /* Don't try any more */ 2513 return pchanged; /* Don't try any more */
1978 } 2514 }
1979 2515
1980 /* Get all X ops out of the queue so that our information is up-to-date. */ 2516 /* Get all X ops out of the queue so that our information is up-to-date. */
1981 XSync(Xdisplay, False); 2517 XSync (disp, False);
1982 2518
1983 /* 2519 /*
1984 * Make the frame window set by the window manager have 2520 * Make the frame window set by the window manager have
1985 * the root background. Some window managers put multiple nested frame 2521 * the root background. Some window managers put multiple nested frame
1986 * windows for each client, so we have to take care about that. 2522 * windows for each client, so we have to take care about that.
1987 */ 2523 */
1988 i = (xa[XA_XROOTPMAPID] != 0 2524 i = (xa[XA_XROOTPMAP_ID]
1989 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 2525 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1990 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1991 &nitems, &bytes_after, &prop) == Success)); 2527 &nitems, &bytes_after, &prop) == Success);
2528
1992 if (!i || prop == NULL) 2529 if (!i || prop == NULL)
2530 i = (xa[XA_ESETROOT_PMAP_ID]
2531 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2532 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2533 &nitems, &bytes_after, &prop) == Success);
2534
2535 if (!i || prop == NULL
2536#if TINTING
2537 || !rs[Rs_color + Color_tint]
2538#endif
2539 )
1993 have_pixmap = 0; 2540 have_pixmap = 0;
1994 else 2541 else
1995 { 2542 {
1996 have_pixmap = 1; 2543 have_pixmap = 1;
1997 rootpixmap = *((Pixmap *)prop); 2544 rootpixmap = *(Pixmap *)prop;
1998 XFree(prop); 2545 XFree (prop);
1999 } 2546 }
2547
2000 if (have_pixmap) 2548 if (have_pixmap)
2001 { 2549 {
2002 /* 2550 /*
2003 * Copy Xroot pixmap transparency 2551 * Copy display->root pixmap transparency
2004 */ 2552 */
2005 int sx, sy, nx, ny; 2553 int sx, sy, nx, ny;
2006 unsigned int nw, nh; 2554 unsigned int nw, nh;
2007 Window cr; 2555 Window cr;
2008 XImage *image; 2556 XImage *image;
2009 GC gc; 2557 GC gc;
2010 XGCValues gcvalue; 2558 XGCValues gcvalue;
2011 2559
2012 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2560 XTranslateCoordinates (disp, parent[0], display->root,
2013 0, 0, &sx, &sy, &cr); 2561 0, 0, &sx, &sy, &cr);
2014 nw = (unsigned int)szHint.width; 2562 nw = (unsigned int)szHint.width;
2015 nh = (unsigned int)szHint.height; 2563 nh = (unsigned int)szHint.height;
2016 nx = ny = 0; 2564 nx = ny = 0;
2565
2017 if (sx < 0) 2566 if (sx < 0)
2018 { 2567 {
2019 nw += sx; 2568 nw += sx;
2020 nx = -sx; 2569 nx = -sx;
2021 sx = 0; 2570 sx = 0;
2022 } 2571 }
2572
2023 if (sy < 0) 2573 if (sy < 0)
2024 { 2574 {
2025 nh += sy; 2575 nh += sy;
2026 ny = -sy; 2576 ny = -sy;
2027 sy = 0; 2577 sy = 0;
2028 } 2578 }
2579
2029 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2580 min_it (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2581 min_it (nh, (unsigned int) (wrootattr.height - sy));
2582
2583 XSync (disp, False);
2031 allowedxerror = -1; 2584 allowedxerror = -1;
2032 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2585 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 ZPixmap); 2586
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2587 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2588 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2589 allowedxerror = 0;
2590
2037 if (image == NULL) 2591 if (image == NULL)
2038 { 2592 {
2039 if (am_transparent && am_pixmap_trans) 2593 if (am_transparent && am_pixmap_trans)
2040 { 2594 {
2041 pchanged = 1; 2595 pchanged = 1;
2042 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2043 { 2597 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap); 2598 XFreePixmap (disp, pixmap);
2045 TermWin.pixmap = None; 2599 pixmap = None;
2046 } 2600 }
2047 } 2601 }
2602
2048 am_pixmap_trans = 0; 2603 am_pixmap_trans = 0;
2049 } 2604 }
2050 else 2605 else
2051 { 2606 {
2052 if (TermWin.pixmap != None) 2607 if (pixmap != None)
2053 XFreePixmap(Xdisplay, TermWin.pixmap); 2608 XFreePixmap (disp, pixmap);
2609
2610#if TINTING
2611 if (ISSET_PIXCOLOR (Color_tint))
2612 {
2613 unsigned short rm, gm, bm;
2614 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2615
2616 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2617
2618 ShadeXImage (display, image, shade, rm, gm, bm);
2619 }
2620#endif
2621
2054 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2622 pixmap = XCreatePixmap (disp, vt,
2055 (unsigned int)szHint.width,
2056 (unsigned int)szHint.height, 2623 szHint.width, szHint.height, image->depth);
2057 (unsigned int)image->depth);
2058 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2624 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2059 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2625 XPutImage (disp, pixmap, gc, image, 0, 0,
2060 nx, ny, (unsigned int)image->width,
2061 (unsigned int)image->height); 2626 nx, ny, image->width, image->height);
2062 XFreeGC(Xdisplay, gc); 2627 XFreeGC (disp, gc);
2063 XDestroyImage(image); 2628 XDestroyImage (image);
2064 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2629 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2065 TermWin.pixmap); 2630 XClearWindow (disp, parent[0]);
2631
2066 if (!am_transparent || !am_pixmap_trans) 2632 if (!am_transparent || !am_pixmap_trans)
2067 pchanged = 1; 2633 pchanged = 1;
2634
2068 am_transparent = am_pixmap_trans = 1; 2635 am_transparent = am_pixmap_trans = 1;
2069 } 2636 }
2070 } 2637 }
2638
2071 if (!am_pixmap_trans) 2639 if (am_pixmap_trans)
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 else
2072 { 2642 {
2073 unsigned int n; 2643 unsigned int n;
2074 /* 2644 /*
2075 * InheritPixmap transparency 2645 * InheritPixmap transparency
2076 */ 2646 */
2077 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
2078 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2647 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2079 i++)
2080 { 2648 {
2081 oldp = TermWin.parent[i]; 2649 oldp = parent[i];
2082 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2650 XQueryTree (disp, parent[i - 1], &root,
2083 &TermWin.parent[i], &list, &n); 2651 &parent[i], &list, &n);
2084 XFree(list); 2652 XFree (list);
2085 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2653
2086 if (TermWin.parent[i] == Xroot) 2654 if (parent[i] == display->root)
2087 { 2655 {
2088 if (oldp != None) 2656 if (oldp != None)
2089 pchanged = 1; 2657 pchanged = 1;
2658
2090 break; 2659 break;
2091 } 2660 }
2661
2092 if (oldp != TermWin.parent[i]) 2662 if (oldp != parent[i])
2093 pchanged = 1; 2663 pchanged = 1;
2094 } 2664 }
2665
2095 n = 0; 2666 n = 0;
2667
2096 if (pchanged) 2668 if (pchanged)
2097 { 2669 {
2098 for (; n < (unsigned int)i; n++) 2670 for (; n < (unsigned int)i; n++)
2099 { 2671 {
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2672 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) 2673 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2103 { 2674 {
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2675 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2105 break; 2676 break;
2106 } 2677 }
2107 } 2678 }
2108 } 2679 }
2109 if (n > (int)(sizeof(TermWin.parent) 2680
2110 / sizeof(TermWin.parent[0]))) 2681 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2111 { 2682 {
2112 D_X((stderr, "InheritPixmap Turning off")); 2683 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2113 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2684 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; 2685 am_transparent = 0;
2118 /* XXX: also turn off Opt_transparent? */ 2686 /* XXX: also turn off Opt_transparent? */
2119 } 2687 }
2120 else 2688 else
2121 { 2689 {
2690#if WAIT_FOR_WM
2122 /* wait (an arbitrary period) for the WM to do its thing 2691 /* wait (an arbitrary period) for the WM to do its thing
2123 * needed for fvwm2.2.2 (and before?) */ 2692 * 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); 2693 sleep (1);
2132# endif 2694#endif
2133 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2134 for (n = 0; n < (unsigned int)i; n++) 2695 for (n = 0; n < (unsigned int)i; n++)
2696 {
2135 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2697 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2136 ParentRelative); 2698 XClearWindow (disp, parent[n]);
2699 }
2700
2137 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2701 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2138 ParentRelative);
2139 am_transparent = 1; 2702 am_transparent = 1;
2140 } 2703 }
2704
2141 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2705 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2142 TermWin.parent[i] = None; 2706 parent[i] = None;
2707 }
2708
2709 if (scrollBar.win)
2143 } 2710 {
2711 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2712 scrollBar.setIdle ();
2713 scrollbar_show (0);
2714 }
2715
2716 if (am_transparent)
2717 {
2718 want_refresh = want_full_refresh = 1;
2719 if (am_pixmap_trans)
2720 flush ();
2721 }
2722
2144 return pchanged; 2723 return pchanged;
2145} 2724}
2146#endif 2725#endif
2147 2726
2148/*}}} */ 2727/*}}} */
2728
2729bool
2730rxvt_term::cmd_parse ()
2731{
2732 bool flag = false;
2733 wchar_t ch = NOCHAR;
2734 char *seq_begin; // remember start of esc-sequence here
2735
2736 for (;;)
2737 {
2738 if (ch == NOCHAR)
2739 {
2740 seq_begin = cmdbuf_ptr;
2741 ch = next_char ();
2742
2743 if (ch == NOCHAR)
2744 break;
2745 }
2746
2747 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2748 {
2749 if (!seen_input)
2750 {
2751 seen_input = 1;
2752 // many badly-written programs (e.g. jed) contain a race condition:
2753 // they first read the screensize and then install a SIGWINCH handler.
2754 // some window managers resize the window early, and these programs
2755 // then sometimes get the size wrong.
2756 // unfortunately other programs are even more buggy and dislike
2757 // being sent SIGWINCH, so only do it when we were in fact being
2758 // resized.
2759 if (seen_resize && cmd_pid)
2760 kill (-cmd_pid, SIGWINCH);
2761 }
2762
2763 /* Read a text string from the input buffer */
2764 wchar_t buf[UBUFSIZ];
2765 bool refreshnow = false;
2766 int nlines = 0;
2767 wchar_t *str = buf;
2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2769
2770 for (;;)
2771 {
2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2773 break;
2774
2775 *str++ = ch;
2776
2777 if (ch == C0_LF || str >= eol)
2778 {
2779 if (ch == C0_LF)
2780 nlines++;
2781
2782 refresh_count++;
2783
2784 if (!OPTION (Opt_jumpScroll)
2785 || (refresh_count >= refresh_limit * (nrow - 1)))
2786 {
2787 refreshnow = true;
2788 refresh_count = 0;
2789 ch = NOCHAR;
2790 break;
2791 }
2792
2793 // scr_add_lines only works for nlines <= nrow - 1.
2794 if (nlines >= nrow - 1)
2795 {
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2797 scr_add_lines (buf, str - buf, nlines);
2798
2799 nlines = 0;
2800 str = buf;
2801 eol = str + min (ncol, UBUFSIZ);
2802 }
2803
2804 if (str >= eol)
2805 {
2806 if (eol >= buf + UBUFSIZ)
2807 {
2808 ch = NOCHAR;
2809 break;
2810 }
2811 else
2812 eol = min (eol + ncol, buf + UBUFSIZ);
2813 }
2814
2815 }
2816
2817 seq_begin = cmdbuf_ptr;
2818 ch = next_char ();
2819 }
2820
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2822 scr_add_lines (buf, str - buf, nlines);
2823
2824 /*
2825 * If there have been a lot of new lines, then update the screen
2826 * What the heck I'll cheat and only refresh less than every page-full.
2827 * the number of pages between refreshes is refresh_limit, which
2828 * is incremented here because we must be doing flat-out scrolling.
2829 */
2830 if (refreshnow)
2831 {
2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833 refresh_limit++;
2834 else
2835 {
2836 flag = true;
2837 scr_refresh (refresh_type);
2838 flush_ev.stop ();
2839 }
2840 }
2841
2842 }
2843 else
2844 {
2845 try
2846 {
2847 process_nonprinting (ch);
2848 }
2849 catch (const class out_of_input &o)
2850 {
2851 // we ran out of input, retry later
2852 cmdbuf_ptr = seq_begin;
2853 break;
2854 }
2855
2856 ch = NOCHAR;
2857 }
2858 }
2859
2860 return flag;
2861}
2862
2863// read the next character
2864wchar_t
2865rxvt_term::next_char ()
2866{
2867 while (cmdbuf_ptr < cmdbuf_endp)
2868 {
2869 // assume 7-bit to be ascii ALWAYS
2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2871 return *cmdbuf_ptr++;
2872
2873 wchar_t wc;
2874 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2875
2876 if (len == (size_t)-2)
2877 {
2878 // the mbstate stores incomplete sequences. didn't know this :/
2879 cmdbuf_ptr = cmdbuf_endp;
2880 break;
2881 }
2882
2883 if (len == (size_t)-1)
2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2885
2886 // assume wchar == unicode
2887 cmdbuf_ptr += len;
2888 return wc & UNICODE_MASK;
2889 }
2890
2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2901}
2902
2903/* rxvt_cmd_getc () - Return next input character */
2904/*
2905 * Return the next input character after first passing any keyboard input
2906 * to the command.
2907 */
2908wchar_t
2909rxvt_term::cmd_getc ()
2910{
2911 wchar_t c = next_char ();
2912
2913 if (c == NOCHAR)
2914 throw out_of_input;
2915
2916 return c;
2917}
2918
2919uint32_t
2920rxvt_term::cmd_get8 ()
2921{
2922 uint32_t c = next_octet ();
2923
2924 if (c == NOCHAR)
2925 throw out_of_input;
2926
2927 return c;
2928}
2149 2929
2150/*{{{ print pipe */ 2930/*{{{ print pipe */
2151/*----------------------------------------------------------------------*/ 2931/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2932#ifdef PRINTPIPE
2153FILE * 2933FILE *
2154rxvt_term::popen_printer () 2934rxvt_term::popen_printer ()
2155{ 2935{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2936 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2937
2158 if (stream == NULL) 2938 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2939 rxvt_warn ("can't open printer pipe, not printing.\n");
2940
2160 return stream; 2941 return stream;
2161} 2942}
2162 2943
2163int 2944int
2164rxvt_term::pclose_printer (FILE *stream) 2945rxvt_term::pclose_printer (FILE *stream)
2165{ 2946{
2166 fflush (stream); 2947 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); 2948 return pclose (stream);
2173# endif
2174} 2949}
2175 2950
2176/* 2951/*
2177 * simulate attached vt100 printer 2952 * simulate attached vt100 printer
2178 */ 2953 */
2179void 2954void
2180rxvt_term::process_print_pipe () 2955rxvt_term::process_print_pipe ()
2181{ 2956{
2182 int done; 2957 int done;
2183 FILE *fd; 2958 FILE *fd;
2184 2959
2185 if ((fd = popen_printer ()) == NULL) 2960 if ((fd = popen_printer ()) == NULL)
2186 return; 2961 return;
2187 2962
2188 /* 2963 /*
2189 * Send all input to the printer until either ESC[4i or ESC[?4i 2964 * Send all input to the printer until either ESC[4i or ESC[?4i
2190 * is received. 2965 * is received.
2191 */ 2966 */
2192 for (done = 0; !done;) 2967 for (done = 0; !done;)
2193 { 2968 {
2194 unsigned char buf[8]; 2969 unsigned char buf[8];
2195 unsigned char ch; 2970 unicode_t ch;
2196 unsigned int i, len; 2971 unsigned int i, len;
2197 2972
2198 if ((ch = cmd_getc ()) != C0_ESC) 2973 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2974 {
2200 if (putc(ch, fd) == EOF) 2975 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2976 break; /* done = 1 */
2202 } 2977 }
2203 else 2978 else
2204 { 2979 {
2205 len = 0; 2980 len = 0;
… …
2216 { 2991 {
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2992 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2993 break; /* done = 1 */
2219 } 2994 }
2220 } 2995 }
2996
2221 for (i = 0; i < len; i++) 2997 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2998 if (putc (buf[i], fd) == EOF)
2223 { 2999 {
2224 done = 1; 3000 done = 1;
2225 break; 3001 break;
2226 } 3002 }
2227 } 3003 }
2228 } 3004 }
3005
2229 pclose_printer (fd); 3006 pclose_printer (fd);
2230} 3007}
2231#endif /* PRINTPIPE */ 3008#endif /* PRINTPIPE */
2232/*}}} */ 3009/*}}} */
2233 3010
2234/* *INDENT-OFF* */ 3011/* *INDENT-OFF* */
2235enum { 3012enum {
2236 C1_40 = 0x40, 3013 C1_40 = 0x40,
2237 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3014 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, 3015 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, 3016 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 3017 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2241}; 3018};
2242/* *INDENT-ON* */ 3019/* *INDENT-ON* */
2243 3020
2244/*{{{ process non-printing single characters */ 3021/*{{{ process non-printing single characters */
2245void 3022void
2246rxvt_term::process_nonprinting (unsigned char ch) 3023rxvt_term::process_nonprinting (unicode_t ch)
2247{ 3024{
2248 switch (ch) 3025 switch (ch)
2249 { 3026 {
3027 case C0_ESC:
3028 process_escape_seq ();
3029 break;
2250 case C0_ENQ: /* terminal Status */ 3030 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 3031 if (rs[Rs_answerbackstring])
2252 tt_write( 3032 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 3033 else
2256 tt_write((unsigned char *)VT100_ANS, 3034 tt_write (VT100_ANS, strlen (VT100_ANS));
2257 (unsigned int)STRLEN(VT100_ANS));
2258 break; 3035 break;
2259 case C0_BEL: /* bell */ 3036 case C0_BEL: /* bell */
2260 scr_bell (); 3037 scr_bell ();
2261 break; 3038 break;
2262 case C0_BS: /* backspace */ 3039 case C0_BS: /* backspace */
… …
2277 scr_charset_choose (1); 3054 scr_charset_choose (1);
2278 break; 3055 break;
2279 case C0_SI: /* shift in - acs */ 3056 case C0_SI: /* shift in - acs */
2280 scr_charset_choose (0); 3057 scr_charset_choose (0);
2281 break; 3058 break;
3059
3060#ifdef EIGHT_BIT_CONTROLS
3061 // 8-bit controls
3062 case 0x90: /* DCS */
3063 process_dcs_seq ();
3064 break;
3065 case 0x9b: /* CSI */
3066 process_csi_seq ();
3067 break;
3068 case 0x9d: /* CSI */
3069 process_osc_seq ();
3070 break;
3071#endif
2282 } 3072 }
2283} 3073}
2284/*}}} */ 3074/*}}} */
2285 3075
2286 3076
2287/*{{{ process VT52 escape sequences */ 3077/*{{{ process VT52 escape sequences */
2288void 3078void
2289rxvt_term::process_escape_vt52 (unsigned char ch) 3079rxvt_term::process_escape_vt52 (unicode_t ch)
2290{ 3080{
2291 int row, col; 3081 int row, col;
2292 3082
2293 switch (ch) 3083 switch (ch)
2294 { 3084 {
… …
2324 row = cmd_getc () - ' '; 3114 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 3115 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 3116 scr_gotorc (row, col, 0);
2327 break; 3117 break;
2328 case 'Z': /* identify the terminal type */ 3118 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 3119 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 3120 break;
2331 case '<': /* turn off VT52 mode */ 3121 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 3122 PrivMode (0, PrivMode_vt52);
2333 break; 3123 break;
2334 case 'F': /* use special graphics character set */ 3124 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 3125 case 'G': /* use regular character set */
2336 /* unimplemented */ 3126 /* unimplemented */
2337 break; 3127 break;
… …
2346 3136
2347/*{{{ process escape sequences */ 3137/*{{{ process escape sequences */
2348void 3138void
2349rxvt_term::process_escape_seq () 3139rxvt_term::process_escape_seq ()
2350{ 3140{
2351 unsigned char ch = cmd_getc (); 3141 unicode_t ch = cmd_getc ();
2352 3142
2353 if (PrivateModes & PrivMode_vt52) 3143 if (priv_modes & PrivMode_vt52)
2354 { 3144 {
2355 process_escape_vt52 (ch); 3145 process_escape_vt52 (ch);
2356 return; 3146 return;
2357 } 3147 }
2358 3148
… …
2373 scr_charset_set (2, (unsigned int)cmd_getc ()); 3163 scr_charset_set (2, (unsigned int)cmd_getc ());
2374 break; 3164 break;
2375 case '+': 3165 case '+':
2376 scr_charset_set (3, (unsigned int)cmd_getc ()); 3166 scr_charset_set (3, (unsigned int)cmd_getc ());
2377 break; 3167 break;
2378#ifdef MULTICHAR_SET 3168#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': 3169 case '6':
2385 scr_backindex (); 3170 scr_backindex ();
2386 break; 3171 break;
2387#endif 3172#endif
2388 case '7': 3173 case '7':
2389 scr_cursor (SAVE); 3174 scr_cursor (SAVE);
2390 break; 3175 break;
2391 case '8': 3176 case '8':
2392 scr_cursor (RESTORE); 3177 scr_cursor (RESTORE);
2393 break; 3178 break;
2394#ifndef NO_FRILLS 3179#if ENABLE_FRILLS
2395 case '9': 3180 case '9':
2396 scr_forwardindex (); 3181 scr_forwardindex ();
2397 break; 3182 break;
2398#endif 3183#endif
2399 case '=': 3184 case '=':
2400 case '>': 3185 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 3186 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 3187 break;
2403 3188
2404 case C1_40: 3189 case C1_40:
2405 cmd_getc (); 3190 cmd_getc ();
2406 break; 3191 break;
… …
2409 break; 3194 break;
2410 3195
2411 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
2412 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
2413 { 3198 {
2414 uint32_t nlcr[] = { '\n', '\r' }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
2415 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2416 } 3201 }
2417 break; 3202 break;
2418 3203
2419 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
2420 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
2430 case C1_RI: /* ESC M */ 3215 case C1_RI: /* ESC M */
2431 scr_index (DN); 3216 scr_index (DN);
2432 break; 3217 break;
2433 3218
2434 /* 8.3.142: SINGLE-SHIFT TWO */ 3219 /* 8.3.142: SINGLE-SHIFT TWO */
2435 /*case C1_SS2: scr_single_shift (2); break; */ 3220 /*case C1_SS2: scr_single_shift (2); break; */
2436 3221
2437 /* 8.3.143: SINGLE-SHIFT THREE */ 3222 /* 8.3.143: SINGLE-SHIFT THREE */
2438 /*case C1_SS3: scr_single_shift (3); break; */ 3223 /*case C1_SS3: scr_single_shift (3); break; */
2439 3224
2440 /* 8.3.27: DEVICE CONTROL STRING */ 3225 /* 8.3.27: DEVICE CONTROL STRING */
2441 case C1_DCS: /* ESC P */ 3226 case C1_DCS: /* ESC P */
2442 process_dcs_seq (); 3227 process_dcs_seq ();
2443 break; 3228 break;
2444 3229
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3230 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 3231 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 3232 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 3233 break; /* steal obsolete ESC [ c */
2450 3234
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3235 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 3236 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 3237 process_csi_seq ();
… …
2458 process_osc_seq (); 3242 process_osc_seq ();
2459 break; 3243 break;
2460 3244
2461 /* 8.3.106: RESET TO INITIAL STATE */ 3245 /* 8.3.106: RESET TO INITIAL STATE */
2462 case 'c': 3246 case 'c':
3247 mbstate.reset ();
2463 scr_poweron (); 3248 scr_poweron ();
2464 scrollbar_show (1); 3249 scrollbar_show (1);
2465 break; 3250 break;
2466 3251
2467 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3252 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2479 3264
2480/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3265/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2481/* *INDENT-OFF* */ 3266/* *INDENT-OFF* */
2482enum { 3267enum {
2483 CSI_ICH = 0x40, 3268 CSI_ICH = 0x40,
2484 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3269 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 , 3270 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, 3271 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, 3272 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, 3273 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, 3274 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2493 3278
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 3279#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 3280 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 3281 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 3282#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 3283 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 3284
2500const unsigned char csi_defaults[] = 3285const unsigned char csi_defaults[] =
2501 { 3286 {
2502 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 3287 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, */ 3288 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, */ 3289 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, [, \, ], ^, _, */ 3290 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, */ 3291 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, */ 3292 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, */ 3293 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, {, |, }, ~, */ 3294 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2510 }; 3295 };
2511/* *INDENT-ON* */ 3296/* *INDENT-ON* */
2512 3297
2513void 3298void
2514rxvt_term::process_csi_seq () 3299rxvt_term::process_csi_seq ()
2515{ 3300{
2516 unsigned char ch, priv, i; 3301 unicode_t ch, priv, i;
2517 unsigned int nargs, p; 3302 unsigned int nargs, p;
2518 int n, ndef; 3303 int n, ndef;
2519 int arg[ESC_ARGS]; 3304 int arg[ESC_ARGS];
2520 3305
2521 for (nargs = ESC_ARGS; nargs > 0;) 3306 for (nargs = ESC_ARGS; nargs > 0;)
2522 arg[--nargs] = 0; 3307 arg[--nargs] = 0;
2523 3308
2524 priv = 0; 3309 priv = 0;
… …
2526 if (ch >= '<' && ch <= '?') 3311 if (ch >= '<' && ch <= '?')
2527 { /* '<' '=' '>' '?' */ 3312 { /* '<' '=' '>' '?' */
2528 priv = ch; 3313 priv = ch;
2529 ch = cmd_getc (); 3314 ch = cmd_getc ();
2530 } 3315 }
3316
2531 /* read any numerical arguments */ 3317 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 3318 for (n = -1; ch < CSI_ICH; )
2533 { 3319 {
2534 if (isdigit(ch)) 3320 if (isdigit (ch))
2535 { 3321 {
2536 if (n < 0) 3322 if (n < 0)
2537 n = ch - '0'; 3323 n = ch - '0';
2538 else 3324 else
2539 n = n * 10 + ch - '0'; 3325 n = n * 10 + ch - '0';
… …
2542 { 3328 {
2543 if (nargs < ESC_ARGS) 3329 if (nargs < ESC_ARGS)
2544 arg[nargs++] = n; 3330 arg[nargs++] = n;
2545 n = -1; 3331 n = -1;
2546 } 3332 }
2547 else if (ch == '\b') 3333 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); 3334 process_nonprinting (ch);
2559 } 3335
2560 ch = cmd_getc (); 3336 ch = cmd_getc ();
2561 } 3337 }
2562 3338
2563 if (ch > CSI_7F) 3339 if (ch > CSI_7F)
2564 return; 3340 return;
2565 3341
2566 if (nargs < ESC_ARGS) 3342 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 3343 arg[nargs++] = n;
2568 3344
2569 i = ch - CSI_ICH; 3345 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 3346 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 3347 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 3348 if (arg[p] == -1)
2573 arg[p] = ndef; 3349 arg[p] = ndef;
2574 3350
2575#ifdef DEBUG_CMD 3351#ifdef DEBUG_CMD
2576 fprintf(stderr, "CSI "); 3352 fprintf (stderr, "CSI ");
2577 for (p = 0; p < nargs; p++) 3353 for (p = 0; p < nargs; p++)
2578 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 3354 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2579 fprintf(stderr, "%c\n", ch); 3355 fprintf (stderr, "%c\n", ch);
2580#endif 3356#endif
2581 3357
2582 /* 3358 /*
2583 * private mode handling 3359 * private mode handling
2584 */ 3360 */
… …
2586 { 3362 {
2587 switch (priv) 3363 switch (priv)
2588 { 3364 {
2589 case '>': 3365 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 3366 if (ch == CSI_DA) /* secondary device attributes */
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 3367 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2592 break; 3368 break;
2593 case '?': 3369 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3370 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 3371 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 3372 break;
… …
2599 } 3375 }
2600 3376
2601 switch (ch) 3377 switch (ch)
2602 { 3378 {
2603 /* 3379 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 3380 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 3381 */
2606#ifdef PRINTPIPE 3382#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 3383 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 3384 switch (arg[0])
2609 { 3385 {
… …
2701 3477
2702 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3478 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2703 arg[0] = -arg[0]; 3479 arg[0] = -arg[0];
2704 /* FALLTHROUGH */ 3480 /* FALLTHROUGH */
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3481 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3482 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2707 break; 3483 break;
2708 3484
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3485 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 3486 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2711 (unsigned int)(sizeof(VT100_ANS) - 1));
2712 break; 3487 break;
2713 3488
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3489 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 3490 process_sgr_mode (nargs, arg);
2716 break; 3491 break;
2717 3492
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3493 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 3494 switch (arg[0])
2720 { 3495 {
2721 case 5: /* DSR requested */ 3496 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 3497 tt_printf ("\033[0n");
2723 break; 3498 break;
2724 case 6: /* CPR requested */ 3499 case 6: /* CPR requested */
2725 scr_report_position (); 3500 scr_report_position ();
2726 break; 3501 break;
2727#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 3502 case 7: /* unofficial extension */
3503 if (OPTION (Opt_insecure))
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 3504 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2730 break; 3505 break;
2731#endif
2732 case 8: /* unofficial extension */ 3506 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3507 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2734 break; 3508 break;
2735 } 3509 }
2736 break; 3510 break;
2737 3511
2738 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3512 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2771 break; 3545 break;
2772 3546
2773 case CSI_RM: /* 8.3.107: RESET MODE */ 3547 case CSI_RM: /* 8.3.107: RESET MODE */
2774 if (arg[0] == 4) 3548 if (arg[0] == 4)
2775 scr_insert_mode (0); 3549 scr_insert_mode (0);
3550 else if (arg[0] == 20)
3551 priv_modes &= ~PrivMode_LFNL;
2776 break; 3552 break;
2777 3553
2778 case CSI_SM: /* 8.3.126: SET MODE */ 3554 case CSI_SM: /* 8.3.126: SET MODE */
2779 if (arg[0] == 4) 3555 if (arg[0] == 4)
2780 scr_insert_mode (1); 3556 scr_insert_mode (1);
3557 else if (arg[0] == 20)
3558 priv_modes |= PrivMode_LFNL;
2781 break; 3559 break;
2782 3560
2783 /* 3561 /*
2784 * PRIVATE USE beyond this point. All CSI_7? sequences here 3562 * PRIVATE USE beyond this point. All CSI_7? sequences here
2785 */ 3563 */
… …
2797 break; 3575 break;
2798 case CSI_75: 3576 case CSI_75:
2799 scr_cursor (RESTORE); 3577 scr_cursor (RESTORE);
2800 break; 3578 break;
2801 3579
2802#ifndef NO_FRILLS 3580#if ENABLE_FRILLS
2803 case CSI_74: 3581 case CSI_74:
2804 process_window_ops (arg, nargs); 3582 process_window_ops (arg, nargs);
2805 break; 3583 break;
2806#endif 3584#endif
2807 3585
2808 case CSI_78: /* DECREQTPARM */ 3586 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 3587 if (arg[0] == 0 || arg[0] == 1)
2810 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3588 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2811 /* FALLTHROUGH */ 3589 break;
2812 3590
2813 default: 3591 default:
2814 break; 3592 break;
2815 } 3593 }
2816} 3594}
2817/*}}} */ 3595/*}}} */
2818 3596
2819#ifndef NO_FRILLS 3597#if ENABLE_FRILLS
2820/* ARGSUSED */ 3598/* ARGSUSED */
2821void 3599void
2822rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3600rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2823{ 3601{
2824 int x, y; 3602 int x, y;
2825#if 0
2826 char *s;
2827#endif
2828 XWindowAttributes wattr; 3603 XWindowAttributes wattr;
2829 Window wdummy; 3604 Window wdummy;
3605 dDisp;
2830 3606
2831 if (nargs == 0) 3607 if (nargs == 0)
2832 return; 3608 return;
3609
2833 switch (args[0]) 3610 switch (args[0])
2834 { 3611 {
2835 /* 3612 /*
2836 * commands 3613 * commands
2837 */ 3614 */
2838 case 1: /* deiconify window */ 3615 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 3616 XMapWindow (disp, parent[0]);
2840 break; 3617 break;
2841 case 2: /* iconify window */ 3618 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 3619 XIconifyWindow (disp, parent[0], display->screen);
2843 DefaultScreen(Xdisplay));
2844 break; 3620 break;
2845 case 3: /* set position (pixels) */ 3621 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 3622 XMoveWindow (disp, parent[0], args[1], args[2]);
2847 break; 3623 break;
2848 case 4: /* set size (pixels) */ 3624 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3625 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 3626 break;
2851 case 5: /* raise window */ 3627 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 3628 XRaiseWindow (disp, parent[0]);
2853 break; 3629 break;
2854 case 6: /* lower window */ 3630 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 3631 XLowerWindow (disp, parent[0]);
2856 break; 3632 break;
2857 case 7: /* refresh window */ 3633 case 7: /* refresh window */
2858 scr_touch (true); 3634 scr_touch (true);
2859 break; 3635 break;
2860 case 8: /* set size (chars) */ 3636 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3637 set_widthheight ((unsigned int) (args[2] * fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 3638 (unsigned int) (args[1] * fheight));
2863 break; 3639 break;
3640
3641 //case 9: NYI, TODO, restore maximized window or maximize window
2864 default: 3642 default:
2865 if (args[0] >= 24) /* set height (chars) */ 3643 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 3644 set_widthheight ((unsigned int)width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 3645 (unsigned int) (args[1] * fheight));
2868 break; 3646 break;
3647
3648
2869 /* 3649 /*
2870 * reports - some output format copied from XTerm 3650 * reports - some output format copied from XTerm
2871 */ 3651 */
2872 case 11: /* report window state */ 3652 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3654 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 3655 break;
2876 case 13: /* report window position */ 3656 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3657 XGetWindowAttributes (disp, parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 3658 XTranslateCoordinates (disp, parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 3659 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 3660 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 3661 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 3662 break;
2883 case 14: /* report window size (pixels) */ 3663 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3664 XGetWindowAttributes (disp, parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3665 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 3666 break;
3667 case 18: /* report text area size (chars) */
3668 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3669 break;
2887 case 18: /* report window size (chars) */ 3670 case 19: /* report window size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3671 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2889 break; 3672 break;
2890#if 0 /* XXX: currently disabled due to security concerns */
2891 case 20: /* report icon label */ 3673 case 20: /* report icon label */
3674 {
3675 char *s;
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 3676 XGetIconName (disp, parent[0], &s);
2893 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3677 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s);
3679 }
2894 break; 3680 break;
2895 case 21: /* report window title */ 3681 case 21: /* report window title */
3682 {
3683 char *s;
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 3684 XFetchName (disp, parent[0], &s);
2897 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3685 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3686 XFree (s);
3687 }
2898 break; 3688 break;
2899#endif
2900
2901 } 3689 }
2902} 3690}
2903#endif 3691#endif
2904 3692
2905/*----------------------------------------------------------------------*/ 3693/*----------------------------------------------------------------------*/
2906/* 3694/*
2907 * get input up until STRING TERMINATOR (or BEL) 3695 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 3696 * ends_how is terminator used. returned input must be free()'d
2909 */ 3697 */
2910unsigned char * 3698char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 3699rxvt_term::get_to_st (unicode_t &ends_how)
2912{ 3700{
2913 int seen_esc = 0; /* seen escape? */ 3701 unicode_t ch;
3702 bool seen_esc = false;
2914 unsigned int n = 0; 3703 unsigned int n = 0;
2915 unsigned char *s; 3704 wchar_t string[STRING_MAX];
2916 unsigned char ch, string[STRING_MAX];
2917 3705
2918 for (; (ch = cmd_getc ());) 3706 while ((ch = cmd_getc ()) != NOCHAR)
2919 { 3707 {
2920 if (ch == C0_BEL 3708 if (seen_esc)
2921 || ch == CHAR_ST 3709 {
2922 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3710 if (ch == 0x5c) /* 7bit ST */
2923 break; 3711 break;
3712 else
3713 return NULL;
3714 }
2924 if (ch == C0_ESC) 3715 else if (ch == C0_ESC)
2925 { 3716 {
2926 seen_esc = 1; 3717 seen_esc = true;
2927 continue; 3718 continue;
2928 } 3719 }
2929 else if (ch == '\t') 3720 else if (ch == C0_BEL || ch == CHAR_ST)
2930 ch = ' '; /* translate '\t' to space */ 3721 break;
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3722 else if (ch < 0x20)
2932 return NULL; /* other control character - exit */ 3723 return NULL; /* other control character - exit */
2933 if (n < sizeof(string) - 1) 3724
3725 seen_esc = false;
3726
3727 if (n >= STRING_MAX - 1)
3728 // stop at some sane length
3729 return NULL;
3730
3731 if (ch == C0_SYN)
3732 string[n++] = cmd_get8 ();
3733 else
2934 string[n++] = ch; 3734 string[n++] = ch;
2935 seen_esc = 0;
2936 } 3735 }
3736
2937 string[n++] = '\0'; 3737 string[n++] = '\0';
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3738
2939 return NULL;
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3739 ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 3740
2942 return s; 3741 return rxvt_wcstombs (string);
2943} 3742}
2944 3743
2945/*----------------------------------------------------------------------*/ 3744/*----------------------------------------------------------------------*/
2946/* 3745/*
2947 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3746 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2948 */ 3747 */
2949void 3748void
2950rxvt_term::process_dcs_seq () 3749rxvt_term::process_dcs_seq ()
2951{ 3750{
2952 unsigned char eh, *s; 3751 char *s;
3752 unicode_t eh;
3753
2953 /* 3754 /*
2954 * Not handled yet 3755 * Not handled yet
2955 */ 3756 */
2956 s = get_to_st (&eh); 3757 s = get_to_st (eh);
2957 if (s) 3758 if (s)
2958 free(s); 3759 free (s);
3760
2959 return; 3761 return;
2960} 3762}
2961 3763
2962/*----------------------------------------------------------------------*/ 3764/*----------------------------------------------------------------------*/
2963/* 3765/*
2964 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3766 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2965 */ 3767 */
2966void 3768void
2967rxvt_term::process_osc_seq () 3769rxvt_term::process_osc_seq ()
2968{ 3770{
2969 unsigned char ch, eh, *s; 3771 unicode_t ch, eh;
2970 int arg; 3772 int arg;
2971 3773
2972 ch = cmd_getc (); 3774 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3775 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 3776 arg = arg * 10 + (ch - '0');
2975 3777
2976 if (ch == ';') 3778 if (ch == ';')
2977 { 3779 {
2978 s = get_to_st (&eh); 3780 char *s = get_to_st (eh);
3781
2979 if (s) 3782 if (s)
2980 { 3783 {
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); 3784 process_xterm_seq (arg, s, eh);
2993 free(s); 3785 free (s);
2994 } 3786 }
3787 }
3788}
3789
3790void
3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3792{
3793 if (str[0] == '?' && !str[1])
2995 } 3794 {
3795 unsigned short r, g, b;
3796 pix_colors_focused[color].get (display, r, g, b);
3797 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3798 }
3799 else
3800 set_window_color (color, str);
2996} 3801}
3802
2997/* 3803/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3804 * 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 */ 3805 */
3018void 3806void
3019rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3807rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3020{ 3808{
3021 int changed = 0; 3809 int changed = 0;
3022 int color; 3810 int color;
3023 char *buf, *name; 3811 char *buf, *name;
3812 bool query = str[0] == '?' && !str[1];
3813 int saveop = op;
3814 dDisp;
3024 3815
3025 assert(str != NULL); 3816 assert (str != NULL);
3026 switch (op) 3817 switch (op)
3027 { 3818 {
3028 case XTerm_name: 3819 case XTerm_name:
3029 set_title (str); 3820 set_title (str);
3030 /* FALLTHROUGH */ 3821 /* FALLTHROUGH */
3031 case XTerm_iconName: 3822 case XTerm_iconName:
3032 set_iconName (str); 3823 set_icon_name (str);
3033 break; 3824 break;
3034 case XTerm_title: 3825 case XTerm_title:
3035 set_title (str); 3826 set_title (str);
3036 break; 3827 break;
3828 case XTerm_property:
3829 if (str[0] == '?')
3830 {
3831 Atom prop = display->atom (str + 1);
3832 Atom actual_type;
3833 int actual_format;
3834 unsigned long nitems;
3835 unsigned long bytes_after;
3836 unsigned char *value = 0;
3837 const char *str = "";
3838
3839 if (prop
3840 && XGetWindowProperty (disp, parent[0],
3841 prop, 0, 1<<16, 0, AnyPropertyType,
3842 &actual_type, &actual_format,
3843 &nitems, &bytes_after, &value) == Success
3844 && actual_type != None
3845 && actual_format == 8)
3846 str = (const char *)(value);
3847
3848 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3849
3850 XFree (value);
3851 }
3852 else
3853 {
3854 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3855
3856 if (eq)
3857 {
3858 *eq = 0;
3859 set_utf8_property (display->atom (str), eq + 1);
3860 }
3861 else
3862 XDeleteProperty (disp, parent[0],
3863 display->atom (str));
3864 }
3865 break;
3866
3037 case XTerm_Color: 3867 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 3868 for (buf = (char *)str; buf && *buf;)
3039 { 3869 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 3870 if ((name = strchr (buf, ';')) == NULL)
3041 break; 3871 break;
3872
3042 *name++ = '\0'; 3873 *name++ = '\0';
3043 color = atoi(buf); 3874 color = atoi (buf);
3875
3044 if (color < 0 || color >= TOTAL_COLORS) 3876 if (color < 0 || color >= TOTAL_COLORS)
3045 break; 3877 break;
3878
3046 if ((buf = STRCHR(name, ';')) != NULL) 3879 if ((buf = strchr (name, ';')) != NULL)
3047 *buf++ = '\0'; 3880 *buf++ = '\0';
3881
3882 if (name[0] == '?' && !name[1])
3883 {
3884 unsigned short r, g, b;
3885 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3886 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887 }
3888 else
3048 set_window_color (color + minCOLOR, name); 3889 set_window_color (color + minCOLOR, name);
3049 } 3890 }
3891 break;
3892 case XTerm_Color00:
3893 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3894 break;
3895 case XTerm_Color01:
3896 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3050 break; 3897 break;
3051#ifndef NO_CURSORCOLOR 3898#ifndef NO_CURSORCOLOR
3052 case XTerm_Color_cursor: 3899 case XTerm_Color_cursor:
3053 set_window_color (Color_cursor, str); 3900 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3054 break; 3901 break;
3055#endif 3902#endif
3056 case XTerm_Color_pointer: 3903 case XTerm_Color_pointer_fg:
3057 set_window_color (Color_pointer, str); 3904 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3905 break;
3906 case XTerm_Color_pointer_bg:
3907 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3058 break; 3908 break;
3059#ifndef NO_BOLD_UNDERLINE_REVERSE 3909#ifndef NO_BOLD_UNDERLINE_REVERSE
3060 case XTerm_Color_BD: 3910 case XTerm_Color_BD:
3061 set_window_color (Color_BD, str); 3911 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3062 break; 3912 break;
3063 case XTerm_Color_UL: 3913 case XTerm_Color_UL:
3064 set_window_color (Color_UL, str); 3914 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3065 break; 3915 break;
3066 case XTerm_Color_RV: 3916 case XTerm_Color_RV:
3067 set_window_color (Color_RV, str); 3917 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3068 break; 3918 break;
3069#endif 3919 case URxvt_Color_IT:
3070 3920 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; 3921 break;
3922#endif
3923#if TRANSPARENT && TINTING
3924 case URxvt_Color_tint:
3925 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3926 check_our_parents ();
3927 if (am_transparent)
3928 want_full_refresh = want_refresh = 1;
3929 break;
3930#endif
3931
3077 case XTerm_Pixmap: 3932 case XTerm_Pixmap:
3078 if (*str != ';') 3933 if (*str != ';')
3079 { 3934 {
3080#if XPM_BACKGROUND 3935#if XPM_BACKGROUND
3081 scale_pixmap (""); /* reset to default scaling */ 3936 scale_pixmap (""); /* reset to default scaling */
3082 set_bgPixmap (str); /* change pixmap */ 3937 set_bgPixmap (str); /* change pixmap */
3083#endif 3938#endif
3084 scr_touch (true); 3939 scr_touch (true);
3085 } 3940 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3941 while ((str = strchr (str, ';')) != NULL)
3087 { 3942 {
3088 str++; 3943 str++;
3089#if XPM_BACKGROUND 3944#if XPM_BACKGROUND
3090 changed += scale_pixmap (str); 3945 changed += scale_pixmap (str);
3091#endif 3946#endif
3092
3093 } 3947 }
3948
3094 if (changed) 3949 if (changed)
3095 { 3950 {
3096#ifdef XPM_BACKGROUND 3951#ifdef XPM_BACKGROUND
3097 resize_pixmap (); 3952 resize_pixmap ();
3098#endif 3953#endif
… …
3104 set_window_color (Color_fg, str); 3959 set_window_color (Color_fg, str);
3105 break; 3960 break;
3106 case XTerm_restoreBG: 3961 case XTerm_restoreBG:
3107 set_window_color (Color_bg, str); 3962 set_window_color (Color_bg, str);
3108 break; 3963 break;
3964
3109 case XTerm_logfile: 3965 case XTerm_logfile:
3966 // TODO, when secure mode?
3967 break;
3968
3969#ifdef MENUBAR
3970 case URxvt_Menu:
3971 if (OPTION (Opt_insecure))
3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3110 break; 3973 break;
3111 case XTerm_font: 3974#endif
3112 change_font (0, str);
3113 break;
3114#if 0 3975#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3976 case XTerm_dumpscreen: /* no error notices */
3116 { 3977 {
3117 int fd; 3978 int fd;
3118 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3979 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3980 {
3120 scr_dump (fd); 3981 scr_dump (fd);
3121 close(fd); 3982 close (fd);
3122 } 3983 }
3123 } 3984 }
3124 break; 3985 break;
3125#endif 3986#endif
3987 case XTerm_font:
3988 op = URxvt_font;
3989 case URxvt_font:
3990#if ENABLE_STYLES
3991 case URxvt_boldFont:
3992 case URxvt_italicFont:
3993 case URxvt_boldItalicFont:
3994#endif
3995 if (query)
3996 tt_printf ("\33]%d;%-.250s%c", saveop,
3997 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3998 ? fontset[op - URxvt_font]->fontdesc : "",
3999 resp);
4000 else
4001 {
4002 const char *&res = rs[Rs_font + (op - URxvt_font)];
3126 4003
4004 res = strdup (str);
4005 allocated.push_back ((void *)res);
4006 set_fonts ();
4007 }
4008 break;
4009
4010#if ENABLE_FRILLS
4011 case URxvt_locale:
4012 if (query)
4013 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4014 else
4015 {
4016 set_locale (str);
4017 pty.set_utf8_mode (enc_utf8);
4018 init_xlocale ();
4019 }
4020 break;
4021
4022 case URxvt_view_up:
4023 case URxvt_view_down:
4024 {
4025 int lines = atoi (str);
4026
4027 if (lines)
4028 scr_page (op == URxvt_view_up ? UP : DN, lines);
4029 else
4030 scr_erase_savelines ();
4031 }
4032
4033 break;
4034#endif
4035
4036#if ENABLE_PERL
4037 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4039 ; // no responses yet
4040 break;
4041#endif
3127 } 4042 }
3128} 4043}
3129/*----------------------------------------------------------------------*/ 4044/*----------------------------------------------------------------------*/
3130 4045
3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4046/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3139 * so no need for fancy checking 4054 * so no need for fancy checking
3140 */ 4055 */
3141int 4056int
3142rxvt_term::privcases (int mode, unsigned long bit) 4057rxvt_term::privcases (int mode, unsigned long bit)
3143{ 4058{
3144 int state; 4059 int state;
3145 4060
3146 if (mode == 's') 4061 if (mode == 's')
3147 { 4062 {
3148 SavedModes |= (PrivateModes & bit); 4063 SavedModes |= (priv_modes & bit);
3149 return -1; 4064 return -1;
3150 } 4065 }
3151 else 4066 else
3152 { 4067 {
3153 if (mode == 'r') 4068 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4069 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 4070 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 4071 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3157 PrivMode(state, bit); 4072 PrivMode (state, bit);
3158 } 4073 }
4074
3159 return state; 4075 return state;
3160} 4076}
3161 4077
3162/* we're not using priv _yet_ */ 4078/* we're not using priv _yet_ */
3163void 4079void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 4080rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3165{ 4081{
3166 unsigned int i, j; 4082 unsigned int i, j;
3167 int state; 4083 int state;
4084
3168 static const struct 4085 static const struct
3169 { 4086 {
3170 const int argval; 4087 const int argval;
3171 const unsigned long bit; 4088 const unsigned long bit;
3172 } 4089 }
4090
3173 argtopriv[] = { 4091 argtopriv[] = {
3174 { 1, PrivMode_aplCUR }, 4092 { 1, PrivMode_aplCUR },
3175 { 2, PrivMode_vt52 }, 4093 { 2, PrivMode_vt52 },
3176 { 3, PrivMode_132 }, 4094 { 3, PrivMode_132 },
3177 { 4, PrivMode_smoothScroll }, 4095 { 4, PrivMode_smoothScroll },
3178 { 5, PrivMode_rVideo }, 4096 { 5, PrivMode_rVideo },
3179 { 6, PrivMode_relOrigin }, 4097 { 6, PrivMode_relOrigin },
3180 { 7, PrivMode_Autowrap }, 4098 { 7, PrivMode_Autowrap },
4099 // 8, bi-directional support mode
3181 { 9, PrivMode_MouseX10 }, 4100 { 9, PrivMode_MouseX10 },
3182#ifdef menuBar_esc 4101#ifdef menuBar_esc
3183 { menuBar_esc, PrivMode_menuBar }, 4102 { menuBar_esc, PrivMode_menuBar },
3184#endif 4103#endif
4104 // 18, 19 printing-related
4105 { 25, PrivMode_VisibleCursor },
3185#ifdef scrollBar_esc 4106#ifdef scrollBar_esc
3186 { scrollBar_esc, PrivMode_scrollBar }, 4107 { scrollBar_esc, PrivMode_scrollBar },
3187#endif 4108#endif
3188 { 25, PrivMode_VisibleCursor },
3189 { 35, PrivMode_ShiftKeys }, 4109 { 35, PrivMode_ShiftKeys }, // rxvt extension
3190 { 40, PrivMode_132OK }, 4110 { 40, PrivMode_132OK },
4111 // 41 xterm more fixes NYI
4112 // 45 margin bell NYI
4113 // 46 start logging
3191 { 47, PrivMode_Screen }, 4114 { 47, PrivMode_Screen },
3192 { 66, PrivMode_aplKP }, 4115 { 66, PrivMode_aplKP },
3193#ifndef NO_BACKSPACE_KEY 4116#ifndef NO_BACKSPACE_KEY
3194 { 67, PrivMode_BackSpace }, 4117 { 67, PrivMode_BackSpace },
3195#endif 4118#endif
3196 { 1000, PrivMode_MouseX11 }, 4119 { 1000, PrivMode_MouseX11 },
4120 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4121 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4122 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3197 { 1010, PrivMode_TtyOutputInh }, 4123 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3198 { 1011, PrivMode_Keypress }, 4124 { 1011, PrivMode_Keypress }, // rxvt extension
4125 // 1035 enable modifiers for alt, numlock NYI
4126 // 1036 send ESC for meta keys NYI
4127 // 1037 send DEL for keypad delete NYI
3199 { 1047, PrivMode_Screen }, 4128 { 1047, PrivMode_Screen },
4129 // 1048 save and restore cursor
3200 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4130 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4131 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3201 }; 4132 };
3202 4133
3203 if (nargs == 0) 4134 if (nargs == 0)
3204 return; 4135 return;
3205 4136
… …
3212 for (i = 0; i < nargs; i++) 4143 for (i = 0; i < nargs; i++)
3213 { 4144 {
3214 state = -1; 4145 state = -1;
3215 4146
3216 /* basic handling */ 4147 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 4148 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 4149 if (argtopriv[j].argval == arg[i])
3219 { 4150 {
3220 state = privcases (mode, argtopriv[j].bit); 4151 state = privcases (mode, argtopriv[j].bit);
3221 break; 4152 break;
3222 } 4153 }
3223 4154
3224 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
3225 if (state == -1)
3226 switch (arg[i]) 4156 switch (arg[i])
3227 { 4157 {
4158#if ENABLE_STYLES
4159 case 1021:
4160 set_option (Opt_intensityStyles, mode);
4161
4162 scr_touch (true);
4163 break;
4164#endif
3228 case 1048: /* alternative cursor save */ 4165 case 1048: /* alternative cursor save */
4166 case 1049:
4167 if (OPTION (Opt_secondaryScreen))
3229 if (mode == 0) 4168 if (mode == 0)
3230 scr_cursor (RESTORE); 4169 scr_cursor (RESTORE);
3231 else if (mode == 1) 4170 else if (mode == 1)
3232 scr_cursor (SAVE); 4171 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; 4172 break;
4173 }
4174
4175 if (state >= 0)
4176 /* extra handling for values with valid 0 or 1 state */
4177 switch (arg[i])
4178 {
4179 /* case 1: - application cursor keys */
4180 case 2: /* VT52 mode */
4181 /* oddball mode. should be set regardless of set/reset
4182 * parameter. Return from VT52 mode with an ESC < from
4183 * within VT52 mode
4184 */
4185 PrivMode (1, PrivMode_vt52);
4186 break;
3249 case 3: /* 80/132 */ 4187 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 4188 if (priv_modes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 4189 set_widthheight (((state ? 132 : 80) * fwidth), height);
3252 (unsigned int)TermWin.height);
3253 break; 4190 break;
3254 case 4: /* smooth scrolling */ 4191 case 4: /* smooth scrolling */
3255 if (state)
3256 Options &= ~Opt_jumpScroll;
3257 else
3258 Options |= Opt_jumpScroll; 4192 set_option (Opt_jumpScroll, !state);
3259 break; 4193 break;
3260 case 5: /* reverse video */ 4194 case 5: /* reverse video */
3261 scr_rvideo_mode (state); 4195 scr_rvideo_mode (state);
3262 break; 4196 break;
3263 case 6: /* relative/absolute origins */ 4197 case 6: /* relative/absolute origins */
3264 scr_relative_origin (state); 4198 scr_relative_origin (state);
3265 break; 4199 break;
3266 case 7: /* autowrap */ 4200 case 7: /* autowrap */
3267 scr_autowrap (state); 4201 scr_autowrap (state);
3268 break; 4202 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 4203 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 4204 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 4205 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 4206 priv_modes &= ~PrivMode_MouseX11;
3273 break; 4207 break;
3274#ifdef menuBar_esc 4208#ifdef menuBar_esc
3275 case menuBar_esc: 4209 case menuBar_esc:
3276#ifdef MENUBAR 4210#ifdef MENUBAR
3277 map_menuBar (state); 4211 map_menuBar (state);
3278#endif 4212#endif
3279 break; 4213 break;
3280#endif 4214#endif
3281#ifdef scrollBar_esc 4215#ifdef scrollBar_esc
3282 case scrollBar_esc: 4216 case scrollBar_esc:
3283 if (scrollbar_mapping (state)) 4217 if (scrollbar_mapping (state))
3284 { 4218 {
3285 resize_all_windows (0, 0, 0); 4219 resize_all_windows (0, 0, 0);
3286 scr_touch (true); 4220 scr_touch (true);
3287 } 4221 }
3288 break; 4222 break;
3289#endif 4223#endif
3290 case 25: /* visible/invisible cursor */ 4224 case 25: /* visible/invisible cursor */
3291 scr_cursor_visible (state); 4225 scr_cursor_visible (state);
3292 break; 4226 break;
3293 /* case 35: - shift keys */ 4227 /* case 35: - shift keys */
3294 /* case 40: - 80 <--> 132 mode */ 4228 /* case 40: - 80 <--> 132 mode */
3295 case 47: /* secondary screen */ 4229 case 47: /* secondary screen */
3296 scr_change_screen (state); 4230 scr_change_screen (state);
3297 break; 4231 break;
3298 /* case 66: - application key pad */ 4232 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 4233 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 4234 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 4235 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 4236 priv_modes &= ~PrivMode_MouseX10;
3303 break; 4237 break;
3304#if 0 4238#if 0
3305 case 1001: 4239 case 1001:
3306 break; /* X11 mouse highlighting */ 4240 break; /* X11 mouse highlighting */
3307#endif 4241#endif
3308 case 1010: /* scroll to bottom on TTY output inhibit */ 4242 case 1010: /* scroll to bottom on TTY output inhibit */
3309 if (state)
3310 Options &= ~Opt_scrollTtyOutput;
3311 else
3312 Options |= Opt_scrollTtyOutput; 4243 set_option (Opt_scrollTtyOutput, !state);
3313 break; 4244 break;
3314 case 1011: /* scroll to bottom on key press */ 4245 case 1011: /* scroll to bottom on key press */
3315 if (state)
3316 Options |= Opt_scrollTtyKeypress; 4246 set_option (Opt_scrollTtyKeypress, state);
3317 else
3318 Options &= ~Opt_scrollTtyKeypress;
3319 break; 4247 break;
3320 case 1047: /* secondary screen w/ clearing */ 4248 case 1047: /* secondary screen w/ clearing last */
3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4249 if (OPTION (Opt_secondaryScreen))
3322 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
3323 scr_erase_screen (2); 4251 scr_erase_screen (2);
3324 scr_change_screen (state); 4252 scr_change_screen (state);
3325 /* FALLTHROUGH */
3326 default:
3327 break; 4253 break;
4254 case 1049: /* secondary screen w/ clearing first */
4255 scr_change_screen (state);
4256 if (OPTION (Opt_secondaryScreen))
4257 if (current_screen != PRIMARY)
4258 scr_erase_screen (2);
4259 break;
4260 default:
4261 break;
3328 } 4262 }
3329 } 4263 }
3330} 4264}
3331/*}}} */ 4265/*}}} */
3332 4266
3333/*{{{ process sgr sequences */ 4267/*{{{ process sgr sequences */
3334void 4268void
3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4269rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3336{ 4270{
3337 unsigned int i; 4271 unsigned int i;
3338 short rendset; 4272 short rendset;
3339 int rendstyle; 4273 int rendstyle;
3340 4274
3341 if (nargs == 0) 4275 if (nargs == 0)
3342 { 4276 {
3343 scr_rendition (0, ~RS_None); 4277 scr_rendition (0, ~RS_None);
3344 return; 4278 return;
3345 } 4279 }
4280
3346 for (i = 0; i < nargs; i++) 4281 for (i = 0; i < nargs; i++)
3347 { 4282 {
3348 rendset = -1; 4283 rendset = -1;
3349 switch (arg[i]) 4284 switch (arg[i])
3350 { 4285 {
… …
3352 rendset = 0, rendstyle = ~RS_None; 4287 rendset = 0, rendstyle = ~RS_None;
3353 break; 4288 break;
3354 case 1: 4289 case 1:
3355 rendset = 1, rendstyle = RS_Bold; 4290 rendset = 1, rendstyle = RS_Bold;
3356 break; 4291 break;
4292 //case 2: // low intensity
4293 case 3:
4294 rendset = 1, rendstyle = RS_Italic;
4295 break;
3357 case 4: 4296 case 4:
3358 rendset = 1, rendstyle = RS_Uline; 4297 rendset = 1, rendstyle = RS_Uline;
3359 break; 4298 break;
3360 case 5: 4299 case 5: // slowly blinking
4300 case 6: // rapidly blinking
3361 rendset = 1, rendstyle = RS_Blink; 4301 rendset = 1, rendstyle = RS_Blink;
3362 break; 4302 break;
4303 //case 6: // scoansi light background
3363 case 7: 4304 case 7:
3364 rendset = 1, rendstyle = RS_RVid; 4305 rendset = 1, rendstyle = RS_RVid;
3365 break; 4306 break;
3366 case 22: 4307 case 8:
4308 // invisible. NYI
4309 break;
4310 //case 9: // crossed out
4311 //case 10: // scoansi acs off, primary font
4312 //case 11: // scoansi acs on, first alt font
4313 //case 12: // scoansi acs on, |0x80, second alt font
4314 //...
4315 //case 19: // ninth alt font
4316 //case 20: // gothic
4317 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3367 rendset = 0, rendstyle = RS_Bold; 4318 rendset = 0, rendstyle = RS_Bold;
4319 break;
4320 case 22: // normal intensity
4321 rendset = 0, rendstyle = RS_Bold;
4322 break;
4323 case 23: // disable italic
4324 rendset = 0, rendstyle = RS_Italic;
3368 break; 4325 break;
3369 case 24: 4326 case 24:
3370 rendset = 0, rendstyle = RS_Uline; 4327 rendset = 0, rendstyle = RS_Uline;
3371 break; 4328 break;
3372 case 25: 4329 case 25:
3373 rendset = 0, rendstyle = RS_Blink; 4330 rendset = 0, rendstyle = RS_Blink;
3374 break; 4331 break;
4332 case 26: // variable spacing (iso 8613)
4333 rendset = 0, rendstyle = RS_Blink;
4334 break;
3375 case 27: 4335 case 27:
3376 rendset = 0, rendstyle = RS_RVid; 4336 rendset = 0, rendstyle = RS_RVid;
3377 break; 4337 break;
4338 //case 28: // visible. NYI
4339 //case 29: // not crossed-out
3378 } 4340 }
4341
3379 if (rendset != -1) 4342 if (rendset != -1)
3380 { 4343 {
3381 scr_rendition (rendset, rendstyle); 4344 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 4345 continue; /* for (;i;) */
3383 } 4346 }
3384 4347
3385 switch (arg[i]) 4348 switch (arg[i])
3386 { 4349 {
3387 case 30: 4350 case 30:
… …
3390 case 33: 4353 case 33:
3391 case 34: 4354 case 34:
3392 case 35: 4355 case 35:
3393 case 36: 4356 case 36:
3394 case 37: 4357 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 4358 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3396 Color_fg);
3397 break; 4359 break;
3398#ifdef TTY_256COLOR 4360 case 38: // set fg color, ISO 8613-6
3399 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 4361 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 4362 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4363 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3403 Color_fg);
3404 i += 2; 4364 i += 2;
3405 } 4365 }
3406 break; 4366 break;
3407#endif
3408 case 39: /* default fg */ 4367 case 39: /* default fg */
3409 scr_color (Color_fg, Color_fg); 4368 scr_color (Color_fg, Color_fg);
3410 break; 4369 break;
3411 4370
3412 case 40: 4371 case 40:
… …
3415 case 43: 4374 case 43:
3416 case 44: 4375 case 44:
3417 case 45: 4376 case 45:
3418 case 46: 4377 case 46:
3419 case 47: 4378 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 4379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3421 Color_bg);
3422 break; 4380 break;
3423#ifdef TTY_256COLOR 4381 case 48: // set bg color, ISO 8613-6
3424 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 4382 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 4383 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4384 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3428 Color_bg);
3429 i += 2; 4385 i += 2;
3430 } 4386 }
3431 break; 4387 break;
3432#endif
3433 case 49: /* default bg */ 4388 case 49: /* default bg */
3434 scr_color (Color_bg, Color_bg); 4389 scr_color (Color_bg, Color_bg);
3435 break; 4390 break;
3436 4391
3437#ifndef NO_BRIGHTCOLOR 4392 //case 50: // not variable spacing
4393
4394#if ENABLE_FRILLS
3438 case 90: 4395 case 90:
3439 case 91: /* set bright fg color */ 4396 case 91: /* set bright fg color */
3440 case 92: 4397 case 92:
3441 case 93: 4398 case 93:
3442 case 94: 4399 case 94:
3443 case 95: 4400 case 95:
3444 case 96: 4401 case 96:
3445 case 97: 4402 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 4403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3447 Color_fg);
3448 break; 4404 break;
3449 case 100: 4405 case 100:
3450 case 101: /* set bright bg color */ 4406 case 101: /* set bright bg color */
3451 case 102: 4407 case 102:
3452 case 103: 4408 case 103:
3453 case 104: 4409 case 104:
3454 case 105: 4410 case 105:
3455 case 106: 4411 case 106:
3456 case 107: 4412 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 4413 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3458 Color_bg);
3459 break; 4414 break;
3460#endif 4415#endif
3461
3462 } 4416 }
3463 } 4417 }
3464} 4418}
3465/*}}} */ 4419/*}}} */
3466 4420
3467/*{{{ process Rob Nation's own graphics mode sequences */ 4421/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3468void 4422void
3469rxvt_term::process_graphics () 4423rxvt_term::process_graphics ()
3470{ 4424{
3471 unsigned char ch, cmd = cmd_getc (); 4425 unicode_t ch, cmd = cmd_getc ();
3472 4426
3473#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 4427 if (cmd == 'Q')
3475 { /* query graphics */ 4428 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 4429 tt_printf ("\033G0\012"); /* no graphics */
3477 return; 4430 return;
3478 } 4431 }
3479 /* swallow other graphics sequences until terminating ':' */ 4432 /* swallow other graphics sequences until terminating ':' */
3480 do 4433 do
3481 ch = cmd_getc (); 4434 ch = cmd_getc ();
3482 while (ch != ':'); 4435 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} 4436}
3529/*}}} */ 4437/*}}} */
3530 4438
3531/* ------------------------------------------------------------------------- */ 4439/* ------------------------------------------------------------------------- */
3532 4440
3533/* 4441/*
3534 * Send printf() formatted output to the command. 4442 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 4443 * Only use for small amounts of data.
3536 */ 4444 */
3537void 4445void
3538rxvt_term::tt_printf (const char *fmt,...) 4446rxvt_term::tt_printf (const char *fmt,...)
3539{ 4447{
3540 va_list arg_ptr; 4448 va_list arg_ptr;
3541 unsigned char buf[256]; 4449 char buf[256];
3542 4450
3543 va_start (arg_ptr, fmt); 4451 va_start (arg_ptr, fmt);
3544 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4452 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3545 va_end (arg_ptr); 4453 va_end (arg_ptr);
3546 tt_write (buf, STRLEN (buf)); 4454 tt_write (buf, strlen (buf));
3547} 4455}
3548 4456
3549/* ---------------------------------------------------------------------- */ 4457/* ---------------------------------------------------------------------- */
3550/* Write data to the pty as typed by the user, pasted with the mouse, 4458/* 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. 4459 * or generated by us in response to a query ESC sequence.
3552 */ 4460 */
4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462
3553void 4463void
3554rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4464rxvt_term::tt_write (const char *data, unsigned int len)
3555{ 4465{
3556 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4466 if (pty.pty < 0)
4467 return;
3557 4468
3558 if (len) 4469 if (v_buflen == 0)
4470 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4472
4473 if ((unsigned int)written == len)
4474 return;
4475
4476 data += written;
4477 len -= written;
3559 { 4478 }
4479
4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4481
4482 memcpy (v_buffer + v_buflen, data, len);
4483 v_buflen += len;
4484
4485 pty_ev.set (EVENT_READ | EVENT_WRITE);
4486}
4487
4488void rxvt_term::pty_write ()
4489{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491
4492 if (written > 0)
4493 {
4494 v_buflen -= written;
4495
3560 if (v_buflen == 0) 4496 if (v_buflen == 0)
3561 { 4497 {
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); 4498 free (v_buffer);
3589 v_buffer = 0; 4499 v_buffer = 0;
3590 v_buflen = 0; 4500 v_buflen = 0;
3591 4501
3592 pty_ev.set (EVENT_READ); 4502 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; 4503 return;
3605 } 4504 }
4505
4506 memmove (v_buffer, v_buffer + written, v_buflen);
3606 } 4507 }
4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4509 pty_ev.set (EVENT_READ);
3607} 4510}
3608 4511
3609/*----------------------- end-of-file (C source) -----------------------*/ 4512/*----------------------- end-of-file (C source) -----------------------*/
3610 4513

Diff Legend

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