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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.39 by pcg, Mon Feb 9 07:15:46 2004 UTC vs.
Revision 1.232 by root, Wed Jan 4 01:10:08 2006 UTC

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

Diff Legend

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