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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.39 by pcg, Mon Feb 9 07:15:46 2004 UTC vs.
Revision 1.252 by root, Mon Jan 9 22:41:41 2006 UTC

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

Diff Legend

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