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.39 by pcg, Mon Feb 9 07:15:46 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;
… …
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 (display->display); 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} 973}
769 974
770#ifdef CURSOR_BLINK 975#ifdef CURSOR_BLINK
771void 976void
… …
789 w.start (w.at + TEXT_BLINK_INTERVAL); 994 w.start (w.at + TEXT_BLINK_INTERVAL);
790 } 995 }
791} 996}
792#endif 997#endif
793 998
999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1000void
1001rxvt_term::cont_scroll_cb (time_watcher &w)
1002{
1003 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1004 scr_page (scrollbar_isUp() ? UP : DN, 1))
1005 {
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1009 }
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
1045
794bool 1046bool
795rxvt_term::pty_fill () 1047rxvt_term::pty_fill ()
796{ 1048{
797 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 }
798 1056
799 memmove (cmdbuf_base, cmdbuf_ptr, n); 1057 memmove (cmdbuf_base, cmdbuf_ptr, n);
800 cmdbuf_ptr = cmdbuf_base; 1058 cmdbuf_ptr = cmdbuf_base;
801 cmdbuf_endp = cmdbuf_ptr + n; 1059 cmdbuf_endp = cmdbuf_ptr + n;
802 1060
803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
804 1062
805 if (n > 0) 1063 if (n > 0)
806 { 1064 {
807 cmdbuf_endp += n; 1065 cmdbuf_endp += n;
808 return true; 1066 return true;
809 } 1067 }
810 else if (n < 0 && errno != EAGAIN) 1068 else if (n < 0 && errno != EAGAIN)
811 destroy (); 1069 destroy ();
812 1070
813 return false; 1071 return false;
814} 1072}
815 1073
816void 1074void
817rxvt_term::pty_cb (io_watcher &w, short revents) 1075rxvt_term::pty_cb (io_watcher &w, short revents)
818{ 1076{
819 SET_R (this); 1077 SET_R (this);
820 SET_LOCALE (locale); 1078 SET_LOCALE (locale);
821 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
822 if (revents & EVENT_WRITE) 1086 if (revents & EVENT_WRITE)
823 tt_write (0, 0); 1087 pty_write ();
824 else if (revents & EVENT_READ)
825 {
826 bool flag = true;
827
828 // loop, but don't allow a single term to monopolize us
829 // the number of loops is fully arbitrary, and thus wrong
830 while (flag && pty_fill ())
831 {
832 if (!seen_input)
833 {
834 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */
836 tt_winch ();
837 }
838
839 uint32_t ch = NOCHAR;
840
841 for (;;)
842 {
843 if (ch == NOCHAR)
844 ch = next_char ();
845
846 if (ch == NOCHAR) // TODO: improve
847 break;
848
849 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
850 {
851 /* Read a text string from the input buffer */
852 uint32_t buf[BUFSIZ];
853 bool refreshnow = false;
854 int nlines = 0;
855 uint32_t *str = buf;
856
857 *str++ = ch;
858
859 for (;;)
860 {
861 ch = next_char ();
862
863 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
864 break;
865 else
866 {
867 *str++ = ch;
868
869 if (ch == '\n')
870 {
871 nlines++;
872 refresh_count++;
873
874 if (!(Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 {
877 refreshnow = true;
878 flag = false;
879 ch = NOCHAR;
880 break;
881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
889 }
890 }
891
892 if (str >= buf + BUFSIZ)
893 {
894 ch = NOCHAR;
895 break;
896 }
897 }
898 }
899
900 scr_add_lines (buf, nlines, str - buf);
901
902 /*
903 * If there have been a lot of new lines, then update the screen
904 * What the heck I'll cheat and only refresh less than every page-full.
905 * the number of pages between refreshes is refresh_limit, which
906 * is incremented here because we must be doing flat-out scrolling.
907 *
908 * refreshing should be correct for small scrolls, because of the
909 * time-out
910 */
911 if (refreshnow)
912 {
913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
914 refresh_limit++;
915
916 scr_refresh (refresh_type);
917 }
918
919 }
920 else
921 {
922 switch (ch)
923 {
924 default:
925 process_nonprinting (ch);
926 break;
927 case C0_ESC: /* escape char */
928 process_escape_seq ();
929 break;
930 /*case 0x9b: */ /* CSI */
931 /* process_csi_seq (); */
932 }
933
934 ch = NOCHAR;
935 }
936 }
937 }
938 }
939} 1088}
940 1089
941// read the next character, currently handles UTF-8 1090void
942// will probably handle all sorts of other stuff in the future 1091rxvt_term::pointer_unblank ()
943uint32_t
944rxvt_term::next_char ()
945{ 1092{
946 while (cmdbuf_ptr < cmdbuf_endp) 1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
947 { 1094 recolour_cursor ();
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
949 return *cmdbuf_ptr++;
950 1095
951 wchar_t wc; 1096#ifdef POINTER_BLANK
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 1097 hidden_pointer = 0;
953 1098
954 if (len == (size_t)-2) 1099 if (options & Opt_pointerBlank)
955 return NOCHAR; 1100 pointer_ev.start (NOW + pointerBlankDelay);
956 1101#endif
957 if (len == (size_t)-1)
958 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
959
960 // assume wchar == unicode
961 cmdbuf_ptr += len;
962 return wc;
963 }
964
965 return NOCHAR;
966}
967
968/* rxvt_cmd_getc() - Return next input character */
969/*
970 * Return the next input character after first passing any keyboard input
971 * to the command.
972 */
973uint32_t
974rxvt_term::cmd_getc ()
975{
976 for (;;)
977 {
978 uint32_t c = next_char ();
979 if (c != NOCHAR)
980 return c;
981
982 // incomplete sequences should occur rarely, still, a better solution
983 // would be preferred. either setjmp/longjmp or better design.
984 fcntl (cmd_fd, F_SETFL, 0);
985 pty_fill ();
986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
987 }
988} 1102}
989 1103
990#ifdef POINTER_BLANK 1104#ifdef POINTER_BLANK
991void 1105void
992rxvt_term::pointer_unblank ()
993{
994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
995 recolour_cursor ();
996
997 hidden_pointer = 0;
998
999 if (Options & Opt_pointerBlank)
1000 pointer_ev.start (NOW + pointerBlankDelay);
1001}
1002
1003void
1004rxvt_term::pointer_blank () 1106rxvt_term::pointer_blank ()
1005{ 1107{
1006 if (!(Options & Opt_pointerBlank)) 1108 if (! (options & Opt_pointerBlank))
1007 return; 1109 return;
1008 1110
1009 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1010 XFlush (display->display); 1112 XFlush (display->display);
1011 1113
1012 hidden_pointer = 1; 1114 hidden_pointer = 1;
1013} 1115}
1014 1116
… …
1021 pointer_blank (); 1123 pointer_blank ();
1022} 1124}
1023#endif 1125#endif
1024 1126
1025void 1127void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 1128rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 1129{
1028 int button_number, key_state = 0; 1130 int button_number, key_state = 0;
1029 int x, y; 1131 int x, y;
1030 1132
1031 x = ev.x; 1133 x = ev.x;
1032 y = ev.y; 1134 y = ev.y;
1033 pixel_position (&x, &y); 1135 pixel_position (&x, &y);
1034 1136
1035 if (MEvent.button == AnyButton) 1137 if (MEvent.button == AnyButton)
1036 {
1037 button_number = 3; 1138 button_number = 3;
1038 }
1039 else 1139 else
1040 { 1140 {
1041 button_number = MEvent.button - Button1; 1141 button_number = MEvent.button - Button1;
1042 /* add 0x3D for wheel events, like xterm does */ 1142 /* add 0x3D for wheel events, like xterm does */
1043 if (button_number >= 3) 1143 if (button_number >= 3)
1044 button_number += (64 - 3); 1144 button_number += (64 - 3);
1045 } 1145 }
1046 1146
1047 if (PrivateModes & PrivMode_MouseX10) 1147 if (priv_modes & PrivMode_MouseX10)
1048 { 1148 {
1049 /* 1149 /*
1050 * do not report ButtonRelease 1150 * do not report ButtonRelease
1051 * no state info allowed 1151 * no state info allowed
1052 */ 1152 */
… …
1067 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1167 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1068 + ((MEvent.state & ControlMask) ? 16 : 0); 1168 + ((MEvent.state & ControlMask) ? 16 : 0);
1069#ifdef MOUSE_REPORT_DOUBLECLICK 1169#ifdef MOUSE_REPORT_DOUBLECLICK
1070 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1170 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1071#endif 1171#endif
1072
1073 } 1172 }
1074 1173
1075#ifdef DEBUG_MOUSEREPORT 1174#if DEBUG_MOUSEREPORT
1076 fprintf(stderr, "Mouse ["); 1175 fprintf (stderr, "Mouse [");
1077 if (key_state & 16) 1176 if (key_state & 16)
1078 fputc('C', stderr); 1177 fputc ('C', stderr);
1079 if (key_state & 4) 1178 if (key_state & 4)
1080 fputc('S', stderr); 1179 fputc ('S', stderr);
1081 if (key_state & 8) 1180 if (key_state & 8)
1082 fputc('A', stderr); 1181 fputc ('A', stderr);
1083 if (key_state & 32) 1182 if (key_state & 32)
1084 fputc('2', stderr); 1183 fputc ('2', stderr);
1085 fprintf(stderr, "]: <%d>, %d/%d\n", 1184 fprintf (stderr, "]: <%d>, %d/%d\n",
1086 button_number, 1185 button_number,
1087 x + 1, 1186 x + 1,
1088 y + 1); 1187 y + 1);
1089#else 1188#endif
1189
1090 tt_printf("\033[M%c%c%c", 1190 tt_printf ("\033[M%c%c%c",
1091 (32 + button_number + key_state), 1191 (32 + button_number + key_state),
1092 (32 + x + 1), 1192 (32 + x + 1),
1093 (32 + y + 1)); 1193 (32 + y + 1));
1094#endif
1095} 1194}
1096 1195
1097#ifdef USING_W11LIB 1196#ifdef USING_W11LIB
1098void 1197void
1099rxvt_W11_process_x_event(XEvent *ev) 1198rxvt_W11_process_x_event (XEvent *ev)
1100{ 1199{
1101 rxvt_t *r = rxvt_get_r(); 1200 rxvt_t *r = rxvt_get_r ();
1102 1201
1103 x_cb (*ev); 1202 x_cb (*ev);
1104} 1203}
1105#endif 1204#endif
1106 1205
1107/*{{{ process an X event */ 1206/*{{{ process an X event */
1108void 1207void
1109rxvt_term::x_cb (XEvent &ev) 1208rxvt_term::x_cb (XEvent &ev)
1110{ 1209{
1210 dDisp;
1211
1111 SET_R (this); 1212 SET_R (this);
1112 SET_LOCALE (locale); 1213 SET_LOCALE (locale);
1113 1214
1114#if defined(CURSOR_BLINK) 1215#if defined(CURSOR_BLINK)
1115 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1116 { 1217 {
1117 if (hidden_cursor) 1218 if (hidden_cursor)
1118 { 1219 {
1119 hidden_cursor = 0; 1220 hidden_cursor = 0;
1120 want_refresh = 1; 1221 want_refresh = 1;
… …
1123 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1124 } 1225 }
1125#endif 1226#endif
1126 1227
1127#if defined(POINTER_BLANK) 1228#if defined(POINTER_BLANK)
1128 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1229 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1129 { 1230 {
1130 if (ev.type == MotionNotify 1231 if (ev.type == MotionNotify
1131 || ev.type == ButtonPress 1232 || ev.type == ButtonPress
1132 || ev.type == ButtonRelease) 1233 || ev.type == ButtonRelease)
1133 if (hidden_pointer) 1234 if (hidden_pointer)
… …
1136 if (ev.type == KeyPress && hidden_pointer == 0) 1237 if (ev.type == KeyPress && hidden_pointer == 0)
1137 pointer_blank (); 1238 pointer_blank ();
1138 } 1239 }
1139#endif 1240#endif
1140 1241
1141#ifdef USE_XIM
1142 if (XFilterEvent (&ev, None))
1143 return;
1144#endif
1145
1146 Window unused_root, unused_child; 1242 Window unused_root, unused_child;
1147 int unused_root_x, unused_root_y; 1243 int unused_root_x, unused_root_y;
1148 unsigned int unused_mask; 1244 unsigned int unused_mask;
1149
1150#ifdef DEBUG_X
1151 const char *const eventnames[] =
1152 { /* mason - this matches my system */
1153 "",
1154 "",
1155 "KeyPress",
1156 "KeyRelease",
1157 "ButtonPress",
1158 "ButtonRelease",
1159 "MotionNotify",
1160 "EnterNotify",
1161 "LeaveNotify",
1162 "FocusIn",
1163 "FocusOut",
1164 "KeymapNotify",
1165 "Expose",
1166 "GraphicsExpose",
1167 "NoExpose",
1168 "VisibilityNotify",
1169 "CreateNotify",
1170 "DestroyNotify",
1171 "UnmapNotify",
1172 "MapNotify",
1173 "MapRequest",
1174 "ReparentNotify",
1175 "ConfigureNotify",
1176 "ConfigureRequest",
1177 "GravityNotify",
1178 "ResizeRequest",
1179 "CirculateNotify",
1180 "CirculateRequest",
1181 "PropertyNotify",
1182 "SelectionClear",
1183 "SelectionRequest",
1184 "SelectionNotify",
1185 "ColormapNotify",
1186 "ClientMessage",
1187 "MappingNotify"
1188 };
1189#endif
1190
1191#ifdef DEBUG_X
1192 struct timeval tp;
1193 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec));
1196 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1197#endif
1198 1245
1199 switch (ev.type) 1246 switch (ev.type)
1200 { 1247 {
1201 case KeyPress: 1248 case KeyPress:
1249#if ISO_14755
1250 if (!(iso14755buf & ISO_14755_52))
1251#endif
1202 lookup_key (ev.xkey); 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;
1203 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
1204 1317
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1318#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease:
1207 {
1208 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)
1209 mouse_slip_wheel_speed = 0; 1322 mouse_slip_wheel_speed = 0;
1210 else 1323#endif
1211 {
1212 KeySym ks;
1213
1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0;
1217 }
1218 break; 1324 break;
1219 } 1325 }
1220#endif
1221 1326
1222 case ButtonPress: 1327 case ButtonPress:
1223 button_press (ev.xbutton); 1328 button_press (ev.xbutton);
1224 break; 1329 break;
1225 1330
… …
1227 button_release (ev.xbutton); 1332 button_release (ev.xbutton);
1228 break; 1333 break;
1229 1334
1230 case ClientMessage: 1335 case ClientMessage:
1231 if (ev.xclient.format == 32 1336 if (ev.xclient.format == 32
1337 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1338 {
1232 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1339 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1233 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
1234#ifdef OFFIX_DND 1357#ifdef OFFIX_DND
1235 /* OffiX Dnd (drag 'n' drop) protocol */ 1358 /* OffiX Dnd (drag 'n' drop) protocol */
1236 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1359 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1237 && (ev.xclient.data.l[0] == DndFile 1360 && (ev.xclient.data.l[0] == DndFile
1238 || ev.xclient.data.l[0] == DndDir 1361 || ev.xclient.data.l[0] == DndDir
1239 || ev.xclient.data.l[0] == DndLink)) 1362 || ev.xclient.data.l[0] == DndLink))
1240 { 1363 {
1241 /* Get Dnd data */ 1364 /* Get Dnd data */
1242 Atom ActualType; 1365 Atom ActualType;
1243 int ActualFormat; 1366 int ActualFormat;
1244 unsigned char *data; 1367 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1368 unsigned long Size, RemainingBytes;
1246 1369
1247 XGetWindowProperty(display->display, display->root, 1370 XGetWindowProperty (disp, display->root,
1248 xa[XA_DNDSELECTION], 1371 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1372 0L, 1000000L,
1250 False, AnyPropertyType, 1373 False, AnyPropertyType,
1251 &ActualType, &ActualFormat, 1374 &ActualType, &ActualFormat,
1252 &Size, &RemainingBytes, 1375 &Size, &RemainingBytes,
1253 &data); 1376 &data);
1254 XChangeProperty(display->display, display->root, 1377 set_string_property (XA_CUT_BUFFER0, data);
1255 XA_CUT_BUFFER0, XA_STRING, 1378 XFree (data);
1256 8, PropModeReplace,
1257 data, STRLEN(data));
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1379 selection_paste (display->root, XA_CUT_BUFFER0, true);
1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime); 1380 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1260 } 1381 }
1261#endif /* OFFIX_DND */ 1382#endif /* OFFIX_DND */
1262 break; 1383 break;
1263 1384
1264 case MappingNotify: 1385 case MappingNotify:
1265 XRefreshKeyboardMapping(&(ev.xmapping)); 1386 XRefreshKeyboardMapping (&ev.xmapping);
1266 break; 1387 break;
1267 1388
1268 /* 1389 /*
1269 * XXX: this is not the _current_ arrangement 1390 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1391 * Here's my conclusion:
… …
1289 break; 1410 break;
1290 } 1411 }
1291 break; 1412 break;
1292 1413
1293 case FocusIn: 1414 case FocusIn:
1294 if (!TermWin.focus) 1415 focus_in ();
1295 {
1296 TermWin.focus = 1;
1297 want_refresh = 1;
1298#ifdef USE_XIM
1299 if (Input_Context != NULL)
1300 XSetICFocus(Input_Context);
1301#endif
1302#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1305#endif
1306
1307 }
1308 break; 1416 break;
1309 1417
1310 case FocusOut: 1418 case FocusOut:
1311 if (TermWin.focus) 1419 focus_out ();
1312 {
1313 TermWin.focus = 0;
1314 want_refresh = 1;
1315#ifdef USE_XIM
1316 if (Input_Context != NULL)
1317 XUnsetICFocus(Input_Context);
1318#endif
1319#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop ();
1322 hidden_cursor = 0;
1323#endif
1324
1325 }
1326 break; 1420 break;
1327 1421
1328 case ConfigureNotify: 1422 case ConfigureNotify:
1329 if (ev.xconfigure.window == TermWin.parent[0]) 1423 if (ev.xconfigure.window == TermWin.parent[0])
1330 { 1424 {
… …
1332 1426
1333 do 1427 do
1334 { /* Wrap lots of configures into one */ 1428 { /* Wrap lots of configures into one */
1335 width = ev.xconfigure.width; 1429 width = ev.xconfigure.width;
1336 height = ev.xconfigure.height; 1430 height = ev.xconfigure.height;
1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1432 }
1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1340 1434
1341 if (szHint.width != width || szHint.height != height) 1435 if (szHint.width != width || szHint.height != height)
1342 { 1436 {
1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1437 seen_resize = 1;
1344 resize_all_windows (width, height, 1); 1438 resize_all_windows (width, height, 1);
1345 } 1439 }
1346#ifdef DEBUG_SIZE 1440
1347 else
1348 {
1349 D_SIZE((stderr, "Size: Not resizing"));
1350 }
1351#endif
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent) 1442 if (options & Opt_transparent)
1354 {
1355 check_our_parents (); 1443 check_our_parents ();
1356 if (am_transparent)
1357 want_full_refresh = 1;
1358 }
1359#endif 1444#endif
1360
1361 } 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
1362 break; 1453 break;
1363 1454
1364 case SelectionClear: 1455 case SelectionClear:
1365 selection_clear (); 1456 selection_clear ();
1366 break; 1457 break;
1367 1458
1368 case SelectionNotify: 1459 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1460 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1461 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1371 ev.xselection.property, True);
1372 break; 1462 break;
1373 1463
1374 case SelectionRequest: 1464 case SelectionRequest:
1375 selection_send (ev.xselectionrequest); 1465 selection_send (ev.xselectionrequest);
1376 break; 1466 break;
… …
1387#ifdef TEXT_BLINK 1477#ifdef TEXT_BLINK
1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1478 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389#endif 1479#endif
1390 break; 1480 break;
1391 1481
1392 case PropertyNotify:
1393 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1394 if (ev.xproperty.state == PropertyNewValue)
1395 selection_property (ev.xproperty.window, ev.xproperty.atom);
1396 break;
1397
1398#ifdef TRANSPARENT 1482#ifdef TRANSPARENT
1399 case ReparentNotify: 1483 case ReparentNotify:
1400 rootwin_cb (ev); 1484 rootwin_cb (ev);
1401 break; 1485 break;
1402#endif /* TRANSPARENT */ 1486#endif /* TRANSPARENT */
1403 1487
1404 case GraphicsExpose: 1488 case GraphicsExpose:
1405 case Expose: 1489 case Expose:
1406 if (ev.xany.window == TermWin.vt) 1490 if (ev.xany.window == TermWin.vt)
1407 { 1491 {
1408#ifdef NO_SLOW_LINK_SUPPORT 1492 do
1409 scr_expose (ev.xexpose.x, ev.xexpose.y, 1493 scr_expose (ev.xexpose.x, ev.xexpose.y,
1410 ev.xexpose.width, ev.xexpose.height, False); 1494 ev.xexpose.width, ev.xexpose.height, False);
1411#else 1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1412 // 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))
1413 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1414 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1415 //scr_expose (ev.xexpose.x, 0, 1502
1416 // ev.xexpose.width, TermWin.height, False); 1503 scr_refresh (refresh_type);
1417#endif
1418 want_refresh = 1;
1419 } 1504 }
1420 else 1505 else
1421 { 1506 {
1422 XEvent unused_event; 1507 XEvent unused_event;
1423 1508
1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1425 Expose, 1510 ;
1426 &unused_event)) ; 1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1512 ;
1428 GraphicsExpose, 1513
1429 &unused_event)) ;
1430 if (isScrollbarWindow(ev.xany.window)) 1514 if (isScrollbarWindow (ev.xany.window))
1431 { 1515 {
1432 scrollBar.setIdle(); 1516 scrollBar.setIdle ();
1433 scrollbar_show (0); 1517 scrollbar_show (0);
1434 } 1518 }
1435#ifdef MENUBAR 1519#ifdef MENUBAR
1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window)) 1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1437 menubar_expose (); 1521 menubar_expose ();
1438#endif 1522#endif
1439#ifdef RXVT_GRAPHICS
1440 Gr_expose (ev.xany.window);
1441#endif
1442 1523
1524#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0])
1526 XClearWindow (disp, ev.xany.window);
1527#endif
1443 } 1528 }
1444 break; 1529 break;
1445 1530
1446 case MotionNotify: 1531 case MotionNotify:
1447#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1448 if (hidden_pointer) 1533 if (hidden_pointer)
1449 pointer_unblank (); 1534 pointer_unblank ();
1450#endif 1535#endif
1451#if MENUBAR 1536#if MENUBAR
1452 if (isMenuBarWindow(ev.xany.window)) 1537 if (isMenuBarWindow (ev.xany.window))
1453 { 1538 {
1454 menubar_control (&(ev.xbutton)); 1539 menubar_control (ev.xbutton);
1455 break; 1540 break;
1456 } 1541 }
1457#endif 1542#endif
1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1459 break; 1544 break;
1460 1545
1461 if (ev.xany.window == TermWin.vt) 1546 if (ev.xany.window == TermWin.vt)
1462 { 1547 {
1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1548 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1464 { 1549 {
1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1466 ; 1551 ;
1467 1552
1468 XQueryPointer(display->display, TermWin.vt, 1553 XQueryPointer (disp, TermWin.vt,
1469 &unused_root, &unused_child, 1554 &unused_root, &unused_child,
1470 &unused_root_x, &unused_root_y, 1555 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y), 1556 &ev.xbutton.x, &ev.xbutton.y,
1472 &unused_mask); 1557 &ev.xbutton.state);
1473#ifdef MOUSE_THRESHOLD 1558#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1559 /* deal with a `jumpy' mouse */
1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1560 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 { 1561 {
1477#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
1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1571 selection_extend (ev.xbutton.x, ev.xbutton.y,
1479 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1572 ev.xbutton.state & Button3Mask ? 2 : 0);
1573
1480#ifdef SELECTION_SCROLLING 1574#ifdef SELECTION_SCROLLING
1481 if (ev.xbutton.y < TermWin.int_bwidth 1575 if (ev.xbutton.y < TermWin.int_bwidth
1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1483 { 1577 {
1484 int dist; 1578 int dist;
1485
1486 pending_scroll_selection=1;
1487 1579
1488 /* don't clobber the current delay if we are 1580 /* don't clobber the current delay if we are
1489 * already in the middle of scrolling. 1581 * already in the middle of scrolling.
1490 */ 1582 */
1491 if (scroll_selection_delay<=0) 1583 if (!sel_scroll_ev.active)
1492 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1584 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1493 1585
1494 /* save the event params so we can highlight 1586 /* save the event params so we can highlight
1495 * the selection in the pending-scroll loop 1587 * the selection in the pending-scroll loop
1496 */ 1588 */
1497 selection_save_x=ev.xbutton.x; 1589 selection_save_x = ev.xbutton.x;
1498 selection_save_y=ev.xbutton.y; 1590 selection_save_y = ev.xbutton.y;
1499 selection_save_state=
1500 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501 1592
1502 /* calc number of lines to scroll */ 1593 /* calc number of lines to scroll */
1503 if (ev.xbutton.y<TermWin.int_bwidth) 1594 if (ev.xbutton.y < TermWin.int_bwidth)
1504 { 1595 {
1505 scroll_selection_dir = UP; 1596 scroll_selection_dir = UP;
1506 dist = TermWin.int_bwidth - ev.xbutton.y; 1597 dist = TermWin.int_bwidth - ev.xbutton.y;
1507 } 1598 }
1508 else 1599 else
1509 { 1600 {
1510 scroll_selection_dir = DN; 1601 scroll_selection_dir = DN;
1511 dist = ev.xbutton.y -
1512 (TermWin.int_bwidth + TermWin.height); 1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1513 } 1603 }
1604
1514 scroll_selection_lines=(Pixel2Height(dist)/ 1605 scroll_selection_lines = Pixel2Height (dist)
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1606 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1;
1516 MIN_IT(scroll_selection_lines, 1608 MIN_IT (scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES); 1609 SELECTION_SCROLL_MAX_LINES);
1518 } 1610 }
1519 else 1611 else
1520 { 1612 {
1521 /* we are within the text window, so we 1613 /* we are within the text window, so we
1522 * shouldn't be scrolling 1614 * shouldn't be scrolling
1523 */ 1615 */
1524 pending_scroll_selection = 0; 1616 if (sel_scroll_ev.active)
1617 sel_scroll_ev.stop();
1525 } 1618 }
1526#endif 1619#endif
1527#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1528
1529 } 1621 }
1530#endif 1622#endif
1531
1532 } 1623 }
1533 } 1624 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1535 { 1626 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1627 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1537 MotionNotify, &ev)) ; 1628 MotionNotify, &ev))
1629 ;
1630
1538 XQueryPointer(display->display, scrollBar.win, 1631 XQueryPointer (disp, scrollBar.win,
1539 &unused_root, &unused_child, 1632 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y, 1633 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y), 1634 &ev.xbutton.x, &ev.xbutton.y,
1542 &unused_mask); 1635 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1544 scrollbar_size()); 1637 scrollbar_size ());
1545 scr_refresh (refresh_type); 1638 scr_refresh (refresh_type);
1546 refresh_limit = 0; 1639 refresh_limit = 0;
1547 scrollbar_show (1); 1640 scrollbar_show (1);
1548 } 1641 }
1549 break; 1642 break;
1550 } 1643 }
1551} 1644}
1552 1645
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
1553#ifdef TRANSPARENT 1707#if TRANSPARENT
1554void 1708void
1555rxvt_term::rootwin_cb (XEvent &ev) 1709rxvt_term::rootwin_cb (XEvent &ev)
1556{ 1710{
1557 SET_R (this); 1711 SET_R (this);
1558 SET_LOCALE (locale); 1712 SET_LOCALE (locale);
1559 1713
1560 if (ev.type == PropertyNotify) 1714 switch (ev.type)
1561 { 1715 {
1716 case PropertyNotify:
1562 /* 1717 /*
1563 * if user used some Esetroot compatible prog to set the root bg, 1718 * if user used some Esetroot compatible prog to set the root bg,
1564 * use the property to determine the pixmap. We use it later on. 1719 * use the property to determine the pixmap. We use it later on.
1565 */ 1720 */
1566 if (xa[XA_XROOTPMAPID] == 0)
1567 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False);
1568
1569 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1721 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1722 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1570 return; 1723 return;
1571 }
1572 1724
1725 /* FALLTHROUGH */
1726 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1574 {
1575 if (am_transparent)
1576 want_full_refresh = 1; 1728 want_refresh = want_full_refresh = 1;
1729 break;
1577 } 1730 }
1578} 1731}
1579#endif 1732#endif
1580 1733
1581void 1734void
1582rxvt_term::button_press (const XButtonEvent &ev) 1735rxvt_term::button_press (XButtonEvent &ev)
1583{ 1736{
1584 int reportmode = 0, clickintime; 1737 int reportmode = 0, clickintime;
1585 1738
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1739 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1587 if (!bypass_keystate) 1740 if (!bypass_keystate)
1588 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1741 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742
1589 /* 1743 /*
1590 * VT window processing of button press 1744 * VT window processing of button press
1591 */ 1745 */
1592 if (ev.window == TermWin.vt) 1746 if (ev.window == TermWin.vt)
1593 { 1747 {
1594#if RXVT_GRAPHICS 1748#if ISO_14755
1595 if (ev.subwindow != None) 1749 // 5.4
1596 rxvt_Gr_ButtonPress (ev.x, ev.y); 1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1597 else 1751 {
1598#endif 1752 iso14755_54 (ev.x, ev.y);
1599 1753 return;
1600 { 1754 }
1755#endif
1756
1601 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1757 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1758
1602 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)
1603 { 1766 {
1604 /* mouse report from vt window */ 1767 /* same button, within alloted time */
1605 /* save the xbutton state (for ButtonRelease) */ 1768 MEvent.clicks++;
1606 MEvent.state = ev.state; 1769 if (MEvent.clicks > 1)
1607#ifdef MOUSE_REPORT_DOUBLECLICK
1608 if (ev.button == MEvent.button && clickintime)
1609 { 1770 {
1610 /* same button, within alloted time */
1611 MEvent.clicks++;
1612 if (MEvent.clicks > 1)
1613 {
1614 /* only report double clicks */ 1771 /* only report double clicks */
1615 MEvent.clicks = 2; 1772 MEvent.clicks = 2;
1616 mouse_report (ev); 1773 mouse_report (ev);
1617 1774
1618 /* don't report the release */ 1775 /* don't report the release */
1619 MEvent.clicks = 0; 1776 MEvent.clicks = 0;
1620 MEvent.button = AnyButton; 1777 MEvent.button = AnyButton;
1621 }
1622 } 1778 }
1623 else
1624 {
1625 /* different button, or time expired */
1626 MEvent.clicks = 1;
1627 MEvent.button = ev.button;
1628 mouse_report (ev);
1629 }
1630#else
1631 MEvent.button = ev.button;
1632 mouse_report (ev);
1633#endif /* MOUSE_REPORT_DOUBLECLICK */
1634
1635 } 1779 }
1636 else 1780 else
1637 { 1781 {
1782 /* different button, or time expired */
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 {
1638 if (ev.button != MEvent.button) 1795 if (ev.button != MEvent.button)
1639 MEvent.clicks = 0; 1796 MEvent.clicks = 0;
1797
1640 switch (ev.button) 1798 switch (ev.button)
1641 { 1799 {
1642 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
1643 /* allow shift+left click to extend selection */ 1809 /* allow shift+left click to extend selection */
1644 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1810 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1645 { 1811 {
1646 if (MEvent.button == Button1 && clickintime)
1647 selection_rotate (ev.x, ev.y);
1648 else
1649 selection_extend (ev.x, ev.y, 1);
1650 }
1651 else
1652 {
1653 if (MEvent.button == Button1 && clickintime)
1654 MEvent.clicks++;
1655 else
1656 MEvent.clicks = 1;
1657
1658 selection_click (MEvent.clicks, ev.x, ev.y);
1659 }
1660
1661 MEvent.button = Button1;
1662 break;
1663
1664 case Button3:
1665 if (MEvent.button == Button3 && clickintime) 1812 if (MEvent.button == Button1 && clickintime)
1666 selection_rotate (ev.x, ev.y); 1813 selection_rotate (ev.x, ev.y);
1667 else 1814 else
1668 selection_extend (ev.x, ev.y, 1); 1815 selection_extend (ev.x, ev.y, 1);
1816 }
1817 else
1818 {
1819 if (MEvent.button == Button1 && clickintime)
1820 MEvent.clicks++;
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
1834 selection_extend (ev.x, ev.y, 1);
1835
1669 MEvent.button = Button3; 1836 MEvent.button = Button3;
1670 break; 1837 break;
1671 }
1672 } 1838 }
1839 }
1840
1673 MEvent.time = ev.time; 1841 MEvent.time = ev.time;
1674 return; 1842 return;
1675 }
1676 } 1843 }
1677 1844
1678 /* 1845 /*
1679 * Scrollbar window processing of button press 1846 * Scrollbar window processing of button press
1680 */ 1847 */
1681 if (isScrollbarWindow(ev.window)) 1848 if (isScrollbarWindow (ev.window))
1682 { 1849 {
1683 scrollBar.setIdle (); 1850 scrollBar.setIdle ();
1684 /* 1851 /*
1685 * Rxvt-style scrollbar: 1852 * Rxvt-style scrollbar:
1686 * move up if mouse is above slider 1853 * move up if mouse is above slider
… …
1698 * Mouse report disabled scrollbar: 1865 * Mouse report disabled scrollbar:
1699 * arrow buttons - send up/down 1866 * arrow buttons - send up/down
1700 * click on scrollbar - send pageup/down 1867 * click on scrollbar - send pageup/down
1701 */ 1868 */
1702 if ((scrollBar.style == R_SB_NEXT 1869 if ((scrollBar.style == R_SB_NEXT
1703 && scrollbarnext_upButton(ev.y)) 1870 && scrollbarnext_upButton (ev.y))
1704 || (scrollBar.style == R_SB_RXVT 1871 || (scrollBar.style == R_SB_RXVT
1705 && scrollbarrxvt_upButton(ev.y))) 1872 && scrollbarrxvt_upButton (ev.y)))
1706 tt_printf("\033[A"); 1873 tt_printf ("\033[A");
1707 else if ((scrollBar.style == R_SB_NEXT 1874 else if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_dnButton(ev.y)) 1875 && scrollbarnext_dnButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT 1876 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_dnButton(ev.y))) 1877 && scrollbarrxvt_dnButton (ev.y)))
1711 tt_printf("\033[B"); 1878 tt_printf ("\033[B");
1712 else 1879 else
1713 switch (ev.button) 1880 switch (ev.button)
1714 { 1881 {
1715 case Button2: 1882 case Button2:
1716 tt_printf("\014"); 1883 tt_printf ("\014");
1717 break; 1884 break;
1718 case Button1: 1885 case Button1:
1719 tt_printf("\033[6~"); 1886 tt_printf ("\033[6~");
1720 break; 1887 break;
1721 case Button3: 1888 case Button3:
1722 tt_printf("\033[5~"); 1889 tt_printf ("\033[5~");
1723 break; 1890 break;
1724 } 1891 }
1725 } 1892 }
1726 else 1893 else
1727#endif /* NO_SCROLLBAR_REPORT */ 1894#endif /* NO_SCROLLBAR_REPORT */
… …
1729 { 1896 {
1730 char upordown = 0; 1897 char upordown = 0;
1731 1898
1732 if (scrollBar.style == R_SB_NEXT) 1899 if (scrollBar.style == R_SB_NEXT)
1733 { 1900 {
1734 if (scrollbarnext_upButton(ev.y)) 1901 if (scrollbarnext_upButton (ev.y))
1735 upordown = -1; /* up */ 1902 upordown = -1; /* up */
1736 else if (scrollbarnext_dnButton(ev.y)) 1903 else if (scrollbarnext_dnButton (ev.y))
1737 upordown = 1; /* down */ 1904 upordown = 1; /* down */
1738 } 1905 }
1739 else if (scrollBar.style == R_SB_RXVT) 1906 else if (scrollBar.style == R_SB_RXVT)
1740 { 1907 {
1741 if (scrollbarrxvt_upButton(ev.y)) 1908 if (scrollbarrxvt_upButton (ev.y))
1742 upordown = -1; /* up */ 1909 upordown = -1; /* up */
1743 else if (scrollbarrxvt_dnButton(ev.y)) 1910 else if (scrollbarrxvt_dnButton (ev.y))
1744 upordown = 1; /* down */ 1911 upordown = 1; /* down */
1745 } 1912 }
1746 if (upordown) 1913 if (upordown)
1747 { 1914 {
1748#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1915#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1749 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1916 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1750#endif 1917#endif
1751 if (scr_page (upordown < 0 ? UP : DN, 1)) 1918 if (scr_page (upordown < 0 ? UP : DN, 1))
1752 { 1919 {
1753 if (upordown < 0) 1920 if (upordown < 0)
1754 scrollBar.setUp (); 1921 scrollBar.setUp ();
… …
1770 break; 1937 break;
1771 case R_SB_ALIGN_BOTTOM: 1938 case R_SB_ALIGN_BOTTOM:
1772 csrO = scrollBar.bot - scrollBar.top; 1939 csrO = scrollBar.bot - scrollBar.top;
1773 break; 1940 break;
1774 } 1941 }
1942
1775 if (scrollBar.style == R_SB_XTERM 1943 if (scrollBar.style == R_SB_XTERM
1776 || scrollbar_above_slider(ev.y) 1944 || scrollbar_above_slider (ev.y)
1777 || scrollbar_below_slider(ev.y)) 1945 || scrollbar_below_slider (ev.y))
1778 scr_move_to ( scrollbar_position(ev.y) - csrO, 1946 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1779 scrollbar_size()); 1947
1780 scrollBar.setMotion (); 1948 scrollBar.setMotion ();
1781 break; 1949 break;
1782 1950
1783 case Button1: 1951 case Button1:
1784 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1952 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1786 /* FALLTHROUGH */ 1954 /* FALLTHROUGH */
1787 1955
1788 case Button3: 1956 case Button3:
1789 if (scrollBar.style != R_SB_XTERM) 1957 if (scrollBar.style != R_SB_XTERM)
1790 { 1958 {
1791 if (scrollbar_above_slider(ev.y)) 1959 if (scrollbar_above_slider (ev.y))
1792# ifdef RXVT_SCROLL_FULL 1960# ifdef RXVT_SCROLL_FULL
1793 scr_page (UP, TermWin.nrow - 1); 1961 scr_page (UP, TermWin.nrow - 1);
1794# else 1962# else
1795 scr_page (UP, TermWin.nrow / 4); 1963 scr_page (UP, TermWin.nrow / 4);
1796# endif 1964# endif
1797 else if (scrollbar_below_slider(ev.y)) 1965 else if (scrollbar_below_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 1966# ifdef RXVT_SCROLL_FULL
1799 scr_page (DN, TermWin.nrow - 1); 1967 scr_page (DN, TermWin.nrow - 1);
1800# else 1968# else
1801 scr_page (DN, TermWin.nrow / 4); 1969 scr_page (DN, TermWin.nrow / 4);
1802# endif 1970# endif
… …
1805 } 1973 }
1806 else 1974 else
1807 { 1975 {
1808 scr_page ((ev.button == Button1 ? DN : UP), 1976 scr_page ((ev.button == Button1 ? DN : UP),
1809 (TermWin.nrow 1977 (TermWin.nrow
1810 * scrollbar_position(ev.y) 1978 * scrollbar_position (ev.y)
1811 / scrollbar_size())); 1979 / scrollbar_size ()));
1812 } 1980 }
1981
1813 break; 1982 break;
1814 } 1983 }
1815 } 1984 }
1816 return; 1985 return;
1817 } 1986 }
1818#if MENUBAR 1987#if MENUBAR
1819 /* 1988 /*
1820 * Menubar window processing of button press 1989 * Menubar window processing of button press
1821 */ 1990 */
1822 if (isMenuBarWindow(ev.window)) 1991 if (isMenuBarWindow (ev.window))
1823 menubar_control (ev); 1992 menubar_control (ev);
1824#endif 1993#endif
1825} 1994}
1826 1995
1827void 1996void
1828rxvt_term::button_release (const XButtonEvent &ev) 1997rxvt_term::button_release (XButtonEvent &ev)
1829{ 1998{
1830 int reportmode = 0; 1999 int reportmode = 0;
1831 2000
1832 csrO = 0; /* reset csr Offset */ 2001 csrO = 0; /* reset csr Offset */
1833 if (!bypass_keystate) 2002 if (!bypass_keystate)
1834 reportmode = !!(PrivateModes & PrivMode_mouse_report); 2003 reportmode = !! (priv_modes & PrivMode_mouse_report);
1835 2004
1836 if (scrollbar_isUpDn()) 2005 if (scrollbar_isUpDn ())
1837 { 2006 {
1838 scrollBar.setIdle (); 2007 scrollBar.setIdle ();
1839 scrollbar_show (0); 2008 scrollbar_show (0);
1840#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1841 refresh_type &= ~SMOOTH_REFRESH; 2010 refresh_type &= ~SMOOTH_REFRESH;
1842#endif 2011#endif
1843
1844 } 2012 }
2013
1845#ifdef SELECTION_SCROLLING 2014#ifdef SELECTION_SCROLLING
1846 pending_scroll_selection=0; 2015 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop();
1847#endif 2017#endif
2018
1848 if (ev.window == TermWin.vt) 2019 if (ev.window == TermWin.vt)
1849 { 2020 {
1850#ifdef RXVT_GRAPHICS 2021#if ISO_14755
1851 if (ev.subwindow != None) 2022 // 5.4
1852 rxvt_Gr_ButtonRelease(ev.x, ev.y); 2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1853 else 2024 return;
1854#endif 2025#endif
1855
1856 {
1857 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)))
1858 { 2038 {
1859 /* mouse report from vt window */
1860 /* don't report release of wheel "buttons" */
1861 if (ev.button >= 4)
1862 return;
1863#ifdef MOUSE_REPORT_DOUBLECLICK
1864 /* only report the release of 'slow' single clicks */
1865 if (MEvent.button != AnyButton
1866 && (ev.button != MEvent.button
1867 || (ev.time - MEvent.time
1868 > MULTICLICK_TIME / 2)))
1869 {
1870 MEvent.clicks = 0; 2039 MEvent.clicks = 0;
1871 MEvent.button = AnyButton;
1872 mouse_report (ev);
1873 }
1874#else /* MOUSE_REPORT_DOUBLECLICK */
1875 MEvent.button = AnyButton; 2040 MEvent.button = AnyButton;
1876 mouse_report (ev); 2041 mouse_report (ev);
2042 }
2043#else /* MOUSE_REPORT_DOUBLECLICK */
2044 MEvent.button = AnyButton;
2045 mouse_report (ev);
1877#endif /* MOUSE_REPORT_DOUBLECLICK */ 2046#endif /* MOUSE_REPORT_DOUBLECLICK */
1878 return; 2047 return;
1879 } 2048 }
2049
1880 /* 2050 /*
1881 * dumb hack to compensate for the failure of click-and-drag 2051 * dumb hack to compensate for the failure of click-and-drag
1882 * when overriding mouse reporting 2052 * when overriding mouse reporting
1883 */ 2053 */
1884 if (PrivateModes & PrivMode_mouse_report 2054 if (priv_modes & PrivMode_mouse_report
1885 && bypass_keystate 2055 && bypass_keystate
1886 && ev.button == Button1 && MEvent.clicks <= 1) 2056 && ev.button == Button1 && MEvent.clicks <= 1)
1887 selection_extend (ev.x, ev.y, 0); 2057 selection_extend (ev.x, ev.y, 0);
1888 2058
1889 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:
1890 { 2071 {
1891 case Button1: 2072 int i;
1892 case Button3: 2073 page_dirn v;
1893 selection_make (ev.time); 2074
2075 v = ev.button == Button4 ? UP : DN;
2076
2077 if (ev.state & ShiftMask)
1894 break; 2078 i = 1;
1895 case Button2: 2079 else if (options & Opt_mouseWheelScrollPage)
1896 selection_request (ev.time, ev.x, ev.y); 2080 i = TermWin.nrow - 1;
2081 else
1897 break; 2082 i = 5;
2083
1898#ifdef MOUSE_WHEEL 2084# ifdef MOUSE_SLIP_WHEELING
1899 case Button4: 2085 if (ev.state & ControlMask)
1900 case Button5:
1901 { 2086 {
1902 int i;
1903 page_dirn v;
1904
1905 v = (ev.button == Button4) ? UP : DN;
1906 if (ev.state & ShiftMask)
1907 i = 1;
1908 else if ((Options & Opt_mouseWheelScrollPage))
1909 i = TermWin.nrow - 1;
1910 else
1911 i = 5;
1912# ifdef MOUSE_SLIP_WHEELING
1913 if (ev.state & ControlMask)
1914 {
1915 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)
1916 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093
2094 slip_wheel_ev.start ();
1917 } 2095 }
2096 else
2097 {
1918# endif 2098# endif
1919# ifdef JUMP_MOUSE_WHEEL 2099# ifdef JUMP_MOUSE_WHEEL
1920 scr_page (v, i); 2100 scr_page (v, i);
1921 scr_refresh (SMOOTH_REFRESH); 2101 scr_refresh (SMOOTH_REFRESH);
1922 scrollbar_show (1); 2102 scrollbar_show (1);
… …
1926 scr_page (v, 1); 2106 scr_page (v, 1);
1927 scr_refresh (SMOOTH_REFRESH); 2107 scr_refresh (SMOOTH_REFRESH);
1928 scrollbar_show (1); 2108 scrollbar_show (1);
1929 } 2109 }
1930# endif 2110# endif
1931 2111# ifdef MOUSE_SLIP_WHEELING
1932 } 2112 }
1933 break;
1934#endif 2113#endif
1935
1936 } 2114 }
2115 break;
2116#endif
1937 } 2117 }
1938 } 2118 }
1939#ifdef MENUBAR 2119#ifdef MENUBAR
1940 else if (isMenuBarWindow(ev.window)) 2120 else if (isMenuBarWindow (ev.window))
1941 menubar_control (ev); 2121 menubar_control (ev);
1942#endif 2122#endif
1943} 2123}
1944 2124
1945
1946#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
1947/* 2357/*
1948 * Check our parents are still who we think they are. 2358 * Check our parents are still who we think they are.
1949 * Do transparency updates if required 2359 * Do transparency updates if required
1950 */ 2360 */
1951int 2361int
1952rxvt_term::check_our_parents () 2362rxvt_term::check_our_parents ()
1953{ 2363{
1954 int i, pchanged, aformat, have_pixmap, rootdepth; 2364 int i, pchanged, aformat, have_pixmap, rootdepth;
1955 unsigned long nitems, bytes_after; 2365 unsigned long nitems, bytes_after;
1956 Atom atype; 2366 Atom atype;
1957 unsigned char *prop = NULL; 2367 unsigned char *prop = NULL;
1958 Window root, oldp, *list; 2368 Window root, oldp, *list;
1959 Pixmap rootpixmap = None; 2369 Pixmap rootpixmap = None;
1960 XWindowAttributes wattr, wrootattr; 2370 XWindowAttributes wattr, wrootattr;
2371 dDisp;
1961 2372
1962 pchanged = 0; 2373 pchanged = 0;
1963 2374
1964 if (!(Options & Opt_transparent)) 2375 if (!(options & Opt_transparent))
1965 return pchanged; /* Don't try any more */ 2376 return pchanged; /* Don't try any more */
1966 2377
1967 XGetWindowAttributes(display->display, display->root, &wrootattr); 2378 XGetWindowAttributes (disp, display->root, &wrootattr);
1968 rootdepth = wrootattr.depth; 2379 rootdepth = wrootattr.depth;
1969 2380
1970 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2382
1971 if (rootdepth != wattr.depth) 2383 if (rootdepth != wattr.depth)
1972 { 2384 {
1973 if (am_transparent) 2385 if (am_transparent)
1974 { 2386 {
1975 pchanged = 1; 2387 pchanged = 1;
1976 XSetWindowBackground(display->display, TermWin.vt, 2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1977 PixColors[Color_bg]);
1978 am_transparent = am_pixmap_trans = 0; 2389 am_transparent = am_pixmap_trans = 0;
1979 } 2390 }
2391
1980 return pchanged; /* Don't try any more */ 2392 return pchanged; /* Don't try any more */
1981 } 2393 }
1982 2394
1983 /* 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. */
1984 XSync(display->display, False); 2396 XSync (disp, False);
1985 2397
1986 /* 2398 /*
1987 * Make the frame window set by the window manager have 2399 * Make the frame window set by the window manager have
1988 * the root background. Some window managers put multiple nested frame 2400 * the root background. Some window managers put multiple nested frame
1989 * 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.
1990 */ 2402 */
1991 i = (xa[XA_XROOTPMAPID] != 0 2403 i = (xa[XA_XROOTPMAP_ID]
1992 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 2404 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2405 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success)); 2406 &nitems, &bytes_after, &prop) == Success);
2407
1995 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 )
1996 have_pixmap = 0; 2419 have_pixmap = 0;
1997 else 2420 else
1998 { 2421 {
1999 have_pixmap = 1; 2422 have_pixmap = 1;
2000 rootpixmap = *((Pixmap *)prop); 2423 rootpixmap = *(Pixmap *)prop;
2001 XFree(prop); 2424 XFree (prop);
2002 } 2425 }
2426
2003 if (have_pixmap) 2427 if (have_pixmap)
2004 { 2428 {
2005 /* 2429 /*
2006 * Copy display->root pixmap transparency 2430 * Copy display->root pixmap transparency
2007 */ 2431 */
2008 int sx, sy, nx, ny; 2432 int sx, sy, nx, ny;
2009 unsigned int nw, nh; 2433 unsigned int nw, nh;
2010 Window cr; 2434 Window cr;
2011 XImage *image; 2435 XImage *image;
2012 GC gc; 2436 GC gc;
2013 XGCValues gcvalue; 2437 XGCValues gcvalue;
2014 2438
2015 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2016 0, 0, &sx, &sy, &cr); 2440 0, 0, &sx, &sy, &cr);
2017 nw = (unsigned int)szHint.width; 2441 nw = (unsigned int)szHint.width;
2018 nh = (unsigned int)szHint.height; 2442 nh = (unsigned int)szHint.height;
2019 nx = ny = 0; 2443 nx = ny = 0;
2444
2020 if (sx < 0) 2445 if (sx < 0)
2021 { 2446 {
2022 nw += sx; 2447 nw += sx;
2023 nx = -sx; 2448 nx = -sx;
2024 sx = 0; 2449 sx = 0;
2025 } 2450 }
2451
2026 if (sy < 0) 2452 if (sy < 0)
2027 { 2453 {
2028 nh += sy; 2454 nh += sy;
2029 ny = -sy; 2455 ny = -sy;
2030 sy = 0; 2456 sy = 0;
2031 } 2457 }
2458
2032 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2033 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2461
2462 XSync (disp, False);
2034 allowedxerror = -1; 2463 allowedxerror = -1;
2035 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2036 ZPixmap); 2465
2037 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2466 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2038 /* XXX: may need a delay here? */ 2467 /* XXX: may need a delay here? */
2039 allowedxerror = 0; 2468 allowedxerror = 0;
2469
2040 if (image == NULL) 2470 if (image == NULL)
2041 { 2471 {
2042 if (am_transparent && am_pixmap_trans) 2472 if (am_transparent && am_pixmap_trans)
2043 { 2473 {
2044 pchanged = 1; 2474 pchanged = 1;
2045 if (TermWin.pixmap != None) 2475 if (TermWin.pixmap != None)
2046 { 2476 {
2047 XFreePixmap(display->display, TermWin.pixmap); 2477 XFreePixmap (disp, TermWin.pixmap);
2048 TermWin.pixmap = None; 2478 TermWin.pixmap = None;
2049 } 2479 }
2050 } 2480 }
2481
2051 am_pixmap_trans = 0; 2482 am_pixmap_trans = 0;
2052 } 2483 }
2053 else 2484 else
2054 { 2485 {
2055 if (TermWin.pixmap != None) 2486 if (TermWin.pixmap != None)
2056 XFreePixmap(display->display, 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
2057 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2058 (unsigned int)szHint.width,
2059 (unsigned int)szHint.height, 2502 szHint.width, szHint.height, image->depth);
2060 (unsigned int)image->depth);
2061 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2062 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2063 nx, ny, (unsigned int)image->width,
2064 (unsigned int)image->height); 2505 nx, ny, image->width, image->height);
2065 XFreeGC(display->display, gc); 2506 XFreeGC (disp, gc);
2066 XDestroyImage(image); 2507 XDestroyImage (image);
2067 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2068 TermWin.pixmap); 2509 XClearWindow (disp, TermWin.parent[0]);
2510
2069 if (!am_transparent || !am_pixmap_trans) 2511 if (!am_transparent || !am_pixmap_trans)
2070 pchanged = 1; 2512 pchanged = 1;
2513
2071 am_transparent = am_pixmap_trans = 1; 2514 am_transparent = am_pixmap_trans = 1;
2072 } 2515 }
2073 } 2516 }
2517
2074 if (!am_pixmap_trans) 2518 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2520 else
2075 { 2521 {
2076 unsigned int n; 2522 unsigned int n;
2077 /* 2523 /*
2078 * InheritPixmap transparency 2524 * InheritPixmap transparency
2079 */ 2525 */
2080 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root));
2081 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2082 i++)
2083 { 2527 {
2084 oldp = TermWin.parent[i]; 2528 oldp = TermWin.parent[i];
2085 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2529 XQueryTree (disp, TermWin.parent[i - 1], &root,
2086 &TermWin.parent[i], &list, &n); 2530 &TermWin.parent[i], &list, &n);
2087 XFree(list); 2531 XFree (list);
2088 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2532
2089 if (TermWin.parent[i] == display->root) 2533 if (TermWin.parent[i] == display->root)
2090 { 2534 {
2091 if (oldp != None) 2535 if (oldp != None)
2092 pchanged = 1; 2536 pchanged = 1;
2537
2093 break; 2538 break;
2094 } 2539 }
2540
2095 if (oldp != TermWin.parent[i]) 2541 if (oldp != TermWin.parent[i])
2096 pchanged = 1; 2542 pchanged = 1;
2097 } 2543 }
2544
2098 n = 0; 2545 n = 0;
2546
2099 if (pchanged) 2547 if (pchanged)
2100 { 2548 {
2101 for (; n < (unsigned int)i; n++) 2549 for (; n < (unsigned int)i; n++)
2102 { 2550 {
2103 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2104 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2105 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2106 { 2553 {
2107 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2108 break; 2555 break;
2109 } 2556 }
2110 } 2557 }
2111 } 2558 }
2112 if (n > (int)(sizeof(TermWin.parent) 2559
2113 / sizeof(TermWin.parent[0]))) 2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2114 { 2561 {
2115 D_X((stderr, "InheritPixmap Turning off")); 2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2116 XSetWindowBackground(display->display, TermWin.parent[0], 2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2117 PixColors[Color_fg]);
2118 XSetWindowBackground(display->display, TermWin.vt,
2119 PixColors[Color_bg]);
2120 am_transparent = 0; 2564 am_transparent = 0;
2121 /* XXX: also turn off Opt_transparent? */ 2565 /* XXX: also turn off Opt_transparent? */
2122 } 2566 }
2123 else 2567 else
2124 { 2568 {
2569#if WAIT_FOR_WM
2125 /* wait (an arbitrary period) for the WM to do its thing 2570 /* wait (an arbitrary period) for the WM to do its thing
2126 * needed for fvwm2.2.2 (and before?) */ 2571 * needed for fvwm2.2.2 (and before?) */
2127# ifdef HAVE_NANOSLEEP
2128 struct timespec rqt;
2129
2130 rqt.tv_sec = 1;
2131 rqt.tv_nsec = 0;
2132 nanosleep(&rqt, NULL);
2133# else
2134 sleep(1); 2572 sleep (1);
2135# endif 2573#endif
2136 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2137 for (n = 0; n < (unsigned int)i; n++) 2574 for (n = 0; n < (unsigned int)i; n++)
2575 {
2138 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2139 ParentRelative); 2577 XClearWindow (disp, TermWin.parent[n]);
2578 }
2579
2140 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2141 ParentRelative);
2142 am_transparent = 1; 2581 am_transparent = 1;
2143 } 2582 }
2583
2144 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2145 TermWin.parent[i] = None; 2585 TermWin.parent[i] = None;
2146 } 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
2147 return pchanged; 2602 return pchanged;
2148} 2603}
2149#endif 2604#endif
2150 2605
2151/*}}} */ 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}
2152 2793
2153/*{{{ print pipe */ 2794/*{{{ print pipe */
2154/*----------------------------------------------------------------------*/ 2795/*----------------------------------------------------------------------*/
2155#ifdef PRINTPIPE 2796#ifdef PRINTPIPE
2156FILE * 2797FILE *
2157rxvt_term::popen_printer () 2798rxvt_term::popen_printer ()
2158{ 2799{
2159 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2800 FILE *stream = popen (rs[Rs_print_pipe], "w");
2160 2801
2161 if (stream == NULL) 2802 if (stream == NULL)
2162 rxvt_print_error("can't open printer pipe"); 2803 rxvt_warn ("can't open printer pipe, not printing.\n");
2804
2163 return stream; 2805 return stream;
2164} 2806}
2165 2807
2166int 2808int
2167rxvt_term::pclose_printer (FILE *stream) 2809rxvt_term::pclose_printer (FILE *stream)
2168{ 2810{
2169 fflush (stream); 2811 fflush (stream);
2170 /* pclose() reported not to work on SunOS 4.1.3 */
2171# if defined (__sun__) /* TODO: RESOLVE THIS */
2172 /* pclose works provided SIGCHLD handler uses waitpid */
2173 return pclose (stream); /* return fclose (stream); */
2174# else
2175 return pclose (stream); 2812 return pclose (stream);
2176# endif
2177} 2813}
2178 2814
2179/* 2815/*
2180 * simulate attached vt100 printer 2816 * simulate attached vt100 printer
2181 */ 2817 */
2182void 2818void
2183rxvt_term::process_print_pipe () 2819rxvt_term::process_print_pipe ()
2184{ 2820{
2185 int done; 2821 int done;
2186 FILE *fd; 2822 FILE *fd;
2187 2823
2188 if ((fd = popen_printer ()) == NULL) 2824 if ((fd = popen_printer ()) == NULL)
2189 return; 2825 return;
2190 2826
2191 /* 2827 /*
2192 * 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
2193 * is received. 2829 * is received.
2194 */ 2830 */
2195 for (done = 0; !done;) 2831 for (done = 0; !done;)
2196 { 2832 {
2197 unsigned char buf[8]; 2833 unsigned char buf[8];
2198 unsigned char ch; 2834 unicode_t ch;
2199 unsigned int i, len; 2835 unsigned int i, len;
2200 2836
2201 if ((ch = cmd_getc ()) != C0_ESC) 2837 if ((ch = cmd_getc ()) != C0_ESC)
2202 { 2838 {
2203 if (putc(ch, fd) == EOF) 2839 if (putc (ch, fd) == EOF)
2204 break; /* done = 1 */ 2840 break; /* done = 1 */
2205 } 2841 }
2206 else 2842 else
2207 { 2843 {
2208 len = 0; 2844 len = 0;
… …
2219 { 2855 {
2220 if ((buf[len++] = cmd_getc ()) == 'i') 2856 if ((buf[len++] = cmd_getc ()) == 'i')
2221 break; /* done = 1 */ 2857 break; /* done = 1 */
2222 } 2858 }
2223 } 2859 }
2860
2224 for (i = 0; i < len; i++) 2861 for (i = 0; i < len; i++)
2225 if (putc(buf[i], fd) == EOF) 2862 if (putc (buf[i], fd) == EOF)
2226 { 2863 {
2227 done = 1; 2864 done = 1;
2228 break; 2865 break;
2229 } 2866 }
2230 } 2867 }
2231 } 2868 }
2869
2232 pclose_printer (fd); 2870 pclose_printer (fd);
2233} 2871}
2234#endif /* PRINTPIPE */ 2872#endif /* PRINTPIPE */
2235/*}}} */ 2873/*}}} */
2236 2874
2237/* *INDENT-OFF* */ 2875/* *INDENT-OFF* */
2238enum { 2876enum {
2239 C1_40 = 0x40, 2877 C1_40 = 0x40,
2240 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,
2241 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,
2242 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,
2243 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,
2244}; 2882};
2245/* *INDENT-ON* */ 2883/* *INDENT-ON* */
2246 2884
2247/*{{{ process non-printing single characters */ 2885/*{{{ process non-printing single characters */
2248void 2886void
2249rxvt_term::process_nonprinting (unsigned char ch) 2887rxvt_term::process_nonprinting (unicode_t ch)
2250{ 2888{
2251 switch (ch) 2889 switch (ch)
2252 { 2890 {
2891 case C0_ESC:
2892 process_escape_seq ();
2893 break;
2253 case C0_ENQ: /* terminal Status */ 2894 case C0_ENQ: /* terminal Status */
2254 if (rs[Rs_answerbackstring]) 2895 if (rs[Rs_answerbackstring])
2255 tt_write(
2256 (const unsigned char *)rs[Rs_answerbackstring], 2896 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2257 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2897 (unsigned int)strlen (rs[Rs_answerbackstring]));
2258 else 2898 else
2259 tt_write((unsigned char *)VT100_ANS, 2899 tt_write ((unsigned char *)VT100_ANS,
2260 (unsigned int)STRLEN(VT100_ANS)); 2900 (unsigned int)strlen (VT100_ANS));
2261 break; 2901 break;
2262 case C0_BEL: /* bell */ 2902 case C0_BEL: /* bell */
2263 scr_bell (); 2903 scr_bell ();
2264 break; 2904 break;
2265 case C0_BS: /* backspace */ 2905 case C0_BS: /* backspace */
… …
2280 scr_charset_choose (1); 2920 scr_charset_choose (1);
2281 break; 2921 break;
2282 case C0_SI: /* shift in - acs */ 2922 case C0_SI: /* shift in - acs */
2283 scr_charset_choose (0); 2923 scr_charset_choose (0);
2284 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
2285 } 2938 }
2286} 2939}
2287/*}}} */ 2940/*}}} */
2288 2941
2289 2942
2290/*{{{ process VT52 escape sequences */ 2943/*{{{ process VT52 escape sequences */
2291void 2944void
2292rxvt_term::process_escape_vt52 (unsigned char ch) 2945rxvt_term::process_escape_vt52 (unicode_t ch)
2293{ 2946{
2294 int row, col; 2947 int row, col;
2295 2948
2296 switch (ch) 2949 switch (ch)
2297 { 2950 {
… …
2327 row = cmd_getc () - ' '; 2980 row = cmd_getc () - ' ';
2328 col = cmd_getc () - ' '; 2981 col = cmd_getc () - ' ';
2329 scr_gotorc (row, col, 0); 2982 scr_gotorc (row, col, 0);
2330 break; 2983 break;
2331 case 'Z': /* identify the terminal type */ 2984 case 'Z': /* identify the terminal type */
2332 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2985 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2333 break; 2986 break;
2334 case '<': /* turn off VT52 mode */ 2987 case '<': /* turn off VT52 mode */
2335 PrivMode(0, PrivMode_vt52); 2988 PrivMode (0, PrivMode_vt52);
2336 break; 2989 break;
2337 case 'F': /* use special graphics character set */ 2990 case 'F': /* use special graphics character set */
2338 case 'G': /* use regular character set */ 2991 case 'G': /* use regular character set */
2339 /* unimplemented */ 2992 /* unimplemented */
2340 break; 2993 break;
… …
2349 3002
2350/*{{{ process escape sequences */ 3003/*{{{ process escape sequences */
2351void 3004void
2352rxvt_term::process_escape_seq () 3005rxvt_term::process_escape_seq ()
2353{ 3006{
2354 unsigned char ch = cmd_getc (); 3007 unicode_t ch = cmd_getc ();
2355 3008
2356 if (PrivateModes & PrivMode_vt52) 3009 if (priv_modes & PrivMode_vt52)
2357 { 3010 {
2358 process_escape_vt52 (ch); 3011 process_escape_vt52 (ch);
2359 return; 3012 return;
2360 } 3013 }
2361 3014
… …
2376 scr_charset_set (2, (unsigned int)cmd_getc ()); 3029 scr_charset_set (2, (unsigned int)cmd_getc ());
2377 break; 3030 break;
2378 case '+': 3031 case '+':
2379 scr_charset_set (3, (unsigned int)cmd_getc ()); 3032 scr_charset_set (3, (unsigned int)cmd_getc ());
2380 break; 3033 break;
2381#ifdef MULTICHAR_SET 3034#if ENABLE_FRILLS
2382 case '$':
2383 scr_charset_set (-2, (unsigned int)cmd_getc ());
2384 break;
2385#endif
2386#ifndef NO_FRILLS
2387 case '6': 3035 case '6':
2388 scr_backindex (); 3036 scr_backindex ();
2389 break; 3037 break;
2390#endif 3038#endif
2391 case '7': 3039 case '7':
2392 scr_cursor (SAVE); 3040 scr_cursor (SAVE);
2393 break; 3041 break;
2394 case '8': 3042 case '8':
2395 scr_cursor (RESTORE); 3043 scr_cursor (RESTORE);
2396 break; 3044 break;
2397#ifndef NO_FRILLS 3045#if ENABLE_FRILLS
2398 case '9': 3046 case '9':
2399 scr_forwardindex (); 3047 scr_forwardindex ();
2400 break; 3048 break;
2401#endif 3049#endif
2402 case '=': 3050 case '=':
2403 case '>': 3051 case '>':
2404 PrivMode((ch == '='), PrivMode_aplKP); 3052 PrivMode ((ch == '='), PrivMode_aplKP);
2405 break; 3053 break;
2406 3054
2407 case C1_40: 3055 case C1_40:
2408 cmd_getc (); 3056 cmd_getc ();
2409 break; 3057 break;
… …
2412 break; 3060 break;
2413 3061
2414 /* 8.3.87: NEXT LINE */ 3062 /* 8.3.87: NEXT LINE */
2415 case C1_NEL: /* ESC E */ 3063 case C1_NEL: /* ESC E */
2416 { 3064 {
2417 uint32_t nlcr[] = { '\n', '\r' }; 3065 unicode_t nlcr[] = { C0_LF, C0_CR };
2418 scr_add_lines (nlcr, 1, 2); 3066 scr_add_lines (nlcr, 1, 2);
2419 } 3067 }
2420 break; 3068 break;
2421 3069
2422 /* kidnapped escape sequence: Should be 8.3.48 */ 3070 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2433 case C1_RI: /* ESC M */ 3081 case C1_RI: /* ESC M */
2434 scr_index (DN); 3082 scr_index (DN);
2435 break; 3083 break;
2436 3084
2437 /* 8.3.142: SINGLE-SHIFT TWO */ 3085 /* 8.3.142: SINGLE-SHIFT TWO */
2438 /*case C1_SS2: scr_single_shift (2); break; */ 3086 /*case C1_SS2: scr_single_shift (2); break; */
2439 3087
2440 /* 8.3.143: SINGLE-SHIFT THREE */ 3088 /* 8.3.143: SINGLE-SHIFT THREE */
2441 /*case C1_SS3: scr_single_shift (3); break; */ 3089 /*case C1_SS3: scr_single_shift (3); break; */
2442 3090
2443 /* 8.3.27: DEVICE CONTROL STRING */ 3091 /* 8.3.27: DEVICE CONTROL STRING */
2444 case C1_DCS: /* ESC P */ 3092 case C1_DCS: /* ESC P */
2445 process_dcs_seq (); 3093 process_dcs_seq ();
2446 break; 3094 break;
2447 3095
2448 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3096 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2449 case C1_SCI: /* ESC Z */ 3097 case C1_SCI: /* ESC Z */
2450 tt_write((const unsigned char *)ESCZ_ANSWER, 3098 tt_write ((const unsigned char *)ESCZ_ANSWER,
2451 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 3099 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2452 break; /* steal obsolete ESC [ c */ 3100 break; /* steal obsolete ESC [ c */
2453 3101
2454 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3102 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2455 case C1_CSI: /* ESC [ */ 3103 case C1_CSI: /* ESC [ */
2456 process_csi_seq (); 3104 process_csi_seq ();
… …
2461 process_osc_seq (); 3109 process_osc_seq ();
2462 break; 3110 break;
2463 3111
2464 /* 8.3.106: RESET TO INITIAL STATE */ 3112 /* 8.3.106: RESET TO INITIAL STATE */
2465 case 'c': 3113 case 'c':
3114 mbstate.reset ();
2466 scr_poweron (); 3115 scr_poweron ();
2467 scrollbar_show (1); 3116 scrollbar_show (1);
2468 break; 3117 break;
2469 3118
2470 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3119 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2482 3131
2483/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3132/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2484/* *INDENT-OFF* */ 3133/* *INDENT-OFF* */
2485enum { 3134enum {
2486 CSI_ICH = 0x40, 3135 CSI_ICH = 0x40,
2487 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,
2488 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 ,
2489 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,
2490 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,
2491 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,
2492 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,
… …
2496 3145
2497#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 3146#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2498 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 3147 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2499 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 3148 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2500#define get_byte_array_bit(array, bit) \ 3149#define get_byte_array_bit(array, bit) \
2501 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 3150 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2502 3151
2503const unsigned char csi_defaults[] = 3152const unsigned char csi_defaults[] =
2504 { 3153 {
2505 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, */
2506 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, */
2507 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, */
2508 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, [, \, ], ^, _, */
2509 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, */
2510 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, */
2511 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, */
2512 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, {, |, }, ~, */
2513 }; 3162 };
2514/* *INDENT-ON* */ 3163/* *INDENT-ON* */
2515 3164
2516void 3165void
2517rxvt_term::process_csi_seq () 3166rxvt_term::process_csi_seq ()
2518{ 3167{
2519 unsigned char ch, priv, i; 3168 unicode_t ch, priv, i;
2520 unsigned int nargs, p; 3169 unsigned int nargs, p;
2521 int n, ndef; 3170 int n, ndef;
2522 int arg[ESC_ARGS]; 3171 int arg[ESC_ARGS];
2523 3172
2524 for (nargs = ESC_ARGS; nargs > 0;) 3173 for (nargs = ESC_ARGS; nargs > 0;)
2525 arg[--nargs] = 0; 3174 arg[--nargs] = 0;
2526 3175
2527 priv = 0; 3176 priv = 0;
… …
2529 if (ch >= '<' && ch <= '?') 3178 if (ch >= '<' && ch <= '?')
2530 { /* '<' '=' '>' '?' */ 3179 { /* '<' '=' '>' '?' */
2531 priv = ch; 3180 priv = ch;
2532 ch = cmd_getc (); 3181 ch = cmd_getc ();
2533 } 3182 }
3183
2534 /* read any numerical arguments */ 3184 /* read any numerical arguments */
2535 for (n = -1; ch < CSI_ICH; ) 3185 for (n = -1; ch < CSI_ICH; )
2536 { 3186 {
2537 if (isdigit(ch)) 3187 if (isdigit (ch))
2538 { 3188 {
2539 if (n < 0) 3189 if (n < 0)
2540 n = ch - '0'; 3190 n = ch - '0';
2541 else 3191 else
2542 n = n * 10 + ch - '0'; 3192 n = n * 10 + ch - '0';
… …
2545 { 3195 {
2546 if (nargs < ESC_ARGS) 3196 if (nargs < ESC_ARGS)
2547 arg[nargs++] = n; 3197 arg[nargs++] = n;
2548 n = -1; 3198 n = -1;
2549 } 3199 }
2550 else if (ch == '\b') 3200 else if (IS_CONTROL (ch))
2551 {
2552 scr_backspace ();
2553 }
2554 else if (ch == C0_ESC)
2555 {
2556 process_escape_seq ();
2557 return;
2558 }
2559 else if (ch < ' ')
2560 {
2561 process_nonprinting (ch); 3201 process_nonprinting (ch);
2562 } 3202
2563 ch = cmd_getc (); 3203 ch = cmd_getc ();
2564 } 3204 }
2565 3205
2566 if (ch > CSI_7F) 3206 if (ch > CSI_7F)
2567 return; 3207 return;
2568 3208
2569 if (nargs < ESC_ARGS) 3209 if (nargs < ESC_ARGS)
2570 arg[nargs++] = n; 3210 arg[nargs++] = n;
2571 3211
2572 i = ch - CSI_ICH; 3212 i = ch - CSI_ICH;
2573 ndef = get_byte_array_bit(csi_defaults, i); 3213 ndef = get_byte_array_bit (csi_defaults, i);
2574 for (p = 0; p < nargs; p++) 3214 for (p = 0; p < nargs; p++)
2575 if (arg[p] == -1) 3215 if (arg[p] == -1)
2576 arg[p] = ndef; 3216 arg[p] = ndef;
2577 3217
2578#ifdef DEBUG_CMD 3218#ifdef DEBUG_CMD
2579 fprintf(stderr, "CSI "); 3219 fprintf (stderr, "CSI ");
2580 for (p = 0; p < nargs; p++) 3220 for (p = 0; p < nargs; p++)
2581 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 3221 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2582 fprintf(stderr, "%c\n", ch); 3222 fprintf (stderr, "%c\n", ch);
2583#endif 3223#endif
2584 3224
2585 /* 3225 /*
2586 * private mode handling 3226 * private mode handling
2587 */ 3227 */
… …
2589 { 3229 {
2590 switch (priv) 3230 switch (priv)
2591 { 3231 {
2592 case '>': 3232 case '>':
2593 if (ch == CSI_DA) /* secondary device attributes */ 3233 if (ch == CSI_DA) /* secondary device attributes */
2594 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 3234 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2595 break; 3235 break;
2596 case '?': 3236 case '?':
2597 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3237 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598 process_terminal_mode (ch, priv, nargs, arg); 3238 process_terminal_mode (ch, priv, nargs, arg);
2599 break; 3239 break;
… …
2602 } 3242 }
2603 3243
2604 switch (ch) 3244 switch (ch)
2605 { 3245 {
2606 /* 3246 /*
2607 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 3247 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2608 */ 3248 */
2609#ifdef PRINTPIPE 3249#ifdef PRINTPIPE
2610 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 3250 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2611 switch (arg[0]) 3251 switch (arg[0])
2612 { 3252 {
… …
2708 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2709 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2710 break; 3350 break;
2711 3351
2712 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2713 tt_write((const unsigned char *)VT100_ANS, 3353 tt_write ((const unsigned char *)VT100_ANS,
2714 (unsigned int)(sizeof(VT100_ANS) - 1)); 3354 (unsigned int) (sizeof (VT100_ANS) - 1));
2715 break; 3355 break;
2716 3356
2717 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3357 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2718 process_sgr_mode (nargs, arg); 3358 process_sgr_mode (nargs, arg);
2719 break; 3359 break;
2720 3360
2721 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3361 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2722 switch (arg[0]) 3362 switch (arg[0])
2723 { 3363 {
2724 case 5: /* DSR requested */ 3364 case 5: /* DSR requested */
2725 tt_printf("\033[0n"); 3365 tt_printf ("\033[0n");
2726 break; 3366 break;
2727 case 6: /* CPR requested */ 3367 case 6: /* CPR requested */
2728 scr_report_position (); 3368 scr_report_position ();
2729 break; 3369 break;
2730#if defined (ENABLE_DISPLAY_ANSWER)
2731 case 7: /* unofficial extension */ 3370 case 7: /* unofficial extension */
3371 if (options & Opt_insecure)
2732 tt_printf("%-.250s\n", rs[Rs_display_name]); 3372 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2733 break; 3373 break;
2734#endif
2735 case 8: /* unofficial extension */ 3374 case 8: /* unofficial extension */
2736 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2737 break; 3376 break;
2738 } 3377 }
2739 break; 3378 break;
2740 3379
2741 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3380 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2774 break; 3413 break;
2775 3414
2776 case CSI_RM: /* 8.3.107: RESET MODE */ 3415 case CSI_RM: /* 8.3.107: RESET MODE */
2777 if (arg[0] == 4) 3416 if (arg[0] == 4)
2778 scr_insert_mode (0); 3417 scr_insert_mode (0);
3418 else if (arg[0] == 20)
3419 priv_modes &= ~PrivMode_LFNL;
2779 break; 3420 break;
2780 3421
2781 case CSI_SM: /* 8.3.126: SET MODE */ 3422 case CSI_SM: /* 8.3.126: SET MODE */
2782 if (arg[0] == 4) 3423 if (arg[0] == 4)
2783 scr_insert_mode (1); 3424 scr_insert_mode (1);
3425 else if (arg[0] == 20)
3426 priv_modes |= PrivMode_LFNL;
2784 break; 3427 break;
2785 3428
2786 /* 3429 /*
2787 * PRIVATE USE beyond this point. All CSI_7? sequences here 3430 * PRIVATE USE beyond this point. All CSI_7? sequences here
2788 */ 3431 */
… …
2800 break; 3443 break;
2801 case CSI_75: 3444 case CSI_75:
2802 scr_cursor (RESTORE); 3445 scr_cursor (RESTORE);
2803 break; 3446 break;
2804 3447
2805#ifndef NO_FRILLS 3448#if ENABLE_FRILLS
2806 case CSI_74: 3449 case CSI_74:
2807 process_window_ops (arg, nargs); 3450 process_window_ops (arg, nargs);
2808 break; 3451 break;
2809#endif 3452#endif
2810 3453
2811 case CSI_78: /* DECREQTPARM */ 3454 case CSI_78: /* DECREQTPARM */
2812 if (arg[0] == 0 || arg[0] == 1) 3455 if (arg[0] == 0 || arg[0] == 1)
2813 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);
2814 /* FALLTHROUGH */ 3457 break;
2815 3458
2816 default: 3459 default:
2817 break; 3460 break;
2818 } 3461 }
2819} 3462}
2820/*}}} */ 3463/*}}} */
2821 3464
2822#ifndef NO_FRILLS 3465#if ENABLE_FRILLS
2823/* ARGSUSED */ 3466/* ARGSUSED */
2824void 3467void
2825rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3468rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2826{ 3469{
2827 int x, y; 3470 int x, y;
2828#if 0
2829 char *s;
2830#endif
2831 XWindowAttributes wattr; 3471 XWindowAttributes wattr;
2832 Window wdummy; 3472 Window wdummy;
3473 dDisp;
2833 3474
2834 if (nargs == 0) 3475 if (nargs == 0)
2835 return; 3476 return;
3477
2836 switch (args[0]) 3478 switch (args[0])
2837 { 3479 {
2838 /* 3480 /*
2839 * commands 3481 * commands
2840 */ 3482 */
2841 case 1: /* deiconify window */ 3483 case 1: /* deiconify window */
2842 XMapWindow(display->display, TermWin.parent[0]); 3484 XMapWindow (disp, TermWin.parent[0]);
2843 break; 3485 break;
2844 case 2: /* iconify window */ 3486 case 2: /* iconify window */
2845 XIconifyWindow(display->display, TermWin.parent[0], 3487 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2846 DefaultScreen(display->display));
2847 break; 3488 break;
2848 case 3: /* set position (pixels) */ 3489 case 3: /* set position (pixels) */
2849 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2850 break; 3491 break;
2851 case 4: /* set size (pixels) */ 3492 case 4: /* set size (pixels) */
2852 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2853 break; 3494 break;
2854 case 5: /* raise window */ 3495 case 5: /* raise window */
2855 XRaiseWindow(display->display, TermWin.parent[0]); 3496 XRaiseWindow (disp, TermWin.parent[0]);
2856 break; 3497 break;
2857 case 6: /* lower window */ 3498 case 6: /* lower window */
2858 XLowerWindow(display->display, TermWin.parent[0]); 3499 XLowerWindow (disp, TermWin.parent[0]);
2859 break; 3500 break;
2860 case 7: /* refresh window */ 3501 case 7: /* refresh window */
2861 scr_touch (true); 3502 scr_touch (true);
2862 break; 3503 break;
2863 case 8: /* set size (chars) */ 3504 case 8: /* set size (chars) */
2864 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2865 (unsigned int)(args[1] * TermWin.fheight)); 3506 (unsigned int) (args[1] * TermWin.fheight));
2866 break; 3507 break;
3508
3509 //case 9: NYI, TODO, restore maximized window or maximize window
2867 default: 3510 default:
2868 if (args[0] >= 24) /* set height (chars) */ 3511 if (args[0] >= 24) /* set height (chars) */
2869 set_widthheight ((unsigned int)TermWin.width, 3512 set_widthheight ((unsigned int)TermWin.width,
2870 (unsigned int)(args[1] * TermWin.fheight)); 3513 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 3514 break;
3515
3516
2872 /* 3517 /*
2873 * reports - some output format copied from XTerm 3518 * reports - some output format copied from XTerm
2874 */ 3519 */
2875 case 11: /* report window state */ 3520 case 11: /* report window state */
2876 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2877 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2878 break; 3523 break;
2879 case 13: /* report window position */ 3524 case 13: /* report window position */
2880 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2881 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2882 -wattr.border_width, -wattr.border_width, 3527 -wattr.border_width, -wattr.border_width,
2883 &x, &y, &wdummy); 3528 &x, &y, &wdummy);
2884 tt_printf("\033[3;%d;%dt", x, y); 3529 tt_printf ("\033[3;%d;%dt", x, y);
2885 break; 3530 break;
2886 case 14: /* report window size (pixels) */ 3531 case 14: /* report window size (pixels) */
2887 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2888 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2889 break; 3534 break;
2890 case 18: /* report window size (chars) */ 3535 case 18: /* report text area size (chars) */
2891 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2892 break; 3537 break;
2893#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;
2894 case 20: /* report icon label */ 3541 case 20: /* report icon label */
3542 {
3543 char *s;
2895 XGetIconName(display->display, TermWin.parent[0], &s); 3544 XGetIconName (disp, TermWin.parent[0], &s);
2896 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 }
2897 break; 3548 break;
2898 case 21: /* report window title */ 3549 case 21: /* report window title */
3550 {
3551 char *s;
2899 XFetchName(display->display, TermWin.parent[0], &s); 3552 XFetchName (disp, TermWin.parent[0], &s);
2900 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 }
2901 break; 3556 break;
2902#endif
2903
2904 } 3557 }
2905} 3558}
2906#endif 3559#endif
2907 3560
2908/*----------------------------------------------------------------------*/ 3561/*----------------------------------------------------------------------*/
2909/* 3562/*
2910 * get input up until STRING TERMINATOR (or BEL) 3563 * get input up until STRING TERMINATOR (or BEL)
2911 * ends_how is terminator used. returned input must be free()d 3564 * ends_how is terminator used. returned input must be free()'d
2912 */ 3565 */
2913unsigned char * 3566unsigned char *
2914rxvt_term::get_to_st (unsigned char *ends_how) 3567rxvt_term::get_to_st (unicode_t &ends_how)
2915{ 3568{
2916 int seen_esc = 0; /* seen escape? */ 3569 unicode_t ch;
3570 bool seen_esc = false;
2917 unsigned int n = 0; 3571 unsigned int n = 0;
2918 unsigned char *s; 3572 wchar_t string[STRING_MAX];
2919 unsigned char ch, string[STRING_MAX];
2920 3573
2921 for (; (ch = cmd_getc ());) 3574 while ((ch = cmd_getc ()) != NOCHAR)
2922 { 3575 {
2923 if (ch == C0_BEL 3576 if (seen_esc)
2924 || ch == CHAR_ST 3577 {
2925 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3578 if (ch == 0x5c) /* 7bit ST */
2926 break; 3579 break;
3580 else
3581 return NULL;
3582 }
2927 if (ch == C0_ESC) 3583 else if (ch == C0_ESC)
2928 { 3584 {
2929 seen_esc = 1; 3585 seen_esc = true;
2930 continue; 3586 continue;
2931 } 3587 }
2932 else if (ch == '\t') 3588 else if (ch == C0_BEL || ch == CHAR_ST)
2933 ch = ' '; /* translate '\t' to space */ 3589 break;
2934 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3590 else if (ch < 0x20)
2935 return NULL; /* other control character - exit */ 3591 return NULL; /* other control character - exit */
2936 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
2937 string[n++] = ch; 3602 string[n++] = ch;
2938 seen_esc = 0;
2939 } 3603 }
3604
2940 string[n++] = '\0'; 3605 string[n++] = '\0';
2941 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3606
2942 return NULL;
2943 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3607 ends_how = (ch == 0x5c ? C0_ESC : ch);
2944 STRNCPY(s, string, n); 3608
2945 return s; 3609 return (unsigned char *)rxvt_wcstombs (string);
2946} 3610}
2947 3611
2948/*----------------------------------------------------------------------*/ 3612/*----------------------------------------------------------------------*/
2949/* 3613/*
2950 * 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)'
2951 */ 3615 */
2952void 3616void
2953rxvt_term::process_dcs_seq () 3617rxvt_term::process_dcs_seq ()
2954{ 3618{
2955 unsigned char eh, *s; 3619 unsigned char *s;
3620 unicode_t eh;
3621
2956 /* 3622 /*
2957 * Not handled yet 3623 * Not handled yet
2958 */ 3624 */
2959 s = get_to_st (&eh); 3625 s = get_to_st (eh);
2960 if (s) 3626 if (s)
2961 free(s); 3627 free (s);
3628
2962 return; 3629 return;
2963} 3630}
2964 3631
2965/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
2966/* 3633/*
2967 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3634 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2968 */ 3635 */
2969void 3636void
2970rxvt_term::process_osc_seq () 3637rxvt_term::process_osc_seq ()
2971{ 3638{
2972 unsigned char ch, eh, *s; 3639 unicode_t ch, eh;
2973 int arg; 3640 int arg;
2974 3641
2975 ch = cmd_getc (); 3642 ch = cmd_getc ();
2976 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3643 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2977 arg = arg * 10 + (ch - '0'); 3644 arg = arg * 10 + (ch - '0');
2978 3645
2979 if (ch == ';') 3646 if (ch == ';')
2980 { 3647 {
2981 s = get_to_st (&eh); 3648 unsigned char *s = get_to_st (eh);
3649
2982 if (s) 3650 if (s)
2983 { 3651 {
2984 /*
2985 * rxvt_menubar_dispatch() violates the constness of the string,
2986 * so do it here
2987 */
2988 if (arg == XTerm_Menu)
2989#if 0 /* XXX: currently disabled due to security concerns */
2990 menubar_dispatch ((char *)s);
2991#else
2992 (void)0;
2993#endif
2994 else
2995 xterm_seq (arg, (char *)s, eh); 3652 process_xterm_seq (arg, (char *)s, eh);
2996 free(s); 3653 free (s);
2997 } 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])
2998 } 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);
2999} 3669}
3670
3000/* 3671/*
3001 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3672 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3002 * 0 = change iconName/title
3003 * 1 = change iconName
3004 * 2 = change title
3005 * 4 = change color
3006 * 12 = change text color
3007 * 13 = change mouse foreground color
3008 * 17 = change highlight character colour
3009 * 18 = change bold character color
3010 * 19 = change underlined character color
3011 * 46 = change logfile (not implemented)
3012 * 50 = change font
3013 *
3014 * rxvt extensions:
3015 * 10 = menu (may change in future)
3016 * 20 = bg pixmap
3017 * 39 = change default fg color
3018 * 49 = change default bg color
3019 * 55 = dump scrollback buffer and all of screen
3020 */ 3673 */
3021void 3674void
3022rxvt_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)
3023{ 3676{
3024 int changed = 0; 3677 int changed = 0;
3025 int color; 3678 int color;
3026 char *buf, *name; 3679 char *buf, *name;
3680 bool query = str[0] == '?' && !str[1];
3681 int saveop = op;
3682 dDisp;
3027 3683
3028 assert(str != NULL); 3684 assert (str != NULL);
3029 switch (op) 3685 switch (op)
3030 { 3686 {
3031 case XTerm_name: 3687 case XTerm_name:
3032 set_title (str); 3688 set_title (str);
3033 /* FALLTHROUGH */ 3689 /* FALLTHROUGH */
3034 case XTerm_iconName: 3690 case XTerm_iconName:
3035 set_iconName (str); 3691 set_icon_name (str);
3036 break; 3692 break;
3037 case XTerm_title: 3693 case XTerm_title:
3038 set_title (str); 3694 set_title (str);
3039 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
3040 case XTerm_Color: 3735 case XTerm_Color:
3041 for (buf = (char *)str; buf && *buf;) 3736 for (buf = (char *)str; buf && *buf;)
3042 { 3737 {
3043 if ((name = STRCHR(buf, ';')) == NULL) 3738 if ((name = strchr (buf, ';')) == NULL)
3044 break; 3739 break;
3740
3045 *name++ = '\0'; 3741 *name++ = '\0';
3046 color = atoi(buf); 3742 color = atoi (buf);
3743
3047 if (color < 0 || color >= TOTAL_COLORS) 3744 if (color < 0 || color >= TOTAL_COLORS)
3048 break; 3745 break;
3746
3049 if ((buf = STRCHR(name, ';')) != NULL) 3747 if ((buf = strchr (name, ';')) != NULL)
3050 *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
3051 set_window_color (color + minCOLOR, name); 3757 set_window_color (color + minCOLOR, name);
3052 } 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);
3053 break; 3765 break;
3054#ifndef NO_CURSORCOLOR 3766#ifndef NO_CURSORCOLOR
3055 case XTerm_Color_cursor: 3767 case XTerm_Color_cursor:
3056 set_window_color (Color_cursor, str); 3768 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3057 break; 3769 break;
3058#endif 3770#endif
3059 case XTerm_Color_pointer: 3771 case XTerm_Color_pointer_fg:
3060 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);
3061 break; 3776 break;
3062#ifndef NO_BOLD_UNDERLINE_REVERSE 3777#ifndef NO_BOLD_UNDERLINE_REVERSE
3063 case XTerm_Color_BD: 3778 case XTerm_Color_BD:
3064 set_window_color (Color_BD, str); 3779 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3065 break; 3780 break;
3066 case XTerm_Color_UL: 3781 case XTerm_Color_UL:
3067 set_window_color (Color_UL, str); 3782 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3068 break; 3783 break;
3069 case XTerm_Color_RV: 3784 case XTerm_Color_RV:
3070 set_window_color (Color_RV, str); 3785 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3071 break; 3786 break;
3072#endif 3787 case URxvt_Color_IT:
3073 3788 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3074 case XTerm_Menu:
3075 /*
3076 * rxvt_menubar_dispatch() violates the constness of the string,
3077 * so DON'T do it here
3078 */
3079 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
3080 case XTerm_Pixmap: 3800 case XTerm_Pixmap:
3081 if (*str != ';') 3801 if (*str != ';')
3082 { 3802 {
3083#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3084 scale_pixmap (""); /* reset to default scaling */ 3804 scale_pixmap (""); /* reset to default scaling */
3085 set_bgPixmap (str); /* change pixmap */ 3805 set_bgPixmap (str); /* change pixmap */
3086#endif 3806#endif
3087 scr_touch (true); 3807 scr_touch (true);
3088 } 3808 }
3089 while ((str = STRCHR(str, ';')) != NULL) 3809 while ((str = strchr (str, ';')) != NULL)
3090 { 3810 {
3091 str++; 3811 str++;
3092#if XPM_BACKGROUND 3812#if XPM_BACKGROUND
3093 changed += scale_pixmap (str); 3813 changed += scale_pixmap (str);
3094#endif 3814#endif
3095
3096 } 3815 }
3816
3097 if (changed) 3817 if (changed)
3098 { 3818 {
3099#ifdef XPM_BACKGROUND 3819#ifdef XPM_BACKGROUND
3100 resize_pixmap (); 3820 resize_pixmap ();
3101#endif 3821#endif
… …
3107 set_window_color (Color_fg, str); 3827 set_window_color (Color_fg, str);
3108 break; 3828 break;
3109 case XTerm_restoreBG: 3829 case XTerm_restoreBG:
3110 set_window_color (Color_bg, str); 3830 set_window_color (Color_bg, str);
3111 break; 3831 break;
3832
3112 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
3113 break; 3841 break;
3114 case XTerm_font: 3842#endif
3115 change_font (0, str);
3116 break;
3117#if 0 3843#if 0
3118 case XTerm_dumpscreen: /* no error notices */ 3844 case XTerm_dumpscreen: /* no error notices */
3119 { 3845 {
3120 int fd; 3846 int fd;
3121 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)
3122 { 3848 {
3123 scr_dump (fd); 3849 scr_dump (fd);
3124 close(fd); 3850 close (fd);
3125 } 3851 }
3126 } 3852 }
3127 break; 3853 break;
3128#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)];
3129 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
3130 } 3903 }
3131} 3904}
3132/*----------------------------------------------------------------------*/ 3905/*----------------------------------------------------------------------*/
3133 3906
3134/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3907/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3142 * so no need for fancy checking 3915 * so no need for fancy checking
3143 */ 3916 */
3144int 3917int
3145rxvt_term::privcases (int mode, unsigned long bit) 3918rxvt_term::privcases (int mode, unsigned long bit)
3146{ 3919{
3147 int state; 3920 int state;
3148 3921
3149 if (mode == 's') 3922 if (mode == 's')
3150 { 3923 {
3151 SavedModes |= (PrivateModes & bit); 3924 SavedModes |= (priv_modes & bit);
3152 return -1; 3925 return -1;
3153 } 3926 }
3154 else 3927 else
3155 { 3928 {
3156 if (mode == 'r') 3929 if (mode == 'r')
3157 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3930 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3158 else 3931 else
3159 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3932 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3160 PrivMode(state, bit); 3933 PrivMode (state, bit);
3161 } 3934 }
3935
3162 return state; 3936 return state;
3163} 3937}
3164 3938
3165/* we're not using priv _yet_ */ 3939/* we're not using priv _yet_ */
3166void 3940void
3167rxvt_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)
3168{ 3942{
3169 unsigned int i, j; 3943 unsigned int i, j;
3170 int state; 3944 int state;
3945
3171 static const struct 3946 static const struct
3172 { 3947 {
3173 const int argval; 3948 const int argval;
3174 const unsigned long bit; 3949 const unsigned long bit;
3175 } 3950 }
3951
3176 argtopriv[] = { 3952 argtopriv[] = {
3177 { 1, PrivMode_aplCUR }, 3953 { 1, PrivMode_aplCUR },
3178 { 2, PrivMode_vt52 }, 3954 { 2, PrivMode_vt52 },
3179 { 3, PrivMode_132 }, 3955 { 3, PrivMode_132 },
3180 { 4, PrivMode_smoothScroll }, 3956 { 4, PrivMode_smoothScroll },
3181 { 5, PrivMode_rVideo }, 3957 { 5, PrivMode_rVideo },
3182 { 6, PrivMode_relOrigin }, 3958 { 6, PrivMode_relOrigin },
3183 { 7, PrivMode_Autowrap }, 3959 { 7, PrivMode_Autowrap },
3960 // 8, bi-directional support mode
3184 { 9, PrivMode_MouseX10 }, 3961 { 9, PrivMode_MouseX10 },
3185#ifdef menuBar_esc 3962#ifdef menuBar_esc
3186 { menuBar_esc, PrivMode_menuBar }, 3963 { menuBar_esc, PrivMode_menuBar },
3187#endif 3964#endif
3965 // 18, 19 printing-related
3966 { 25, PrivMode_VisibleCursor },
3188#ifdef scrollBar_esc 3967#ifdef scrollBar_esc
3189 { scrollBar_esc, PrivMode_scrollBar }, 3968 { scrollBar_esc, PrivMode_scrollBar },
3190#endif 3969#endif
3191 { 25, PrivMode_VisibleCursor },
3192 { 35, PrivMode_ShiftKeys }, 3970 { 35, PrivMode_ShiftKeys }, // rxvt extension
3193 { 40, PrivMode_132OK }, 3971 { 40, PrivMode_132OK },
3972 // 41 xterm more fixes NYI
3973 // 45 margin bell NYI
3974 // 46 start logging
3194 { 47, PrivMode_Screen }, 3975 { 47, PrivMode_Screen },
3195 { 66, PrivMode_aplKP }, 3976 { 66, PrivMode_aplKP },
3196#ifndef NO_BACKSPACE_KEY 3977#ifndef NO_BACKSPACE_KEY
3197 { 67, PrivMode_BackSpace }, 3978 { 67, PrivMode_BackSpace },
3198#endif 3979#endif
3199 { 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
3200 { 1010, PrivMode_TtyOutputInh }, 3984 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3201 { 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
3202 { 1047, PrivMode_Screen }, 3989 { 1047, PrivMode_Screen },
3990 // 1048 save and restore cursor
3203 { 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
3204 }; 3993 };
3205 3994
3206 if (nargs == 0) 3995 if (nargs == 0)
3207 return; 3996 return;
3208 3997
… …
3215 for (i = 0; i < nargs; i++) 4004 for (i = 0; i < nargs; i++)
3216 { 4005 {
3217 state = -1; 4006 state = -1;
3218 4007
3219 /* basic handling */ 4008 /* basic handling */
3220 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 4009 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3221 if (argtopriv[j].argval == arg[i]) 4010 if (argtopriv[j].argval == arg[i])
3222 { 4011 {
3223 state = privcases (mode, argtopriv[j].bit); 4012 state = privcases (mode, argtopriv[j].bit);
3224 break; 4013 break;
3225 } 4014 }
3226 4015
3227 /* extra handling for values with state unkept */ 4016 /* extra handling for values with state unkept */
3228 if (state == -1)
3229 switch (arg[i]) 4017 switch (arg[i])
3230 { 4018 {
3231 case 1048: /* alternative cursor save */ 4019 case 1048: /* alternative cursor save */
4020 case 1049:
4021 if (options & Opt_secondaryScreen)
3232 if (mode == 0) 4022 if (mode == 0)
3233 scr_cursor (RESTORE); 4023 scr_cursor (RESTORE);
3234 else if (mode == 1) 4024 else if (mode == 1)
3235 scr_cursor (SAVE); 4025 scr_cursor (SAVE);
3236 /* FALLTHROUGH */
3237 default:
3238 continue; /* for(;i;) */
3239 }
3240
3241 /* extra handling for values with valid 0 or 1 state */
3242 switch (arg[i])
3243 {
3244 /* case 1: - application cursor keys */
3245 case 2: /* VT52 mode */
3246 /* oddball mode. should be set regardless of set/reset
3247 * parameter. Return from VT52 mode with an ESC < from
3248 * within VT52 mode
3249 */
3250 PrivMode(1, PrivMode_vt52);
3251 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;
3252 case 3: /* 80/132 */ 4041 case 3: /* 80/132 */
3253 if (PrivateModes & PrivMode_132OK) 4042 if (priv_modes & PrivMode_132OK)
3254 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3255 (unsigned int)TermWin.height);
3256 break; 4044 break;
3257 case 4: /* smooth scrolling */ 4045 case 4: /* smooth scrolling */
3258 if (state) 4046 if (state)
3259 Options &= ~Opt_jumpScroll; 4047 options &= ~Opt_jumpScroll;
3260 else 4048 else
3261 Options |= Opt_jumpScroll; 4049 options |= Opt_jumpScroll;
3262 break; 4050 break;
3263 case 5: /* reverse video */ 4051 case 5: /* reverse video */
3264 scr_rvideo_mode (state); 4052 scr_rvideo_mode (state);
3265 break; 4053 break;
3266 case 6: /* relative/absolute origins */ 4054 case 6: /* relative/absolute origins */
3267 scr_relative_origin (state); 4055 scr_relative_origin (state);
3268 break; 4056 break;
3269 case 7: /* autowrap */ 4057 case 7: /* autowrap */
3270 scr_autowrap (state); 4058 scr_autowrap (state);
3271 break; 4059 break;
3272 /* 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 */
3273 case 9: /* X10 mouse reporting */ 4061 case 9: /* X10 mouse reporting */
3274 if (state) /* orthogonal */ 4062 if (state) /* orthogonal */
3275 PrivateModes &= ~(PrivMode_MouseX11); 4063 priv_modes &= ~PrivMode_MouseX11;
3276 break; 4064 break;
3277#ifdef menuBar_esc 4065#ifdef menuBar_esc
3278 case menuBar_esc: 4066 case menuBar_esc:
3279#ifdef MENUBAR 4067#ifdef MENUBAR
3280 map_menuBar (state); 4068 map_menuBar (state);
3281#endif 4069#endif
3282 break; 4070 break;
3283#endif 4071#endif
3284#ifdef scrollBar_esc 4072#ifdef scrollBar_esc
3285 case scrollBar_esc: 4073 case scrollBar_esc:
3286 if (scrollbar_mapping (state)) 4074 if (scrollbar_mapping (state))
3287 { 4075 {
3288 resize_all_windows (0, 0, 0); 4076 resize_all_windows (0, 0, 0);
3289 scr_touch (true); 4077 scr_touch (true);
3290 } 4078 }
3291 break; 4079 break;
3292#endif 4080#endif
3293 case 25: /* visible/invisible cursor */ 4081 case 25: /* visible/invisible cursor */
3294 scr_cursor_visible (state); 4082 scr_cursor_visible (state);
3295 break; 4083 break;
3296 /* case 35: - shift keys */ 4084 /* case 35: - shift keys */
3297 /* case 40: - 80 <--> 132 mode */ 4085 /* case 40: - 80 <--> 132 mode */
3298 case 47: /* secondary screen */ 4086 case 47: /* secondary screen */
3299 scr_change_screen (state); 4087 scr_change_screen (state);
3300 break; 4088 break;
3301 /* case 66: - application key pad */ 4089 /* case 66: - application key pad */
3302 /* case 67: - backspace key */ 4090 /* case 67: - backspace key */
3303 case 1000: /* X11 mouse reporting */ 4091 case 1000: /* X11 mouse reporting */
3304 if (state) /* orthogonal */ 4092 if (state) /* orthogonal */
3305 PrivateModes &= ~(PrivMode_MouseX10); 4093 priv_modes &= ~PrivMode_MouseX10;
3306 break; 4094 break;
3307#if 0 4095#if 0
3308 case 1001: 4096 case 1001:
3309 break; /* X11 mouse highlighting */ 4097 break; /* X11 mouse highlighting */
3310#endif 4098#endif
3311 case 1010: /* scroll to bottom on TTY output inhibit */ 4099 case 1010: /* scroll to bottom on TTY output inhibit */
3312 if (state) 4100 if (state)
3313 Options &= ~Opt_scrollTtyOutput; 4101 options &= ~Opt_scrollTtyOutput;
3314 else 4102 else
3315 Options |= Opt_scrollTtyOutput; 4103 options |= Opt_scrollTtyOutput;
3316 break; 4104 break;
3317 case 1011: /* scroll to bottom on key press */ 4105 case 1011: /* scroll to bottom on key press */
3318 if (state) 4106 if (state)
3319 Options |= Opt_scrollTtyKeypress; 4107 options |= Opt_scrollTtyKeypress;
3320 else 4108 else
3321 Options &= ~Opt_scrollTtyKeypress; 4109 options &= ~Opt_scrollTtyKeypress;
3322 break; 4110 break;
3323 case 1047: /* secondary screen w/ clearing */ 4111 case 1047: /* secondary screen w/ clearing last */
3324 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4112 if (options & Opt_secondaryScreen)
3325 if (current_screen != PRIMARY) 4113 if (current_screen != PRIMARY)
3326 scr_erase_screen (2); 4114 scr_erase_screen (2);
3327 scr_change_screen (state); 4115 scr_change_screen (state);
3328 /* FALLTHROUGH */
3329 default:
3330 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;
3331 } 4125 }
3332 } 4126 }
3333} 4127}
3334/*}}} */ 4128/*}}} */
3335 4129
3336/*{{{ process sgr sequences */ 4130/*{{{ process sgr sequences */
3337void 4131void
3338rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4132rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3339{ 4133{
3340 unsigned int i; 4134 unsigned int i;
3341 short rendset; 4135 short rendset;
3342 int rendstyle; 4136 int rendstyle;
3343 4137
3344 if (nargs == 0) 4138 if (nargs == 0)
3345 { 4139 {
3346 scr_rendition (0, ~RS_None); 4140 scr_rendition (0, ~RS_None);
3347 return; 4141 return;
3348 } 4142 }
4143
3349 for (i = 0; i < nargs; i++) 4144 for (i = 0; i < nargs; i++)
3350 { 4145 {
3351 rendset = -1; 4146 rendset = -1;
3352 switch (arg[i]) 4147 switch (arg[i])
3353 { 4148 {
… …
3355 rendset = 0, rendstyle = ~RS_None; 4150 rendset = 0, rendstyle = ~RS_None;
3356 break; 4151 break;
3357 case 1: 4152 case 1:
3358 rendset = 1, rendstyle = RS_Bold; 4153 rendset = 1, rendstyle = RS_Bold;
3359 break; 4154 break;
4155 //case 2: // low intensity
4156 case 3:
4157 rendset = 1, rendstyle = RS_Italic;
4158 break;
3360 case 4: 4159 case 4:
3361 rendset = 1, rendstyle = RS_Uline; 4160 rendset = 1, rendstyle = RS_Uline;
3362 break; 4161 break;
3363 case 5: 4162 case 5: // slowly blinking
4163 case 6: // rapidly blinking
3364 rendset = 1, rendstyle = RS_Blink; 4164 rendset = 1, rendstyle = RS_Blink;
3365 break; 4165 break;
4166 //case 6: // scoansi light background
3366 case 7: 4167 case 7:
3367 rendset = 1, rendstyle = RS_RVid; 4168 rendset = 1, rendstyle = RS_RVid;
3368 break; 4169 break;
3369 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)
3370 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;
3371 break; 4188 break;
3372 case 24: 4189 case 24:
3373 rendset = 0, rendstyle = RS_Uline; 4190 rendset = 0, rendstyle = RS_Uline;
3374 break; 4191 break;
3375 case 25: 4192 case 25:
3376 rendset = 0, rendstyle = RS_Blink; 4193 rendset = 0, rendstyle = RS_Blink;
3377 break; 4194 break;
4195 case 26: // variable spacing (iso 8613)
4196 rendset = 0, rendstyle = RS_Blink;
4197 break;
3378 case 27: 4198 case 27:
3379 rendset = 0, rendstyle = RS_RVid; 4199 rendset = 0, rendstyle = RS_RVid;
3380 break; 4200 break;
4201 //case 28: // visible. NYI
4202 //case 29: // not crossed-out
3381 } 4203 }
4204
3382 if (rendset != -1) 4205 if (rendset != -1)
3383 { 4206 {
3384 scr_rendition (rendset, rendstyle); 4207 scr_rendition (rendset, rendstyle);
3385 continue; /* for(;i;) */ 4208 continue; /* for (;i;) */
3386 } 4209 }
3387 4210
3388 switch (arg[i]) 4211 switch (arg[i])
3389 { 4212 {
3390 case 30: 4213 case 30:
… …
3393 case 33: 4216 case 33:
3394 case 34: 4217 case 34:
3395 case 35: 4218 case 35:
3396 case 36: 4219 case 36:
3397 case 37: 4220 case 37:
3398 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 4221 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3399 Color_fg);
3400 break; 4222 break;
3401#ifdef TTY_256COLOR 4223 case 38: // set fg color, ISO 8613-6
3402 case 38:
3403 if (nargs > i + 2 && arg[i + 1] == 5) 4224 if (nargs > i + 2 && arg[i + 1] == 5)
3404 { 4225 {
3405 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4226 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3406 Color_fg);
3407 i += 2; 4227 i += 2;
3408 } 4228 }
3409 break; 4229 break;
3410#endif
3411 case 39: /* default fg */ 4230 case 39: /* default fg */
3412 scr_color (Color_fg, Color_fg); 4231 scr_color (Color_fg, Color_fg);
3413 break; 4232 break;
3414 4233
3415 case 40: 4234 case 40:
… …
3418 case 43: 4237 case 43:
3419 case 44: 4238 case 44:
3420 case 45: 4239 case 45:
3421 case 46: 4240 case 46:
3422 case 47: 4241 case 47:
3423 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 4242 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3424 Color_bg);
3425 break; 4243 break;
3426#ifdef TTY_256COLOR 4244 case 48: // set bg color, ISO 8613-6
3427 case 48:
3428 if (nargs > i + 2 && arg[i + 1] == 5) 4245 if (nargs > i + 2 && arg[i + 1] == 5)
3429 { 4246 {
3430 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4247 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3431 Color_bg);
3432 i += 2; 4248 i += 2;
3433 } 4249 }
3434 break; 4250 break;
3435#endif
3436 case 49: /* default bg */ 4251 case 49: /* default bg */
3437 scr_color (Color_bg, Color_bg); 4252 scr_color (Color_bg, Color_bg);
3438 break; 4253 break;
4254
4255 //case 50: // not variable spacing
3439 4256
3440#ifndef NO_BRIGHTCOLOR 4257#ifndef NO_BRIGHTCOLOR
3441 case 90: 4258 case 90:
3442 case 91: /* set bright fg color */ 4259 case 91: /* set bright fg color */
3443 case 92: 4260 case 92:
3444 case 93: 4261 case 93:
3445 case 94: 4262 case 94:
3446 case 95: 4263 case 95:
3447 case 96: 4264 case 96:
3448 case 97: 4265 case 97:
3449 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 4266 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3450 Color_fg);
3451 break; 4267 break;
3452 case 100: 4268 case 100:
3453 case 101: /* set bright bg color */ 4269 case 101: /* set bright bg color */
3454 case 102: 4270 case 102:
3455 case 103: 4271 case 103:
3456 case 104: 4272 case 104:
3457 case 105: 4273 case 105:
3458 case 106: 4274 case 106:
3459 case 107: 4275 case 107:
3460 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 4276 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3461 Color_bg);
3462 break; 4277 break;
3463#endif 4278#endif
3464 4279
3465 } 4280 }
3466 } 4281 }
3467} 4282}
3468/*}}} */ 4283/*}}} */
3469 4284
3470/*{{{ process Rob Nation's own graphics mode sequences */ 4285/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3471void 4286void
3472rxvt_term::process_graphics () 4287rxvt_term::process_graphics ()
3473{ 4288{
3474 unsigned char ch, cmd = cmd_getc (); 4289 unicode_t ch, cmd = cmd_getc ();
3475 4290
3476#ifndef RXVT_GRAPHICS
3477 if (cmd == 'Q') 4291 if (cmd == 'Q')
3478 { /* query graphics */ 4292 { /* query graphics */
3479 tt_printf("\033G0\n"); /* no graphics */ 4293 tt_printf ("\033G0\012"); /* no graphics */
3480 return; 4294 return;
3481 } 4295 }
3482 /* swallow other graphics sequences until terminating ':' */ 4296 /* swallow other graphics sequences until terminating ':' */
3483 do 4297 do
3484 ch = cmd_getc (); 4298 ch = cmd_getc ();
3485 while (ch != ':'); 4299 while (ch != ':');
3486#else
3487 unsigned int nargs;
3488 int args[NGRX_PTS];
3489 unsigned char *text = NULL;
3490
3491 if (cmd == 'Q')
3492 { /* query graphics */
3493 tt_printf("\033G1\n"); /* yes, graphics (color) */
3494 return;
3495 }
3496 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3497 {
3498 int neg;
3499
3500 ch = cmd_getc ();
3501 neg = (ch == '-');
3502 if (neg || ch == '+')
3503 ch = cmd_getc ();
3504
3505 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3506 args[nargs] = args[nargs] * 10 + (ch - '0');
3507 if (neg)
3508 args[nargs] = -args[nargs];
3509
3510 nargs++;
3511 args[nargs] = 0;
3512 if (ch != ';')
3513 break;
3514 }
3515
3516 if ((cmd == 'T') && (nargs >= 5))
3517 {
3518 int i, len = args[4];
3519
3520 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3521
3522 if (text != NULL)
3523 {
3524 for (i = 0; i < len; i++)
3525 text[i] = cmd_getc ();
3526 text[len] = '\0';
3527 }
3528 }
3529 Gr_do_graphics (cmd, nargs, args, text);
3530#endif
3531} 4300}
3532/*}}} */ 4301/*}}} */
3533 4302
3534/* ------------------------------------------------------------------------- */ 4303/* ------------------------------------------------------------------------- */
3535 4304
3536/* 4305/*
3537 * Send printf() formatted output to the command. 4306 * Send printf () formatted output to the command.
3538 * Only use for small amounts of data. 4307 * Only use for small amounts of data.
3539 */ 4308 */
3540void 4309void
3541rxvt_term::tt_printf (const char *fmt,...) 4310rxvt_term::tt_printf (const char *fmt,...)
3542{ 4311{
… …
3544 unsigned char buf[256]; 4313 unsigned char buf[256];
3545 4314
3546 va_start (arg_ptr, fmt); 4315 va_start (arg_ptr, fmt);
3547 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4316 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3548 va_end (arg_ptr); 4317 va_end (arg_ptr);
3549 tt_write (buf, STRLEN (buf)); 4318 tt_write (buf, strlen (buf));
3550} 4319}
3551 4320
3552/* ---------------------------------------------------------------------- */ 4321/* ---------------------------------------------------------------------- */
3553/* 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,
3554 * or generated by us in response to a query ESC sequence. 4323 * or generated by us in response to a query ESC sequence.
3555 */ 4324 */
4325const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4326
3556void 4327void
3557rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4328rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3558{ 4329{
3559 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));
3560 4333
3561 if (len) 4334 if ((unsigned int)written == len)
4335 return;
4336
4337 data += written;
4338 len -= written;
3562 { 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
3563 if (v_buflen == 0) 4357 if (v_buflen == 0)
3564 { 4358 {
3565 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3566
3567 if ((unsigned int)written == len)
3568 return;
3569
3570 data += written;
3571 len -= written;
3572 }
3573
3574
3575 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3576
3577 memcpy (v_buffer + v_buflen, data, len);
3578 v_buflen += len;
3579 }
3580
3581 for (;;)
3582 {
3583 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3584
3585 if (written > 0)
3586 {
3587 v_buflen -= written;
3588
3589 if (v_buflen == 0)
3590 {
3591 free (v_buffer); 4359 free (v_buffer);
3592 v_buffer = 0; 4360 v_buffer = 0;
3593 v_buflen = 0; 4361 v_buflen = 0;
3594 4362
3595 pty_ev.set (EVENT_READ); 4363 pty_ev.set (EVENT_READ);
3596 return;
3597 }
3598
3599 memmove (v_buffer, v_buffer + written, v_buflen);
3600 }
3601 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3602 // original code just ignores this...
3603 destroy ();
3604 else
3605 {
3606 pty_ev.set (EVENT_READ | EVENT_WRITE);
3607 return; 4364 return;
3608 } 4365 }
4366
4367 memmove (v_buffer, v_buffer + written, v_buflen);
3609 } 4368 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this...
4371 destroy ();
3610} 4372}
3611 4373
3612/*----------------------- end-of-file (C source) -----------------------*/ 4374/*----------------------- end-of-file (C source) -----------------------*/
3613 4375

Diff Legend

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