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.201 by root, Mon Feb 21 19:26:07 2005 UTC

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

Diff Legend

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