ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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