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

Diff Legend

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