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

Diff Legend

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