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

Diff Legend

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