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

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

Diff Legend

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