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

Diff Legend

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