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

Diff Legend

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