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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.224 by root, Sun Jan 1 06:18:20 2006 UTC

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

Diff Legend

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