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

Diff Legend

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