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

Diff Legend

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