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

Diff Legend

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