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

Diff Legend

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