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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC

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

Diff Legend

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