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

Diff Legend

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