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.227 by root, Mon Jan 2 15:35:43 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 event_handler.cw_yield.start ();
1119#endif
1120 }
1121 else
1122 {
1123 pty_ev.stop ();
1124
1125 if (!OPTION (Opt_hold))
807 destroy (); 1126 destroy ();
808 1127 }
1128
809 return false; 1129 return false;
810} 1130}
811 1131
812void 1132void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1133rxvt_term::pty_cb (io_watcher &w, short revents)
814{ 1134{
815 SET_R (this); 1135 SET_R (this);
816 SET_LOCALE (locale); 1136 SET_LOCALE (locale);
817 1137
1138 if (revents & EVENT_READ)
1139 // loop, but don't allow a single term to monopolize us
1140 while (pty_fill ())
1141 if (cmd_parse ())
1142 break;
1143
818 if (revents & EVENT_WRITE) 1144 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1145 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} 1146}
936 1147
937// read the next character, currently handles UTF-8 1148void
938// will probably handle all sorts of other stuff in the future 1149rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1150{
942 while (cmdbuf_ptr < cmdbuf_endp) 1151 XDefineCursor (display->display, vt, TermWin_cursor);
943 { 1152 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1153
947 wchar_t wc; 1154#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1155 hidden_pointer = 0;
949 1156
950 if (len == (size_t)-2) 1157 if (OPTION (Opt_pointerBlank))
951 return NOCHAR; 1158 pointer_ev.start (NOW + pointerBlankDelay);
952 1159#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} 1160}
985 1161
986#ifdef POINTER_BLANK 1162#ifdef POINTER_BLANK
987void 1163void
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 () 1164rxvt_term::pointer_blank ()
1001{ 1165{
1002 if (! (Options & Opt_pointerBlank)) 1166 if (! OPTION (Opt_pointerBlank))
1003 return; 1167 return;
1004 1168
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1169 XDefineCursor (display->display, vt, display->blank_cursor);
1006 XFlush (display->display); 1170 XFlush (display->display);
1007 1171
1008 hidden_pointer = 1; 1172 hidden_pointer = 1;
1009} 1173}
1010 1174
… …
1017 pointer_blank (); 1181 pointer_blank ();
1018} 1182}
1019#endif 1183#endif
1020 1184
1021void 1185void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1186rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1187{
1024 int button_number, key_state = 0; 1188 int button_number, key_state = 0;
1025 int x, y; 1189 int x, y;
1026 1190
1027 x = ev.x; 1191 x = ev.x;
1028 y = ev.y; 1192 y = ev.y;
1029 pixel_position (&x, &y); 1193 pixel_position (&x, &y);
1030 1194
1031 if (MEvent.button == AnyButton) 1195 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1196 button_number = 3;
1034 }
1035 else 1197 else
1036 { 1198 {
1037 button_number = MEvent.button - Button1; 1199 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1200 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1201 if (button_number >= 3)
1040 button_number += (64 - 3); 1202 button_number += (64 - 3);
1041 } 1203 }
1042 1204
1043 if (PrivateModes & PrivMode_MouseX10) 1205 if (priv_modes & PrivMode_MouseX10)
1044 { 1206 {
1045 /* 1207 /*
1046 * do not report ButtonRelease 1208 * do not report ButtonRelease
1047 * no state info allowed 1209 * no state info allowed
1048 */ 1210 */
… …
1063 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1225 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1064 + ((MEvent.state & ControlMask) ? 16 : 0); 1226 + ((MEvent.state & ControlMask) ? 16 : 0);
1065#ifdef MOUSE_REPORT_DOUBLECLICK 1227#ifdef MOUSE_REPORT_DOUBLECLICK
1066 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1228 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1067#endif 1229#endif
1068
1069 } 1230 }
1070 1231
1071#ifdef DEBUG_MOUSEREPORT 1232#if DEBUG_MOUSEREPORT
1072 fprintf (stderr, "Mouse ["); 1233 fprintf (stderr, "Mouse [");
1073 if (key_state & 16) 1234 if (key_state & 16)
1074 fputc ('C', stderr); 1235 fputc ('C', stderr);
1075 if (key_state & 4) 1236 if (key_state & 4)
1076 fputc ('S', stderr); 1237 fputc ('S', stderr);
… …
1080 fputc ('2', stderr); 1241 fputc ('2', stderr);
1081 fprintf (stderr, "]: <%d>, %d/%d\n", 1242 fprintf (stderr, "]: <%d>, %d/%d\n",
1082 button_number, 1243 button_number,
1083 x + 1, 1244 x + 1,
1084 y + 1); 1245 y + 1);
1085#else 1246#endif
1247
1086 tt_printf ("\033[M%c%c%c", 1248 tt_printf ("\033[M%c%c%c",
1087 (32 + button_number + key_state), 1249 (32 + button_number + key_state),
1088 (32 + x + 1), 1250 (32 + x + 1),
1089 (32 + y + 1)); 1251 (32 + y + 1));
1090#endif
1091} 1252}
1092 1253
1093#ifdef USING_W11LIB 1254#ifdef USING_W11LIB
1094void 1255void
1095rxvt_W11_process_x_event (XEvent *ev) 1256rxvt_W11_process_x_event (XEvent *ev)
… …
1102 1263
1103/*{{{ process an X event */ 1264/*{{{ process an X event */
1104void 1265void
1105rxvt_term::x_cb (XEvent &ev) 1266rxvt_term::x_cb (XEvent &ev)
1106{ 1267{
1268 dDisp;
1269
1107 SET_R (this); 1270 SET_R (this);
1108 SET_LOCALE (locale); 1271 SET_LOCALE (locale);
1109 1272
1110#if defined(CURSOR_BLINK) 1273#if defined(CURSOR_BLINK)
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1112 { 1275 {
1113 if (hidden_cursor) 1276 if (hidden_cursor)
1114 { 1277 {
1115 hidden_cursor = 0; 1278 hidden_cursor = 0;
1116 want_refresh = 1; 1279 want_refresh = 1;
… …
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 } 1283 }
1121#endif 1284#endif
1122 1285
1123#if defined(POINTER_BLANK) 1286#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1125 { 1288 {
1126 if (ev.type == MotionNotify 1289 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress 1290 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease) 1291 || ev.type == ButtonRelease)
1129 if (hidden_pointer) 1292 if (hidden_pointer)
… …
1132 if (ev.type == KeyPress && hidden_pointer == 0) 1295 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank (); 1296 pointer_blank ();
1134 } 1297 }
1135#endif 1298#endif
1136 1299
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return;
1140#endif
1141
1142 Window unused_root, unused_child; 1300 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1301 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1302 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 1303
1195 switch (ev.type) 1304 switch (ev.type)
1196 { 1305 {
1197 case KeyPress: 1306 case KeyPress:
1307#if ISO_14755
1308 if (!(iso14755buf & ISO_14755_52))
1309#endif
1198 lookup_key (ev.xkey); 1310 lookup_key (ev.xkey);
1311
1312 break;
1313
1314 case KeyRelease:
1315 {
1316#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1317 KeySym ks;
1318
1319 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1320#endif
1321
1322#if ENABLE_FRILLS || ISO_14755
1323 // ISO 14755 support
1324 if (iso14755buf)
1325 if (iso14755buf & ISO_14755_52)
1326 {
1327# if ENABLE_OVERLAY
1328 scr_overlay_off ();
1329# endif
1330# if ISO_14755
1331 // iso14755 part 5.2 handling: release time
1332 // first: controls
1333 if ((ev.xkey.state & ControlMask)
1334 && ((ks >= 0x40 && ks <= 0x5f)
1335 || (ks >= 0x61 && ks <= 0x7f)))
1336 {
1337 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1338 commit_iso14755 ();
1339 return; // case-break;
1340 }
1341
1342 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1343 if (i[0] == ks)
1344 {
1345 iso14755buf = ISO_14755_51 | i[1];
1346 commit_iso14755 ();
1347 return; // case-break;
1348 }
1349
1350 scr_bell ();
1351# endif
1352 iso14755buf = 0;
1199 break; 1353 break;
1354 }
1355 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1356 {
1357# if ENABLE_OVERLAY
1358 scr_overlay_off ();
1359# endif
1360 if (iso14755buf & ISO_14755_51)
1361 commit_iso14755 ();
1362#if ISO_14755
1363 else if (iso14755buf & ISO_14755_STARTED)
1364 {
1365 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1366
1367 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1368 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1369 }
1370# endif
1371 else
1372 iso14755buf = 0;
1373 }
1374#endif
1200 1375
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1376#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 if (! (ev.xkey.state & ControlMask)) 1377 if (!(ev.xkey.state & ControlMask))
1378 slip_wheel_ev.stop ();
1379 else if (ks == XK_Control_L || ks == XK_Control_R)
1205 mouse_slip_wheel_speed = 0; 1380 mouse_slip_wheel_speed = 0;
1206 else 1381#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; 1382 break;
1215 } 1383 }
1216#endif
1217 1384
1218 case ButtonPress: 1385 case ButtonPress:
1219 button_press (ev.xbutton); 1386 button_press (ev.xbutton);
1220 break; 1387 break;
1221 1388
… …
1223 button_release (ev.xbutton); 1390 button_release (ev.xbutton);
1224 break; 1391 break;
1225 1392
1226 case ClientMessage: 1393 case ClientMessage:
1227 if (ev.xclient.format == 32 1394 if (ev.xclient.format == 32
1395 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1396 {
1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1229 destroy (); 1398 destroy ();
1399#if ENABLE_EWMH
1400 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1401 XSendEvent (disp, ev.xclient.window = display->root,
1402 False, SubstructureRedirectMask | SubstructureNotifyMask,
1403 &ev);
1404#endif
1405 }
1406#if ENABLE_XEMBED
1407 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1408 {
1409 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1410 focus_in ();
1411 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1412 focus_out ();
1413 }
1414#endif
1230#ifdef OFFIX_DND 1415#ifdef OFFIX_DND
1231 /* OffiX Dnd (drag 'n' drop) protocol */ 1416 /* OffiX Dnd (drag 'n' drop) protocol */
1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1417 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1233 && (ev.xclient.data.l[0] == DndFile 1418 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1419 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1420 || ev.xclient.data.l[0] == DndLink))
1236 { 1421 {
1237 /* Get Dnd data */ 1422 /* Get Dnd data */
1238 Atom ActualType; 1423 Atom ActualType;
1239 int ActualFormat; 1424 int ActualFormat;
1240 unsigned char *data; 1425 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1426 unsigned long Size, RemainingBytes;
1242 1427
1243 XGetWindowProperty (display->display, display->root, 1428 XGetWindowProperty (disp, display->root,
1244 xa[XA_DNDSELECTION], 1429 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1430 0L, 1000000L,
1246 False, AnyPropertyType, 1431 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1432 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1433 &Size, &RemainingBytes,
1249 &data); 1434 &data);
1250 XChangeProperty (display->display, display->root, 1435 set_string_property (XA_CUT_BUFFER0, data);
1251 XA_CUT_BUFFER0, XA_STRING, 1436 XFree (data);
1252 8, PropModeReplace,
1253 data, STRLEN (data));
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1437 selection_paste (display->root, XA_CUT_BUFFER0, true);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1438 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1256 } 1439 }
1257#endif /* OFFIX_DND */ 1440#endif /* OFFIX_DND */
1258 break; 1441 break;
1259 1442
1260 case MappingNotify: 1443 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1444 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1445 break;
1263 1446
1264 /* 1447 /*
1265 * XXX: this is not the _current_ arrangement 1448 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1449 * Here's my conclusion:
… …
1285 break; 1468 break;
1286 } 1469 }
1287 break; 1470 break;
1288 1471
1289 case FocusIn: 1472 case FocusIn:
1290 if (!TermWin.focus) 1473 focus_in ();
1474 break;
1475
1476 case FocusOut:
1477 focus_out ();
1478 break;
1479
1480 case ConfigureNotify:
1481 if (ev.xconfigure.window == parent[0])
1291 { 1482 {
1292 TermWin.focus = 1; 1483 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1293 want_refresh = 1; 1484 ;
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 1485
1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1487 {
1488 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 }
1491
1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1493 if (OPTION (Opt_transparent))
1494 check_our_parents ();
1495#endif
1303 } 1496 }
1304 break; 1497 break;
1305 1498
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: 1499 case PropertyNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1500 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1326 { 1501 && ev.xproperty.state == PropertyNewValue)
1327 int height, width; 1502 selection_property (ev.xproperty.window, ev.xproperty.atom);
1328 1503
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; 1504 break;
1359 1505
1360 case SelectionClear: 1506 case SelectionClear:
1361 display->set_selection_owner (0); 1507 selection_clear ();
1362 break; 1508 break;
1363 1509
1364 case SelectionNotify: 1510 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1511 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1512 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1367 ev.xselection.property, True);
1368 break; 1513 break;
1369 1514
1370 case SelectionRequest: 1515 case SelectionRequest:
1371 selection_send (ev.xselectionrequest); 1516 selection_send (ev.xselectionrequest);
1372 break; 1517 break;
1373 1518
1374 case UnmapNotify: 1519 case UnmapNotify:
1375 TermWin.mapped = 0; 1520 mapped = 0;
1376#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1377 text_blink_ev.stop (); 1522 text_blink_ev.stop ();
1378#endif 1523#endif
1379 break; 1524 break;
1380 1525
1381 case MapNotify: 1526 case MapNotify:
1382 TermWin.mapped = 1; 1527 mapped = 1;
1383#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1385#endif 1530#endif
1386 break; 1531 break;
1387 1532
… …
1391 break; 1536 break;
1392#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1393 1538
1394 case GraphicsExpose: 1539 case GraphicsExpose:
1395 case Expose: 1540 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1397 { 1542 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1543 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1547
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1553
1406 // ev.xexpose.width, TermWin.height, False); 1554 scr_refresh (refresh_type);
1407#endif
1408 want_refresh = 1;
1409 } 1555 }
1410 else 1556 else
1411 { 1557 {
1412 XEvent unused_event; 1558 XEvent unused_event;
1413 1559
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1415 Expose, 1561 ;
1416 &unused_event)) ; 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1563 ;
1418 GraphicsExpose, 1564
1419 &unused_event)) ;
1420 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1421 { 1566 {
1422 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1423 scrollbar_show (0); 1568 scrollbar_show (0);
1424 } 1569 }
1425#ifdef MENUBAR 1570#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1572 menubar_expose ();
1428#endif 1573#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1574
1575#ifdef TRANSPARENT
1576 if (am_transparent && ev.xany.window == parent[0])
1577 XClearWindow (disp, ev.xany.window);
1578#endif
1433 } 1579 }
1434 break; 1580 break;
1435 1581
1436 case MotionNotify: 1582 case MotionNotify:
1437#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1585 pointer_unblank ();
1440#endif 1586#endif
1441#if MENUBAR 1587#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1588 if (isMenuBarWindow (ev.xany.window))
1443 { 1589 {
1444 menubar_control (& (ev.xbutton)); 1590 menubar_control (ev.xbutton);
1445 break; 1591 break;
1446 } 1592 }
1447#endif 1593#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1449 break; 1595 break;
1450 1596
1451 if (ev.xany.window == TermWin.vt) 1597 if (ev.xany.window == vt)
1452 { 1598 {
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1599 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1600 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1456 ; 1602 ;
1457 1603
1458 XQueryPointer (display->display, TermWin.vt, 1604 XQueryPointer (disp, vt,
1459 &unused_root, &unused_child, 1605 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1606 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1607 &ev.xbutton.x, &ev.xbutton.y,
1462 &unused_mask); 1608 &ev.xbutton.state);
1463#ifdef MOUSE_THRESHOLD 1609#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1610 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1611 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1612 {
1467#endif 1613#endif
1614#if ISO_14755
1615 // 5.4
1616 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1617 {
1618 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1619 break;
1620 }
1621#endif
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1622 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1623 ev.xbutton.state & Button3Mask ? 2 : 0);
1624
1470#ifdef SELECTION_SCROLLING 1625#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1626 if (ev.xbutton.y < int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1627 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1473 { 1628 {
1474 int dist; 1629 int dist;
1475
1476 pending_scroll_selection=1;
1477 1630
1478 /* don't clobber the current delay if we are 1631 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1632 * already in the middle of scrolling.
1480 */ 1633 */
1481 if (scroll_selection_delay<=0) 1634 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1635 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1636
1484 /* save the event params so we can highlight 1637 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1638 * the selection in the pending-scroll loop
1486 */ 1639 */
1487 selection_save_x=ev.xbutton.x; 1640 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1641 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1642 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1643
1492 /* calc number of lines to scroll */ 1644 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1645 if (ev.xbutton.y < int_bwidth)
1494 { 1646 {
1495 scroll_selection_dir = UP; 1647 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1648 dist = int_bwidth - ev.xbutton.y;
1497 } 1649 }
1498 else 1650 else
1499 { 1651 {
1500 scroll_selection_dir = DN; 1652 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y - 1653 dist = ev.xbutton.y - (int_bwidth + height);
1502 (TermWin.int_bwidth + TermWin.height);
1503 } 1654 }
1655
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1656 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1657 / SELECTION_SCROLL_LINE_SPEEDUP
1658 + 1;
1506 MIN_IT (scroll_selection_lines, 1659 min_it (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1660 SELECTION_SCROLL_MAX_LINES);
1508 } 1661 }
1509 else 1662 else
1510 { 1663 {
1511 /* we are within the text window, so we 1664 /* we are within the text window, so we
1512 * shouldn't be scrolling 1665 * shouldn't be scrolling
1513 */ 1666 */
1514 pending_scroll_selection = 0; 1667 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop();
1515 } 1669 }
1516#endif 1670#endif
1517#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1518
1519 } 1672 }
1520#endif 1673#endif
1521
1522 } 1674 }
1523 } 1675 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1676 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1677 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1678 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1527 MotionNotify, &ev)) ; 1679 MotionNotify, &ev))
1680 ;
1681
1528 XQueryPointer (display->display, scrollBar.win, 1682 XQueryPointer (disp, scrollBar.win,
1529 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1685 &ev.xbutton.x, &ev.xbutton.y,
1532 &unused_mask); 1686 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ()); 1688 scrollbar_size ());
1535 scr_refresh (refresh_type); 1689 scr_refresh (refresh_type);
1536 refresh_limit = 0; 1690 refresh_limit = 0;
… …
1539 break; 1693 break;
1540 } 1694 }
1541} 1695}
1542 1696
1543void 1697void
1698rxvt_term::focus_in ()
1699{
1700 if (!focus)
1701 {
1702 focus = 1;
1703 want_refresh = 1;
1704
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1707#if USE_XIM
1708 if (Input_Context != NULL)
1709 {
1710 IMSetStatusPosition ();
1711 XSetICFocus (Input_Context);
1712 }
1713#endif
1714#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717#endif
1718#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade])
1720 {
1721 pix_colors = pix_colors_focused;
1722 scr_recolour ();
1723 }
1724#endif
1725 }
1726}
1727
1728void
1729rxvt_term::focus_out ()
1730{
1731 if (focus)
1732 {
1733 focus = 0;
1734 want_refresh = 1;
1735
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1741 iso14755buf = 0;
1742# if ENABLE_OVERLAY
1743 scr_overlay_off ();
1744# endif
1745 }
1746#endif
1747#if USE_XIM
1748 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context);
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.stop ();
1754 hidden_cursor = 0;
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_unfocused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766#if TRANSPARENT
1767void
1544rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1769{
1546 SET_R (this); 1770 SET_R (this);
1547 SET_LOCALE (locale); 1771 SET_LOCALE (locale);
1548 1772
1549 switch (ev.type) 1773 switch (ev.type)
1550 { 1774 {
1551 case PropertyNotify: 1775 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 /* 1776 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1777 * 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. 1778 * use the property to determine the pixmap. We use it later on.
1564 */ 1779 */
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]) 1780 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1569 return; 1782 return;
1570 }
1571 1783
1572 /* FALLTHROUGH */ 1784 /* FALLTHROUGH */
1573 case ReparentNotify: 1785 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1787 want_refresh = want_full_refresh = 1;
1577 break; 1788 break;
1578#endif
1579 } 1789 }
1580} 1790}
1791#endif
1581 1792
1582void 1793void
1583rxvt_term::button_press (const XButtonEvent &ev) 1794rxvt_term::button_press (XButtonEvent &ev)
1584{ 1795{
1585 int reportmode = 0, clickintime; 1796 int reportmode = 0, clickintime;
1586 1797
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate) 1799 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801
1590 /* 1802 /*
1591 * VT window processing of button press 1803 * VT window processing of button press
1592 */ 1804 */
1593 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1594 { 1806 {
1595#if RXVT_GRAPHICS 1807#if ISO_14755
1596 if (ev.subwindow != None) 1808 // 5.4
1597 rxvt_Gr_ButtonPress (ev.x, ev.y); 1809 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 else 1810 {
1599#endif 1811 iso14755_54 (ev.x, ev.y);
1600 1812 return;
1601 { 1813 }
1814#endif
1815
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1816 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1817
1603 if (reportmode) 1818 if (reportmode)
1819 {
1820 /* mouse report from vt window */
1821 /* save the xbutton state (for ButtonRelease) */
1822 MEvent.state = ev.state;
1823#ifdef MOUSE_REPORT_DOUBLECLICK
1824 if (ev.button == MEvent.button && clickintime)
1604 { 1825 {
1605 /* mouse report from vt window */ 1826 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1827 MEvent.clicks++;
1607 MEvent.state = ev.state; 1828 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1829 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1830 /* only report double clicks */
1616 MEvent.clicks = 2; 1831 MEvent.clicks = 2;
1617 mouse_report (ev); 1832 mouse_report (ev);
1618 1833
1619 /* don't report the release */ 1834 /* don't report the release */
1620 MEvent.clicks = 0; 1835 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1836 MEvent.button = AnyButton;
1622 }
1623 } 1837 }
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 } 1838 }
1637 else 1839 else
1638 { 1840 {
1841 /* different button, or time expired */
1842 MEvent.clicks = 1;
1843 MEvent.button = ev.button;
1844 mouse_report (ev);
1845 }
1846#else
1847 MEvent.button = ev.button;
1848 mouse_report (ev);
1849#endif /* MOUSE_REPORT_DOUBLECLICK */
1850
1851 }
1852 else
1853 {
1639 if (ev.button != MEvent.button) 1854 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1855 MEvent.clicks = 0;
1856
1641 switch (ev.button) 1857 switch (ev.button)
1642 { 1858 {
1643 case Button1: 1859 case Button1:
1860 /* allow meta + click to select rectangular areas */
1861 /* should be done in screen.C */
1862#if ENABLE_FRILLS
1863 selection.rect = !!(ev.state & ModMetaMask);
1864#else
1865 selection.rect = false;
1866#endif
1867
1644 /* allow shift+left click to extend selection */ 1868 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1869 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1646 { 1870 {
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;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime) 1871 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1872 selection_rotate (ev.x, ev.y);
1668 else 1873 else
1669 selection_extend (ev.x, ev.y, 1); 1874 selection_extend (ev.x, ev.y, 1);
1875 }
1876 else
1877 {
1878 if (MEvent.button == Button1 && clickintime)
1879 MEvent.clicks++;
1880 else
1881 MEvent.clicks = 1;
1882
1883 selection_click (MEvent.clicks, ev.x, ev.y);
1884 }
1885
1886 MEvent.button = Button1;
1887 break;
1888
1889 case Button3:
1890 if (MEvent.button == Button3 && clickintime)
1891 selection_rotate (ev.x, ev.y);
1892 else
1893 selection_extend (ev.x, ev.y, 1);
1894
1670 MEvent.button = Button3; 1895 MEvent.button = Button3;
1671 break; 1896 break;
1672 }
1673 } 1897 }
1898 }
1899
1674 MEvent.time = ev.time; 1900 MEvent.time = ev.time;
1675 return; 1901 return;
1676 }
1677 } 1902 }
1678 1903
1679 /* 1904 /*
1680 * Scrollbar window processing of button press 1905 * Scrollbar window processing of button press
1681 */ 1906 */
… …
1745 upordown = 1; /* down */ 1970 upordown = 1; /* down */
1746 } 1971 }
1747 if (upordown) 1972 if (upordown)
1748 { 1973 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1974#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1975 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 1976#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 1977 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 1978 {
1754 if (upordown < 0) 1979 if (upordown < 0)
1755 scrollBar.setUp (); 1980 scrollBar.setUp ();
… …
1771 break; 1996 break;
1772 case R_SB_ALIGN_BOTTOM: 1997 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 1998 csrO = scrollBar.bot - scrollBar.top;
1774 break; 1999 break;
1775 } 2000 }
2001
1776 if (scrollBar.style == R_SB_XTERM 2002 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 2003 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 2004 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 2005 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 2006
1781 scrollBar.setMotion (); 2007 scrollBar.setMotion ();
1782 break; 2008 break;
1783 2009
1784 case Button1: 2010 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2011 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1789 case Button3: 2015 case Button3:
1790 if (scrollBar.style != R_SB_XTERM) 2016 if (scrollBar.style != R_SB_XTERM)
1791 { 2017 {
1792 if (scrollbar_above_slider (ev.y)) 2018 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL 2019# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1); 2020 scr_page (UP, nrow - 1);
1795# else 2021# else
1796 scr_page (UP, TermWin.nrow / 4); 2022 scr_page (UP, nrow / 4);
1797# endif 2023# endif
1798 else if (scrollbar_below_slider (ev.y)) 2024 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1); 2026 scr_page (DN, nrow - 1);
1801# else 2027# else
1802 scr_page (DN, TermWin.nrow / 4); 2028 scr_page (DN, nrow / 4);
1803# endif 2029# endif
1804 else 2030 else
1805 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
1806 } 2032 }
1807 else 2033 else
1808 { 2034 {
1809 scr_page ((ev.button == Button1 ? DN : UP), 2035 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 2036 (nrow
1811 * scrollbar_position (ev.y) 2037 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 2038 / scrollbar_size ()));
1813 } 2039 }
2040
1814 break; 2041 break;
1815 } 2042 }
1816 } 2043 }
1817 return; 2044 return;
1818 } 2045 }
… …
1824 menubar_control (ev); 2051 menubar_control (ev);
1825#endif 2052#endif
1826} 2053}
1827 2054
1828void 2055void
1829rxvt_term::button_release (const XButtonEvent &ev) 2056rxvt_term::button_release (XButtonEvent &ev)
1830{ 2057{
1831 int reportmode = 0; 2058 int reportmode = 0;
1832 2059
1833 csrO = 0; /* reset csr Offset */ 2060 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 2061 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2062 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 2063
1837 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
1838 { 2065 {
1839 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
1840 scrollbar_show (0); 2067 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH; 2069 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 2070#endif
1844
1845 } 2071 }
2072
1846#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop();
1848#endif 2076#endif
2077
1849 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
1850 { 2079 {
1851#ifdef RXVT_GRAPHICS 2080#if ISO_14755
1852 if (ev.subwindow != None) 2081 // 5.4
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y); 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1854 else 2083 return;
1855#endif 2084#endif
1856
1857 {
1858 if (reportmode) 2085 if (reportmode)
2086 {
2087 /* mouse report from vt window */
2088 /* don't report release of wheel "buttons" */
2089 if (ev.button >= 4)
2090 return;
2091#ifdef MOUSE_REPORT_DOUBLECLICK
2092 /* only report the release of 'slow' single clicks */
2093 if (MEvent.button != AnyButton
2094 && (ev.button != MEvent.button
2095 || (ev.time - MEvent.time
2096 > MULTICLICK_TIME / 2)))
1859 { 2097 {
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; 2098 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2099 MEvent.button = AnyButton;
1877 mouse_report (ev); 2100 mouse_report (ev);
2101 }
2102#else /* MOUSE_REPORT_DOUBLECLICK */
2103 MEvent.button = AnyButton;
2104 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2106 return;
1880 } 2107 }
2108
1881 /* 2109 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2110 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2111 * when overriding mouse reporting
1884 */ 2112 */
1885 if (PrivateModes & PrivMode_mouse_report 2113 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2114 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2115 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2116 selection_extend (ev.x, ev.y, 0);
1889 2117
1890 switch (ev.button) 2118 switch (ev.button)
2119 {
2120 case Button1:
2121 case Button3:
2122 selection_make (ev.time);
2123 break;
2124 case Button2:
2125 selection_request (ev.time, ev.x, ev.y);
2126 break;
2127#ifdef MOUSE_WHEEL
2128 case Button4:
2129 case Button5:
1891 { 2130 {
1892 case Button1: 2131 int i;
1893 case Button3: 2132 page_dirn v;
1894 selection_make (ev.time); 2133
2134 v = ev.button == Button4 ? UP : DN;
2135
2136 if (ev.state & ShiftMask)
1895 break; 2137 i = 1;
1896 case Button2: 2138 else if (OPTION (Opt_mouseWheelScrollPage))
1897 selection_request (ev.time, ev.x, ev.y); 2139 i = nrow - 1;
2140 else
1898 break; 2141 i = 5;
2142
1899#ifdef MOUSE_WHEEL 2143# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 2144 if (ev.state & ControlMask)
1901 case Button5:
1902 { 2145 {
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); 2146 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149
2150 if (slip_wheel_ev.at < NOW)
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2152
2153 slip_wheel_ev.start ();
1918 } 2154 }
2155 else
2156 {
1919# endif 2157# endif
1920# ifdef JUMP_MOUSE_WHEEL 2158# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i); 2159 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH); 2160 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 2161 scrollbar_show (1);
… …
1927 scr_page (v, 1); 2165 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH); 2166 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1); 2167 scrollbar_show (1);
1930 } 2168 }
1931# endif 2169# endif
1932 2170# ifdef MOUSE_SLIP_WHEELING
1933 } 2171 }
1934 break;
1935#endif 2172#endif
1936
1937 } 2173 }
2174 break;
2175#endif
1938 } 2176 }
1939 } 2177 }
1940#ifdef MENUBAR 2178#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 2179 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 2180 menubar_control (ev);
1943#endif 2181#endif
1944} 2182}
1945 2183
1946
1947#ifdef TRANSPARENT 2184#ifdef TRANSPARENT
2185#if TINTING
2186/* taken from aterm-0.4.2 */
2187
2188typedef uint32_t RUINT32T;
2189
2190void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2191{
2192 int sh_r, sh_g, sh_b;
2193 RUINT32T mask_r, mask_g, mask_b;
2194 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2195 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2196 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2197 int i;
2198
2199 Visual *visual = display->visual;
2200
2201 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2202
2203 /* for convenience */
2204 mask_r = visual->red_mask;
2205 mask_g = visual->green_mask;
2206 mask_b = visual->blue_mask;
2207
2208 /* boring lookup table pre-initialization */
2209 switch (srcImage->bits_per_pixel) {
2210 case 15:
2211 if ((mask_r != 0x7c00) ||
2212 (mask_g != 0x03e0) ||
2213 (mask_b != 0x001f))
2214 return;
2215 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2216 lookup_r = lookup;
2217 lookup_g = lookup+32;
2218 lookup_b = lookup+32+32;
2219 sh_r = 10;
2220 sh_g = 5;
2221 sh_b = 0;
2222 break;
2223 case 16:
2224 if ((mask_r != 0xf800) ||
2225 (mask_g != 0x07e0) ||
2226 (mask_b != 0x001f))
2227 return;
2228 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2229 lookup_r = lookup;
2230 lookup_g = lookup+32;
2231 lookup_b = lookup+32+64;
2232 sh_r = 11;
2233 sh_g = 5;
2234 sh_b = 0;
2235 break;
2236 case 24:
2237 if ((mask_r != 0xff0000) ||
2238 (mask_g != 0x00ff00) ||
2239 (mask_b != 0x0000ff))
2240 return;
2241 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2242 lookup_r = lookup;
2243 lookup_g = lookup+256;
2244 lookup_b = lookup+256+256;
2245 sh_r = 16;
2246 sh_g = 8;
2247 sh_b = 0;
2248 break;
2249 case 32:
2250 if ((mask_r != 0xff0000) ||
2251 (mask_g != 0x00ff00) ||
2252 (mask_b != 0x0000ff))
2253 return;
2254 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2255 lookup_r = lookup;
2256 lookup_g = lookup+256;
2257 lookup_b = lookup+256+256;
2258 sh_r = 16;
2259 sh_g = 8;
2260 sh_b = 0;
2261 break;
2262 default:
2263 return; /* we do not support this color depth */
2264 }
2265
2266 /* prepare limits for color transformation (each channel is handled separately) */
2267 if (shade < 0) {
2268 shade = -shade;
2269 if (shade < 0) shade = 0;
2270 if (shade > 100) shade = 100;
2271
2272 lower_lim_r = 65535-rm;
2273 lower_lim_g = 65535-gm;
2274 lower_lim_b = 65535-bm;
2275
2276 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2277 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2278 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2279
2280 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2281 } else {
2282 if (shade < 0) shade = 0;
2283 if (shade > 100) shade = 100;
2284
2285 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2286
2287 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2288 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2289 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2290 }
2291
2292 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2293 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2294 {
2295 unsigned int tmp;
2296
2297 tmp = lower_lim_r;
2298 lower_lim_r = lower_lim_b;
2299 lower_lim_b = tmp;
2300
2301 tmp = upper_lim_r;
2302 upper_lim_r = upper_lim_b;
2303 upper_lim_b = tmp;
2304 }
2305
2306 /* fill our lookup tables */
2307 for (i = 0; i <= mask_r>>sh_r; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2311 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2312 lookup_r[i] = (tmp/65535)<<sh_r;
2313 }
2314 for (i = 0; i <= mask_g>>sh_g; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2318 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2319 lookup_g[i] = (tmp/65535)<<sh_g;
2320 }
2321 for (i = 0; i <= mask_b>>sh_b; i++)
2322 {
2323 RUINT32T tmp;
2324 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2325 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2326 lookup_b[i] = (tmp/65535)<<sh_b;
2327 }
2328
2329 /* apply table to input image (replacing colors by newly calculated ones) */
2330 switch (srcImage->bits_per_pixel)
2331 {
2332 case 15:
2333 {
2334 unsigned short *p1, *pf, *p, *pl;
2335 p1 = (unsigned short *) srcImage->data;
2336 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2337 while (p1 < pf)
2338 {
2339 p = p1;
2340 pl = p1 + srcImage->width;
2341 for (; p < pl; p++)
2342 {
2343 *p = lookup_r[(*p & 0x7c00)>>10] |
2344 lookup_g[(*p & 0x03e0)>> 5] |
2345 lookup_b[(*p & 0x001f)];
2346 }
2347 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2348 }
2349 break;
2350 }
2351 case 16:
2352 {
2353 unsigned short *p1, *pf, *p, *pl;
2354 p1 = (unsigned short *) srcImage->data;
2355 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2356 while (p1 < pf)
2357 {
2358 p = p1;
2359 pl = p1 + srcImage->width;
2360 for (; p < pl; p++)
2361 {
2362 *p = lookup_r[(*p & 0xf800)>>11] |
2363 lookup_g[(*p & 0x07e0)>> 5] |
2364 lookup_b[(*p & 0x001f)];
2365 }
2366 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2367 }
2368 break;
2369 }
2370 case 24:
2371 {
2372 unsigned char *p1, *pf, *p, *pl;
2373 p1 = (unsigned char *) srcImage->data;
2374 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2375 while (p1 < pf)
2376 {
2377 p = p1;
2378 pl = p1 + srcImage->width * 3;
2379 for (; p < pl; p += 3)
2380 {
2381 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2382 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2383 p[2] = lookup_r[(p[2] & 0x0000ff)];
2384 }
2385 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2386 }
2387 break;
2388 }
2389 case 32:
2390 {
2391 RUINT32T *p1, *pf, *p, *pl;
2392 p1 = (RUINT32T *) srcImage->data;
2393 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2394
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width;
2399 for (; p < pl; p++)
2400 {
2401 *p = lookup_r[(*p & 0xff0000)>>16] |
2402 lookup_g[(*p & 0x00ff00)>> 8] |
2403 lookup_b[(*p & 0x0000ff)] |
2404 (*p & ~0xffffff);
2405 }
2406 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 }
2411
2412 free (lookup);
2413}
2414#endif
2415
1948/* 2416/*
1949 * Check our parents are still who we think they are. 2417 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2418 * Do transparency updates if required
1951 */ 2419 */
1952int 2420int
1953rxvt_term::check_our_parents () 2421rxvt_term::check_our_parents ()
1954{ 2422{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2423 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2424 unsigned long nitems, bytes_after;
1957 Atom atype; 2425 Atom atype;
1958 unsigned char *prop = NULL; 2426 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2427 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2428 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2429 XWindowAttributes wattr, wrootattr;
2430 dDisp;
1962 2431
1963 pchanged = 0; 2432 pchanged = 0;
1964 2433
1965 if (! (Options & Opt_transparent)) 2434 if (!OPTION (Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2435 return pchanged; /* Don't try any more */
1967 2436
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2437 XGetWindowAttributes (disp, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2438 rootdepth = wrootattr.depth;
1970 2439
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2440 XGetWindowAttributes (disp, parent[0], &wattr);
2441
1972 if (rootdepth != wattr.depth) 2442 if (rootdepth != wattr.depth)
1973 { 2443 {
1974 if (am_transparent) 2444 if (am_transparent)
1975 { 2445 {
1976 pchanged = 1; 2446 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2447 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2448 am_transparent = am_pixmap_trans = 0;
1980 } 2449 }
2450
1981 return pchanged; /* Don't try any more */ 2451 return pchanged; /* Don't try any more */
1982 } 2452 }
1983 2453
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2454 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2455 XSync (disp, False);
1986 2456
1987 /* 2457 /*
1988 * Make the frame window set by the window manager have 2458 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2459 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2460 * windows for each client, so we have to take care about that.
1991 */ 2461 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2462 i = (xa[XA_XROOTPMAP_ID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2463 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2464 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2465 &nitems, &bytes_after, &prop) == Success);
2466
1996 if (!i || prop == NULL) 2467 if (!i || prop == NULL)
2468 i = (xa[XA_ESETROOT_PMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL
2474#if TINTING
2475 || !rs[Rs_color + Color_tint]
2476#endif
2477 )
1997 have_pixmap = 0; 2478 have_pixmap = 0;
1998 else 2479 else
1999 { 2480 {
2000 have_pixmap = 1; 2481 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2482 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2483 XFree (prop);
2003 } 2484 }
2485
2004 if (have_pixmap) 2486 if (have_pixmap)
2005 { 2487 {
2006 /* 2488 /*
2007 * Copy display->root pixmap transparency 2489 * Copy display->root pixmap transparency
2008 */ 2490 */
2009 int sx, sy, nx, ny; 2491 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2492 unsigned int nw, nh;
2011 Window cr; 2493 Window cr;
2012 XImage *image; 2494 XImage *image;
2013 GC gc; 2495 GC gc;
2014 XGCValues gcvalue; 2496 XGCValues gcvalue;
2015 2497
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2498 XTranslateCoordinates (disp, parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2499 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2500 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2501 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2502 nx = ny = 0;
2503
2021 if (sx < 0) 2504 if (sx < 0)
2022 { 2505 {
2023 nw += sx; 2506 nw += sx;
2024 nx = -sx; 2507 nx = -sx;
2025 sx = 0; 2508 sx = 0;
2026 } 2509 }
2510
2027 if (sy < 0) 2511 if (sy < 0)
2028 { 2512 {
2029 nh += sy; 2513 nh += sy;
2030 ny = -sy; 2514 ny = -sy;
2031 sy = 0; 2515 sy = 0;
2032 } 2516 }
2517
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2518 min_it (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2519 min_it (nh, (unsigned int) (wrootattr.height - sy));
2520
2521 XSync (disp, False);
2035 allowedxerror = -1; 2522 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2523 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2524
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2525 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2526 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2527 allowedxerror = 0;
2528
2041 if (image == NULL) 2529 if (image == NULL)
2042 { 2530 {
2043 if (am_transparent && am_pixmap_trans) 2531 if (am_transparent && am_pixmap_trans)
2044 { 2532 {
2045 pchanged = 1; 2533 pchanged = 1;
2046 if (TermWin.pixmap != None) 2534 if (pixmap != None)
2047 { 2535 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2536 XFreePixmap (disp, pixmap);
2049 TermWin.pixmap = None; 2537 pixmap = None;
2050 } 2538 }
2051 } 2539 }
2540
2052 am_pixmap_trans = 0; 2541 am_pixmap_trans = 0;
2053 } 2542 }
2054 else 2543 else
2055 { 2544 {
2056 if (TermWin.pixmap != None) 2545 if (pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2546 XFreePixmap (disp, pixmap);
2547
2548#if TINTING
2549 if (ISSET_PIXCOLOR (Color_tint))
2550 {
2551 unsigned short rm, gm, bm;
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2555
2556 ShadeXImage (display, image, shade, rm, gm, bm);
2557 }
2558#endif
2559
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2560 pixmap = XCreatePixmap (disp, vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2561 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (disp, pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2564 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2565 XFreeGC (disp, gc);
2067 XDestroyImage (image); 2566 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2567 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2069 TermWin.pixmap); 2568 XClearWindow (disp, parent[0]);
2569
2070 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2571 pchanged = 1;
2572
2072 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2073 } 2574 }
2074 } 2575 }
2576
2075 if (!am_pixmap_trans) 2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 else
2076 { 2580 {
2077 unsigned int n; 2581 unsigned int n;
2078 /* 2582 /*
2079 * InheritPixmap transparency 2583 * InheritPixmap transparency
2080 */ 2584 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2586 {
2085 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2588 XQueryTree (disp, parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2589 &parent[i], &list, &n);
2088 XFree (list); 2590 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2591
2090 if (TermWin.parent[i] == display->root) 2592 if (parent[i] == display->root)
2091 { 2593 {
2092 if (oldp != None) 2594 if (oldp != None)
2093 pchanged = 1; 2595 pchanged = 1;
2596
2094 break; 2597 break;
2095 } 2598 }
2599
2096 if (oldp != TermWin.parent[i]) 2600 if (oldp != parent[i])
2097 pchanged = 1; 2601 pchanged = 1;
2098 } 2602 }
2603
2099 n = 0; 2604 n = 0;
2605
2100 if (pchanged) 2606 if (pchanged)
2101 { 2607 {
2102 for (; n < (unsigned int)i; n++) 2608 for (; n < (unsigned int)i; n++)
2103 { 2609 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2610 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) 2611 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 { 2612 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2613 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2109 break; 2614 break;
2110 } 2615 }
2111 } 2616 }
2112 } 2617 }
2113 if (n > (int) (sizeof (TermWin.parent) 2618
2114 / sizeof (TermWin.parent[0]))) 2619 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2115 { 2620 {
2116 D_X ((stderr, "InheritPixmap Turning off")); 2621 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2622 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; 2623 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2624 /* XXX: also turn off Opt_transparent? */
2123 } 2625 }
2124 else 2626 else
2125 { 2627 {
2628#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2629 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2630 * 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); 2631 sleep (1);
2136# endif 2632#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2633 for (n = 0; n < (unsigned int)i; n++)
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2634 {
2140 ParentRelative); 2635 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2636 XClearWindow (disp, parent[n]);
2142 ParentRelative); 2637 }
2638
2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2143 am_transparent = 1; 2640 am_transparent = 1;
2144 } 2641 }
2642
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2643 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2644 parent[i] = None;
2645 }
2646
2647 if (scrollBar.win)
2147 } 2648 {
2649 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2650 scrollBar.setIdle ();
2651 scrollbar_show (0);
2652 }
2653
2654 if (am_transparent)
2655 {
2656 want_refresh = want_full_refresh = 1;
2657 if (am_pixmap_trans)
2658 flush ();
2659 }
2660
2148 return pchanged; 2661 return pchanged;
2149} 2662}
2150#endif 2663#endif
2151 2664
2152/*}}} */ 2665/*}}} */
2666
2667bool
2668rxvt_term::cmd_parse ()
2669{
2670 bool flag = false;
2671 unicode_t ch = NOCHAR;
2672 unsigned char *seq_begin; // remember start of esc-sequence here
2673
2674 for (;;)
2675 {
2676 if (ch == NOCHAR)
2677 {
2678 seq_begin = cmdbuf_ptr;
2679 ch = next_char ();
2680 }
2681
2682 if (ch == NOCHAR) // TODO: improve
2683 break;
2684
2685 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2686 {
2687 if (!seen_input)
2688 {
2689 seen_input = 1;
2690 // many badly-written programs (e.g. jed) contain a race condition:
2691 // they first read the screensize and then install a SIGWINCH handler.
2692 // some window managers resize the window early, and these programs
2693 // then sometimes get the size wrong.
2694 // unfortunately other programs are even more buggy and dislike
2695 // being sent SIGWINCH, so only do it when we were in fact being
2696 // resized.
2697 if (seen_resize && cmd_pid)
2698 kill (-cmd_pid, SIGWINCH);
2699 }
2700
2701 /* Read a text string from the input buffer */
2702 unicode_t buf[UBUFSIZ];
2703 bool refreshnow = false;
2704 int nlines = 0;
2705 unicode_t *str = buf;
2706 unicode_t *eol = str + min (ncol, UBUFSIZ);
2707
2708 for (;;)
2709 {
2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2711 break;
2712
2713 *str++ = ch;
2714
2715 if (ch == C0_LF || str >= eol)
2716 {
2717 if (ch == C0_LF)
2718 nlines++;
2719
2720 refresh_count++;
2721
2722 if (!OPTION (Opt_jumpScroll)
2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2724 {
2725 refreshnow = true;
2726 refresh_count = 0;
2727 ch = NOCHAR;
2728 break;
2729 }
2730
2731 // scr_add_lines only works for nlines <= nrow - 1.
2732 if (nlines >= nrow - 1)
2733 {
2734 scr_add_lines (buf, nlines, str - buf);
2735 nlines = 0;
2736 str = buf;
2737 eol = str + min (ncol, UBUFSIZ);
2738 }
2739
2740 if (str >= eol)
2741 {
2742 if (eol >= buf + UBUFSIZ)
2743 {
2744 ch = NOCHAR;
2745 break;
2746 }
2747 else
2748 eol = min (eol + ncol, buf + UBUFSIZ);
2749 }
2750
2751 }
2752
2753 seq_begin = cmdbuf_ptr;
2754 ch = next_char ();
2755 }
2756
2757 scr_add_lines (buf, nlines, str - buf);
2758
2759 /*
2760 * If there have been a lot of new lines, then update the screen
2761 * What the heck I'll cheat and only refresh less than every page-full.
2762 * the number of pages between refreshes is refresh_limit, which
2763 * is incremented here because we must be doing flat-out scrolling.
2764 */
2765 if (refreshnow)
2766 {
2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2768 refresh_limit++;
2769 else
2770 {
2771 flag = true;
2772 scr_refresh (refresh_type);
2773 flush_ev.stop ();
2774 }
2775 }
2776
2777 }
2778 else
2779 {
2780 try
2781 {
2782 process_nonprinting (ch);
2783 }
2784 catch (const class out_of_input &o)
2785 {
2786 // we ran out of input, retry later
2787 cmdbuf_ptr = seq_begin;
2788 break;
2789 }
2790
2791 ch = NOCHAR;
2792 }
2793 }
2794
2795 return flag;
2796}
2797
2798// read the next octet
2799unicode_t
2800rxvt_term::next_octet ()
2801{
2802 return cmdbuf_ptr < cmdbuf_endp
2803 ? *cmdbuf_ptr++
2804 : NOCHAR;
2805}
2806
2807// read the next character
2808unicode_t
2809rxvt_term::next_char ()
2810{
2811 while (cmdbuf_ptr < cmdbuf_endp)
2812 {
2813 // assume 7-bit to be ascii ALWAYS
2814 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2815 return *cmdbuf_ptr++;
2816
2817 wchar_t wc;
2818 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2819
2820 if (len == (size_t)-2)
2821 {
2822 // the mbstate stores incomplete sequences. didn't know this :/
2823 cmdbuf_ptr = cmdbuf_endp;
2824 break;
2825 }
2826
2827 if (len == (size_t)-1)
2828 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2829
2830 // assume wchar == unicode
2831 cmdbuf_ptr += len;
2832 return wc & UNICODE_MASK;
2833 }
2834
2835 return NOCHAR;
2836}
2837
2838/* rxvt_cmd_getc () - Return next input character */
2839/*
2840 * Return the next input character after first passing any keyboard input
2841 * to the command.
2842 */
2843unicode_t
2844rxvt_term::cmd_getc ()
2845{
2846 unicode_t c = next_char ();
2847
2848 if (c == NOCHAR)
2849 throw out_of_input;
2850
2851 return c;
2852}
2853
2854unicode_t
2855rxvt_term::cmd_get8 ()
2856{
2857 unicode_t c = next_octet ();
2858
2859 if (c == NOCHAR)
2860 throw out_of_input;
2861
2862 return c;
2863}
2153 2864
2154/*{{{ print pipe */ 2865/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2866/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2867#ifdef PRINTPIPE
2157FILE * 2868FILE *
2158rxvt_term::popen_printer () 2869rxvt_term::popen_printer ()
2159{ 2870{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2871 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2872
2162 if (stream == NULL) 2873 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2874 rxvt_warn ("can't open printer pipe, not printing.\n");
2875
2164 return stream; 2876 return stream;
2165} 2877}
2166 2878
2167int 2879int
2168rxvt_term::pclose_printer (FILE *stream) 2880rxvt_term::pclose_printer (FILE *stream)
2169{ 2881{
2170 fflush (stream); 2882 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); 2883 return pclose (stream);
2177# endif
2178} 2884}
2179 2885
2180/* 2886/*
2181 * simulate attached vt100 printer 2887 * simulate attached vt100 printer
2182 */ 2888 */
2183void 2889void
2184rxvt_term::process_print_pipe () 2890rxvt_term::process_print_pipe ()
2185{ 2891{
2186 int done; 2892 int done;
2187 FILE *fd; 2893 FILE *fd;
2188 2894
2189 if ((fd = popen_printer ()) == NULL) 2895 if ((fd = popen_printer ()) == NULL)
2190 return; 2896 return;
2191 2897
2192 /* 2898 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2899 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2900 * is received.
2195 */ 2901 */
2196 for (done = 0; !done;) 2902 for (done = 0; !done;)
2197 { 2903 {
2198 unsigned char buf[8]; 2904 unsigned char buf[8];
2199 unsigned char ch; 2905 unicode_t ch;
2200 unsigned int i, len; 2906 unsigned int i, len;
2201 2907
2202 if ((ch = cmd_getc ()) != C0_ESC) 2908 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2909 {
2204 if (putc (ch, fd) == EOF) 2910 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2911 break; /* done = 1 */
… …
2220 { 2926 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2927 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2928 break; /* done = 1 */
2223 } 2929 }
2224 } 2930 }
2931
2225 for (i = 0; i < len; i++) 2932 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2933 if (putc (buf[i], fd) == EOF)
2227 { 2934 {
2228 done = 1; 2935 done = 1;
2229 break; 2936 break;
2230 } 2937 }
2231 } 2938 }
2232 } 2939 }
2940
2233 pclose_printer (fd); 2941 pclose_printer (fd);
2234} 2942}
2235#endif /* PRINTPIPE */ 2943#endif /* PRINTPIPE */
2236/*}}} */ 2944/*}}} */
2237 2945
2238/* *INDENT-OFF* */ 2946/* *INDENT-OFF* */
2239enum { 2947enum {
2240 C1_40 = 0x40, 2948 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2949 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, 2950 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, 2951 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 2952 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 2953};
2246/* *INDENT-ON* */ 2954/* *INDENT-ON* */
2247 2955
2248/*{{{ process non-printing single characters */ 2956/*{{{ process non-printing single characters */
2249void 2957void
2250rxvt_term::process_nonprinting (unsigned char ch) 2958rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2959{
2252 switch (ch) 2960 switch (ch)
2253 { 2961 {
2962 case C0_ESC:
2963 process_escape_seq ();
2964 break;
2254 case C0_ENQ: /* terminal Status */ 2965 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2966 if (rs[Rs_answerbackstring])
2256 tt_write (
2257 (const unsigned char *)rs[Rs_answerbackstring], 2967 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2968 (unsigned int)strlen (rs[Rs_answerbackstring]));
2259 else 2969 else
2260 tt_write ((unsigned char *)VT100_ANS, 2970 tt_write ((unsigned char *)VT100_ANS,
2261 (unsigned int)STRLEN (VT100_ANS)); 2971 (unsigned int)strlen (VT100_ANS));
2262 break; 2972 break;
2263 case C0_BEL: /* bell */ 2973 case C0_BEL: /* bell */
2264 scr_bell (); 2974 scr_bell ();
2265 break; 2975 break;
2266 case C0_BS: /* backspace */ 2976 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2991 scr_charset_choose (1);
2282 break; 2992 break;
2283 case C0_SI: /* shift in - acs */ 2993 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2994 scr_charset_choose (0);
2285 break; 2995 break;
2996
2997#ifdef EIGHT_BIT_CONTROLS
2998 // 8-bit controls
2999 case 0x90: /* DCS */
3000 process_dcs_seq ();
3001 break;
3002 case 0x9b: /* CSI */
3003 process_csi_seq ();
3004 break;
3005 case 0x9d: /* CSI */
3006 process_osc_seq ();
3007 break;
3008#endif
2286 } 3009 }
2287} 3010}
2288/*}}} */ 3011/*}}} */
2289 3012
2290 3013
2291/*{{{ process VT52 escape sequences */ 3014/*{{{ process VT52 escape sequences */
2292void 3015void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 3016rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 3017{
2295 int row, col; 3018 int row, col;
2296 3019
2297 switch (ch) 3020 switch (ch)
2298 { 3021 {
… …
2350 3073
2351/*{{{ process escape sequences */ 3074/*{{{ process escape sequences */
2352void 3075void
2353rxvt_term::process_escape_seq () 3076rxvt_term::process_escape_seq ()
2354{ 3077{
2355 unsigned char ch = cmd_getc (); 3078 unicode_t ch = cmd_getc ();
2356 3079
2357 if (PrivateModes & PrivMode_vt52) 3080 if (priv_modes & PrivMode_vt52)
2358 { 3081 {
2359 process_escape_vt52 (ch); 3082 process_escape_vt52 (ch);
2360 return; 3083 return;
2361 } 3084 }
2362 3085
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 3100 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 3101 break;
2379 case '+': 3102 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 3103 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 3104 break;
2382#ifdef MULTICHAR_SET 3105#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': 3106 case '6':
2389 scr_backindex (); 3107 scr_backindex ();
2390 break; 3108 break;
2391#endif 3109#endif
2392 case '7': 3110 case '7':
2393 scr_cursor (SAVE); 3111 scr_cursor (SAVE);
2394 break; 3112 break;
2395 case '8': 3113 case '8':
2396 scr_cursor (RESTORE); 3114 scr_cursor (RESTORE);
2397 break; 3115 break;
2398#ifndef NO_FRILLS 3116#if ENABLE_FRILLS
2399 case '9': 3117 case '9':
2400 scr_forwardindex (); 3118 scr_forwardindex ();
2401 break; 3119 break;
2402#endif 3120#endif
2403 case '=': 3121 case '=':
… …
2413 break; 3131 break;
2414 3132
2415 /* 8.3.87: NEXT LINE */ 3133 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 3134 case C1_NEL: /* ESC E */
2417 { 3135 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 3136 unicode_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 3137 scr_add_lines (nlcr, 1, 2);
2420 } 3138 }
2421 break; 3139 break;
2422 3140
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 3141 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 3152 case C1_RI: /* ESC M */
2435 scr_index (DN); 3153 scr_index (DN);
2436 break; 3154 break;
2437 3155
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3156 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3157 /*case C1_SS2: scr_single_shift (2); break; */
2440 3158
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3159 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3160 /*case C1_SS3: scr_single_shift (3); break; */
2443 3161
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3162 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3163 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3164 process_dcs_seq ();
2447 break; 3165 break;
… …
2462 process_osc_seq (); 3180 process_osc_seq ();
2463 break; 3181 break;
2464 3182
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3183 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3184 case 'c':
3185 mbstate.reset ();
2467 scr_poweron (); 3186 scr_poweron ();
2468 scrollbar_show (1); 3187 scrollbar_show (1);
2469 break; 3188 break;
2470 3189
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3190 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3202
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3203/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3204/* *INDENT-OFF* */
2486enum { 3205enum {
2487 CSI_ICH = 0x40, 3206 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3207 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 , 3208 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, 3209 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, 3210 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, 3211 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, 3212 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, */ 3227 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, [, \, ], ^, _, */ 3228 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, */ 3229 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, */ 3230 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, */ 3231 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, {, |, }, ~, */ 3232 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3233 };
2515/* *INDENT-ON* */ 3234/* *INDENT-ON* */
2516 3235
2517void 3236void
2518rxvt_term::process_csi_seq () 3237rxvt_term::process_csi_seq ()
2519{ 3238{
2520 unsigned char ch, priv, i; 3239 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3240 unsigned int nargs, p;
2522 int n, ndef; 3241 int n, ndef;
2523 int arg[ESC_ARGS]; 3242 int arg[ESC_ARGS];
2524 3243
2525 for (nargs = ESC_ARGS; nargs > 0;) 3244 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3245 arg[--nargs] = 0;
2527 3246
2528 priv = 0; 3247 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3249 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3250 { /* '<' '=' '>' '?' */
2532 priv = ch; 3251 priv = ch;
2533 ch = cmd_getc (); 3252 ch = cmd_getc ();
2534 } 3253 }
3254
2535 /* read any numerical arguments */ 3255 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3256 for (n = -1; ch < CSI_ICH; )
2537 { 3257 {
2538 if (isdigit (ch)) 3258 if (isdigit (ch))
2539 { 3259 {
… …
2546 { 3266 {
2547 if (nargs < ESC_ARGS) 3267 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3268 arg[nargs++] = n;
2549 n = -1; 3269 n = -1;
2550 } 3270 }
2551 else if (ch == '\b') 3271 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); 3272 process_nonprinting (ch);
2563 } 3273
2564 ch = cmd_getc (); 3274 ch = cmd_getc ();
2565 } 3275 }
2566 3276
2567 if (ch > CSI_7F) 3277 if (ch > CSI_7F)
2568 return; 3278 return;
… …
2590 { 3300 {
2591 switch (priv) 3301 switch (priv)
2592 { 3302 {
2593 case '>': 3303 case '>':
2594 if (ch == CSI_DA) /* secondary device attributes */ 3304 if (ch == CSI_DA) /* secondary device attributes */
2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3305 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2596 break; 3306 break;
2597 case '?': 3307 case '?':
2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2599 process_terminal_mode (ch, priv, nargs, arg); 3309 process_terminal_mode (ch, priv, nargs, arg);
2600 break; 3310 break;
… …
2705 3415
2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2707 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
2708 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2711 break; 3421 break;
2712 3422
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write ((const unsigned char *)VT100_ANS,
2715 (unsigned int) (sizeof (VT100_ANS) - 1)); 3425 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3426 break;
2717 3427
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
2720 break; 3430 break;
… …
2726 tt_printf ("\033[0n"); 3436 tt_printf ("\033[0n");
2727 break; 3437 break;
2728 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
2729 scr_report_position (); 3439 scr_report_position ();
2730 break; 3440 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3442 if (OPTION (Opt_insecure))
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3444 break;
2735#endif
2736 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3447 break;
2739 } 3448 }
2740 break; 3449 break;
2741 3450
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3451 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3484 break;
2776 3485
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3486 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3487 if (arg[0] == 4)
2779 scr_insert_mode (0); 3488 scr_insert_mode (0);
3489 else if (arg[0] == 20)
3490 priv_modes &= ~PrivMode_LFNL;
2780 break; 3491 break;
2781 3492
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3493 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3494 if (arg[0] == 4)
2784 scr_insert_mode (1); 3495 scr_insert_mode (1);
3496 else if (arg[0] == 20)
3497 priv_modes |= PrivMode_LFNL;
2785 break; 3498 break;
2786 3499
2787 /* 3500 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3501 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3502 */
… …
2801 break; 3514 break;
2802 case CSI_75: 3515 case CSI_75:
2803 scr_cursor (RESTORE); 3516 scr_cursor (RESTORE);
2804 break; 3517 break;
2805 3518
2806#ifndef NO_FRILLS 3519#if ENABLE_FRILLS
2807 case CSI_74: 3520 case CSI_74:
2808 process_window_ops (arg, nargs); 3521 process_window_ops (arg, nargs);
2809 break; 3522 break;
2810#endif 3523#endif
2811 3524
2812 case CSI_78: /* DECREQTPARM */ 3525 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3526 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3527 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3528 break;
2816 3529
2817 default: 3530 default:
2818 break; 3531 break;
2819 } 3532 }
2820} 3533}
2821/*}}} */ 3534/*}}} */
2822 3535
2823#ifndef NO_FRILLS 3536#if ENABLE_FRILLS
2824/* ARGSUSED */ 3537/* ARGSUSED */
2825void 3538void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3539rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3540{
2828 int x, y; 3541 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3542 XWindowAttributes wattr;
2833 Window wdummy; 3543 Window wdummy;
3544 dDisp;
2834 3545
2835 if (nargs == 0) 3546 if (nargs == 0)
2836 return; 3547 return;
3548
2837 switch (args[0]) 3549 switch (args[0])
2838 { 3550 {
2839 /* 3551 /*
2840 * commands 3552 * commands
2841 */ 3553 */
2842 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
2844 break; 3556 break;
2845 case 2: /* iconify window */ 3557 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3558 XIconifyWindow (disp, parent[0], display->screen);
2847 DefaultScreen (display->display));
2848 break; 3559 break;
2849 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
2851 break; 3562 break;
2852 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2854 break; 3565 break;
2855 case 5: /* raise window */ 3566 case 5: /* raise window */
2856 XRaiseWindow (display->display, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
2857 break; 3568 break;
2858 case 6: /* lower window */ 3569 case 6: /* lower window */
2859 XLowerWindow (display->display, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
2860 break; 3571 break;
2861 case 7: /* refresh window */ 3572 case 7: /* refresh window */
2862 scr_touch (true); 3573 scr_touch (true);
2863 break; 3574 break;
2864 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
2867 break; 3578 break;
3579
3580 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3581 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
2872 break; 3585 break;
3586
3587
2873 /* 3588 /*
2874 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
2875 */ 3590 */
2876 case 11: /* report window state */ 3591 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3594 break;
2880 case 13: /* report window position */ 3595 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3601 break;
2887 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3605 break;
3606 case 18: /* report text area size (chars) */
3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3608 break;
2891 case 18: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2893 break; 3611 break;
2894#if 0 /* XXX: currently disabled due to security concerns */
2895 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3613 {
3614 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s);
3618 }
2898 break; 3619 break;
2899 case 21: /* report window title */ 3620 case 21: /* report window title */
3621 {
3622 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s);
3626 }
2902 break; 3627 break;
2903#endif
2904
2905 } 3628 }
2906} 3629}
2907#endif 3630#endif
2908 3631
2909/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
2910/* 3633/*
2911 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3635 * ends_how is terminator used. returned input must be free()'d
2913 */ 3636 */
2914unsigned char * 3637unsigned char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3639{
2917 int seen_esc = 0; /* seen escape? */ 3640 unicode_t ch;
3641 bool seen_esc = false;
2918 unsigned int n = 0; 3642 unsigned int n = 0;
2919 unsigned char *s; 3643 wchar_t string[STRING_MAX];
2920 unsigned char ch, string[STRING_MAX];
2921 3644
2922 for (; (ch = cmd_getc ());) 3645 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3646 {
2924 if (ch == C0_BEL 3647 if (seen_esc)
2925 || ch == CHAR_ST 3648 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3649 if (ch == 0x5c) /* 7bit ST */
2927 break; 3650 break;
3651 else
3652 return NULL;
3653 }
2928 if (ch == C0_ESC) 3654 else if (ch == C0_ESC)
2929 { 3655 {
2930 seen_esc = 1; 3656 seen_esc = true;
2931 continue; 3657 continue;
2932 } 3658 }
2933 else if (ch == '\t') 3659 else if (ch == C0_BEL || ch == CHAR_ST)
2934 ch = ' '; /* translate '\t' to space */ 3660 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3661 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
2937 if (n < sizeof (string) - 1) 3663
3664 seen_esc = false;
3665
3666 if (n >= STRING_MAX - 1)
3667 // stop at some sane length
3668 return NULL;
3669
3670 if (ch == C0_SYN)
3671 string[n++] = cmd_get8 ();
3672 else
2938 string[n++] = ch; 3673 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3674 }
3675
2941 string[n++] = '\0'; 3676 string[n++] = '\0';
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3677
2943 return NULL;
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3679
2946 return s; 3680 return (unsigned char *)rxvt_wcstombs (string);
2947} 3681}
2948 3682
2949/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
2950/* 3684/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3686 */
2953void 3687void
2954rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
2955{ 3689{
2956 unsigned char eh, *s; 3690 unsigned char *s;
3691 unicode_t eh;
3692
2957 /* 3693 /*
2958 * Not handled yet 3694 * Not handled yet
2959 */ 3695 */
2960 s = get_to_st (&eh); 3696 s = get_to_st (eh);
2961 if (s) 3697 if (s)
2962 free (s); 3698 free (s);
3699
2963 return; 3700 return;
2964} 3701}
2965 3702
2966/*----------------------------------------------------------------------*/ 3703/*----------------------------------------------------------------------*/
2967/* 3704/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3705 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3706 */
2970void 3707void
2971rxvt_term::process_osc_seq () 3708rxvt_term::process_osc_seq ()
2972{ 3709{
2973 unsigned char ch, eh, *s; 3710 unicode_t ch, eh;
2974 int arg; 3711 int arg;
2975 3712
2976 ch = cmd_getc (); 3713 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
2979 3716
2980 if (ch == ';') 3717 if (ch == ';')
2981 { 3718 {
2982 s = get_to_st (&eh); 3719 unsigned char *s = get_to_st (eh);
3720
2983 if (s) 3721 if (s)
2984 { 3722 {
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); 3723 process_xterm_seq (arg, (char *)s, eh);
2997 free (s); 3724 free (s);
2998 } 3725 }
2999 } 3726 }
3000} 3727}
3728
3729void
3730rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3731{
3732 if (str[0] == '?' && !str[1])
3733 {
3734 unsigned short r, g, b;
3735 pix_colors_focused[color].get (display, r, g, b);
3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3737 }
3738 else
3739 set_window_color (color, str);
3740}
3741
3001/* 3742/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * 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 */ 3744 */
3022void 3745void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3024{ 3747{
3025 int changed = 0; 3748 int changed = 0;
3026 int color; 3749 int color;
3027 char *buf, *name; 3750 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1];
3752 int saveop = op;
3753 dDisp;
3028 3754
3029 assert (str != NULL); 3755 assert (str != NULL);
3030 switch (op) 3756 switch (op)
3031 { 3757 {
3032 case XTerm_name: 3758 case XTerm_name:
3033 set_title (str); 3759 set_title (str);
3034 /* FALLTHROUGH */ 3760 /* FALLTHROUGH */
3035 case XTerm_iconName: 3761 case XTerm_iconName:
3036 set_iconName (str); 3762 set_icon_name (str);
3037 break; 3763 break;
3038 case XTerm_title: 3764 case XTerm_title:
3039 set_title (str); 3765 set_title (str);
3040 break; 3766 break;
3767 case XTerm_property:
3768 if (str[0] == '?')
3769 {
3770 Atom prop = display->atom (str + 1);
3771 Atom actual_type;
3772 int actual_format;
3773 unsigned long nitems;
3774 unsigned long bytes_after;
3775 unsigned char *value = 0;
3776 const char *str = "";
3777
3778 if (prop
3779 && XGetWindowProperty (disp, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None
3784 && actual_format == 8)
3785 str = (const char *)(value);
3786
3787 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3788
3789 XFree (value);
3790 }
3791 else
3792 {
3793 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3794
3795 if (eq)
3796 {
3797 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1);
3799 }
3800 else
3801 XDeleteProperty (disp, parent[0],
3802 display->atom (str));
3803 }
3804 break;
3805
3041 case XTerm_Color: 3806 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3807 for (buf = (char *)str; buf && *buf;)
3043 { 3808 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3810 break;
3811
3046 *name++ = '\0'; 3812 *name++ = '\0';
3047 color = atoi (buf); 3813 color = atoi (buf);
3814
3048 if (color < 0 || color >= TOTAL_COLORS) 3815 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3816 break;
3817
3050 if ((buf = STRCHR (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3819 *buf++ = '\0';
3820
3821 if (name[0] == '?' && !name[1])
3822 {
3823 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3826 }
3827 else
3052 set_window_color (color + minCOLOR, name); 3828 set_window_color (color + minCOLOR, name);
3053 } 3829 }
3830 break;
3831 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3833 break;
3834 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3054 break; 3836 break;
3055#ifndef NO_CURSORCOLOR 3837#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3838 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3840 break;
3059#endif 3841#endif
3060 case XTerm_Color_pointer: 3842 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3843 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3844 break;
3845 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3847 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3848#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3849 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3066 break; 3851 break;
3067 case XTerm_Color_UL: 3852 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3854 break;
3070 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3857 break;
3073#endif 3858 case URxvt_Color_IT:
3074 3859 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; 3860 break;
3861#endif
3862#if TRANSPARENT && TINTING
3863 case URxvt_Color_tint:
3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3865 check_our_parents ();
3866 if (am_transparent)
3867 want_full_refresh = want_refresh = 1;
3868 break;
3869#endif
3870
3081 case XTerm_Pixmap: 3871 case XTerm_Pixmap:
3082 if (*str != ';') 3872 if (*str != ';')
3083 { 3873 {
3084#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3087#endif 3877#endif
3088 scr_touch (true); 3878 scr_touch (true);
3089 } 3879 }
3090 while ((str = STRCHR (str, ';')) != NULL) 3880 while ((str = strchr (str, ';')) != NULL)
3091 { 3881 {
3092 str++; 3882 str++;
3093#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3884 changed += scale_pixmap (str);
3095#endif 3885#endif
3096
3097 } 3886 }
3887
3098 if (changed) 3888 if (changed)
3099 { 3889 {
3100#ifdef XPM_BACKGROUND 3890#ifdef XPM_BACKGROUND
3101 resize_pixmap (); 3891 resize_pixmap ();
3102#endif 3892#endif
… …
3108 set_window_color (Color_fg, str); 3898 set_window_color (Color_fg, str);
3109 break; 3899 break;
3110 case XTerm_restoreBG: 3900 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3901 set_window_color (Color_bg, str);
3112 break; 3902 break;
3903
3113 case XTerm_logfile: 3904 case XTerm_logfile:
3905 // TODO, when secure mode?
3906 break;
3907
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3114 break; 3912 break;
3115 case XTerm_font: 3913#endif
3116 change_font (0, str);
3117 break;
3118#if 0 3914#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
3120 { 3916 {
3121 int fd; 3917 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3919 {
3124 scr_dump (fd); 3920 scr_dump (fd);
3125 close (fd); 3921 close (fd);
3126 } 3922 }
3127 } 3923 }
3128 break; 3924 break;
3129#endif 3925#endif
3926 case XTerm_font:
3927 op = URxvt_font;
3928 case URxvt_font:
3929#if ENABLE_STYLES
3930 case URxvt_boldFont:
3931 case URxvt_italicFont:
3932 case URxvt_boldItalicFont:
3933#endif
3934 if (query)
3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3937 ? fontset[op - URxvt_font]->fontdesc : "",
3938 resp);
3939 else
3940 {
3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3130 3942
3943 res = strdup (str);
3944 allocated.push_back ((void *)res);
3945 set_fonts ();
3946 }
3947 break;
3948
3949#if ENABLE_FRILLS
3950 case URxvt_locale:
3951 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3953 else
3954 {
3955 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8);
3957 init_xlocale ();
3958 }
3959 break;
3960
3961 case URxvt_view_up:
3962 case URxvt_view_down:
3963 int lines = atoi (str);
3964
3965 if (lines)
3966 scr_page (op == URxvt_view_up ? UP : DN, lines);
3967 else
3968 {
3969 scr_erase_savelines ();
3970 }
3971
3972 break;
3973#endif
3131 } 3974 }
3132} 3975}
3133/*----------------------------------------------------------------------*/ 3976/*----------------------------------------------------------------------*/
3134 3977
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3978/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3986 * so no need for fancy checking
3144 */ 3987 */
3145int 3988int
3146rxvt_term::privcases (int mode, unsigned long bit) 3989rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3990{
3148 int state; 3991 int state;
3149 3992
3150 if (mode == 's') 3993 if (mode == 's')
3151 { 3994 {
3152 SavedModes |= (PrivateModes & bit); 3995 SavedModes |= (priv_modes & bit);
3153 return -1; 3996 return -1;
3154 } 3997 }
3155 else 3998 else
3156 { 3999 {
3157 if (mode == 'r') 4000 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4001 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 4002 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4003 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 4004 PrivMode (state, bit);
3162 } 4005 }
4006
3163 return state; 4007 return state;
3164} 4008}
3165 4009
3166/* we're not using priv _yet_ */ 4010/* we're not using priv _yet_ */
3167void 4011void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4012rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 4013{
3170 unsigned int i, j; 4014 unsigned int i, j;
3171 int state; 4015 int state;
4016
3172 static const struct 4017 static const struct
3173 { 4018 {
3174 const int argval; 4019 const int argval;
3175 const unsigned long bit; 4020 const unsigned long bit;
3176 } 4021 }
4022
3177 argtopriv[] = { 4023 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 4024 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 4025 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 4026 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 4027 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 4028 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 4029 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 4030 { 7, PrivMode_Autowrap },
4031 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 4032 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 4033#ifdef menuBar_esc
3187 { menuBar_esc, PrivMode_menuBar }, 4034 { menuBar_esc, PrivMode_menuBar },
3188#endif 4035#endif
4036 // 18, 19 printing-related
4037 { 25, PrivMode_VisibleCursor },
3189#ifdef scrollBar_esc 4038#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 4039 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 4040#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 4041 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 4042 { 40, PrivMode_132OK },
4043 // 41 xterm more fixes NYI
4044 // 45 margin bell NYI
4045 // 46 start logging
3195 { 47, PrivMode_Screen }, 4046 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 4047 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 4048#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 4049 { 67, PrivMode_BackSpace },
3199#endif 4050#endif
3200 { 1000, PrivMode_MouseX11 }, 4051 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 4056 { 1011, PrivMode_Keypress }, // rxvt extension
4057 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 4060 { 1047, PrivMode_Screen },
4061 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4062 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4063 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 4064 };
3206 4065
3207 if (nargs == 0) 4066 if (nargs == 0)
3208 return; 4067 return;
3209 4068
… …
3224 state = privcases (mode, argtopriv[j].bit); 4083 state = privcases (mode, argtopriv[j].bit);
3225 break; 4084 break;
3226 } 4085 }
3227 4086
3228 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 4088 switch (arg[i])
3231 { 4089 {
4090#if ENABLE_STYLES
4091 case 1021:
4092 if (mode)
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096
4097 scr_touch (true);
4098 break;
4099#endif
3232 case 1048: /* alternative cursor save */ 4100 case 1048: /* alternative cursor save */
4101 case 1049:
4102 if (OPTION (Opt_secondaryScreen))
3233 if (mode == 0) 4103 if (mode == 0)
3234 scr_cursor (RESTORE); 4104 scr_cursor (RESTORE);
3235 else if (mode == 1) 4105 else if (mode == 1)
3236 scr_cursor (SAVE); 4106 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; 4107 break;
4108 }
4109
4110 if (state >= 0)
4111 /* extra handling for values with valid 0 or 1 state */
4112 switch (arg[i])
4113 {
4114 /* case 1: - application cursor keys */
4115 case 2: /* VT52 mode */
4116 /* oddball mode. should be set regardless of set/reset
4117 * parameter. Return from VT52 mode with an ESC < from
4118 * within VT52 mode
4119 */
4120 PrivMode (1, PrivMode_vt52);
4121 break;
3253 case 3: /* 80/132 */ 4122 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 4123 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4124 set_widthheight (((state ? 132 : 80) * fwidth), height);
3256 (unsigned int)TermWin.height);
3257 break; 4125 break;
3258 case 4: /* smooth scrolling */ 4126 case 4: /* smooth scrolling */
3259 if (state) 4127 if (!state)
3260 Options &= ~Opt_jumpScroll; 4128 SET_OPTION (Opt_jumpScroll);
3261 else 4129 else
3262 Options |= Opt_jumpScroll; 4130 CLR_OPTION (Opt_jumpScroll);
3263 break; 4131 break;
3264 case 5: /* reverse video */ 4132 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 4133 scr_rvideo_mode (state);
3266 break; 4134 break;
3267 case 6: /* relative/absolute origins */ 4135 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 4136 scr_relative_origin (state);
3269 break; 4137 break;
3270 case 7: /* autowrap */ 4138 case 7: /* autowrap */
3271 scr_autowrap (state); 4139 scr_autowrap (state);
3272 break; 4140 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 4141 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 4142 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 4143 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 4144 priv_modes &= ~PrivMode_MouseX11;
3277 break; 4145 break;
3278#ifdef menuBar_esc 4146#ifdef menuBar_esc
3279 case menuBar_esc: 4147 case menuBar_esc:
3280#ifdef MENUBAR 4148#ifdef MENUBAR
3281 map_menuBar (state); 4149 map_menuBar (state);
3282#endif 4150#endif
3283 break; 4151 break;
3284#endif 4152#endif
3285#ifdef scrollBar_esc 4153#ifdef scrollBar_esc
3286 case scrollBar_esc: 4154 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 4155 if (scrollbar_mapping (state))
3288 { 4156 {
3289 resize_all_windows (0, 0, 0); 4157 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 4158 scr_touch (true);
3291 } 4159 }
3292 break; 4160 break;
3293#endif 4161#endif
3294 case 25: /* visible/invisible cursor */ 4162 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4163 scr_cursor_visible (state);
3296 break; 4164 break;
3297 /* case 35: - shift keys */ 4165 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4166 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4167 case 47: /* secondary screen */
3300 scr_change_screen (state); 4168 scr_change_screen (state);
3301 break; 4169 break;
3302 /* case 66: - application key pad */ 4170 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4171 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4172 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4174 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4175 break;
3308#if 0 4176#if 0
3309 case 1001: 4177 case 1001:
3310 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
3311#endif 4179#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 4181 if (!state)
3314 Options &= ~Opt_scrollTtyOutput; 4182 SET_OPTION (Opt_scrollTtyOutput);
3315 else 4183 else
3316 Options |= Opt_scrollTtyOutput; 4184 CLR_OPTION (Opt_scrollTtyOutput);
3317 break; 4185 break;
3318 case 1011: /* scroll to bottom on key press */ 4186 case 1011: /* scroll to bottom on key press */
3319 if (state) 4187 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4188 SET_OPTION (Opt_scrollTtyKeypress);
3321 else 4189 else
3322 Options &= ~Opt_scrollTtyKeypress; 4190 CLR_OPTION (Opt_scrollTtyKeypress);
3323 break; 4191 break;
3324 case 1047: /* secondary screen w/ clearing */ 4192 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4193 if (OPTION (Opt_secondaryScreen))
3326 if (current_screen != PRIMARY) 4194 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4195 scr_erase_screen (2);
3328 scr_change_screen (state); 4196 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4197 break;
4198 case 1049: /* secondary screen w/ clearing first */
4199 scr_change_screen (state);
4200 if (OPTION (Opt_secondaryScreen))
4201 if (current_screen != PRIMARY)
4202 scr_erase_screen (2);
4203 break;
4204 default:
4205 break;
3332 } 4206 }
3333 } 4207 }
3334} 4208}
3335/*}}} */ 4209/*}}} */
3336 4210
3337/*{{{ process sgr sequences */ 4211/*{{{ process sgr sequences */
3338void 4212void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4213rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4214{
3341 unsigned int i; 4215 unsigned int i;
3342 short rendset; 4216 short rendset;
3343 int rendstyle; 4217 int rendstyle;
3344 4218
3345 if (nargs == 0) 4219 if (nargs == 0)
3346 { 4220 {
3347 scr_rendition (0, ~RS_None); 4221 scr_rendition (0, ~RS_None);
3348 return; 4222 return;
3349 } 4223 }
4224
3350 for (i = 0; i < nargs; i++) 4225 for (i = 0; i < nargs; i++)
3351 { 4226 {
3352 rendset = -1; 4227 rendset = -1;
3353 switch (arg[i]) 4228 switch (arg[i])
3354 { 4229 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4231 rendset = 0, rendstyle = ~RS_None;
3357 break; 4232 break;
3358 case 1: 4233 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4234 rendset = 1, rendstyle = RS_Bold;
3360 break; 4235 break;
4236 //case 2: // low intensity
4237 case 3:
4238 rendset = 1, rendstyle = RS_Italic;
4239 break;
3361 case 4: 4240 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4241 rendset = 1, rendstyle = RS_Uline;
3363 break; 4242 break;
3364 case 5: 4243 case 5: // slowly blinking
4244 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4245 rendset = 1, rendstyle = RS_Blink;
3366 break; 4246 break;
4247 //case 6: // scoansi light background
3367 case 7: 4248 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4249 rendset = 1, rendstyle = RS_RVid;
3369 break; 4250 break;
3370 case 22: 4251 case 8:
4252 // invisible. NYI
4253 break;
4254 //case 9: // crossed out
4255 //case 10: // scoansi acs off, primary font
4256 //case 11: // scoansi acs on, first alt font
4257 //case 12: // scoansi acs on, |0x80, second alt font
4258 //...
4259 //case 19: // ninth alt font
4260 //case 20: // gothic
4261 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3371 rendset = 0, rendstyle = RS_Bold; 4262 rendset = 0, rendstyle = RS_Bold;
4263 break;
4264 case 22: // normal intensity
4265 rendset = 0, rendstyle = RS_Bold;
4266 break;
4267 case 23: // disable italic
4268 rendset = 0, rendstyle = RS_Italic;
3372 break; 4269 break;
3373 case 24: 4270 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4271 rendset = 0, rendstyle = RS_Uline;
3375 break; 4272 break;
3376 case 25: 4273 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4274 rendset = 0, rendstyle = RS_Blink;
3378 break; 4275 break;
4276 case 26: // variable spacing (iso 8613)
4277 rendset = 0, rendstyle = RS_Blink;
4278 break;
3379 case 27: 4279 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4280 rendset = 0, rendstyle = RS_RVid;
3381 break; 4281 break;
4282 //case 28: // visible. NYI
4283 //case 29: // not crossed-out
3382 } 4284 }
4285
3383 if (rendset != -1) 4286 if (rendset != -1)
3384 { 4287 {
3385 scr_rendition (rendset, rendstyle); 4288 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4289 continue; /* for (;i;) */
3387 } 4290 }
… …
3394 case 33: 4297 case 33:
3395 case 34: 4298 case 34:
3396 case 35: 4299 case 35:
3397 case 36: 4300 case 36:
3398 case 37: 4301 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4302 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4303 break;
3402#ifdef TTY_256COLOR 4304 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4305 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4306 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4307 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4308 i += 2;
3409 } 4309 }
3410 break; 4310 break;
3411#endif
3412 case 39: /* default fg */ 4311 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 4312 scr_color (Color_fg, Color_fg);
3414 break; 4313 break;
3415 4314
3416 case 40: 4315 case 40:
… …
3419 case 43: 4318 case 43:
3420 case 44: 4319 case 44:
3421 case 45: 4320 case 45:
3422 case 46: 4321 case 46:
3423 case 47: 4322 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4323 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4324 break;
3427#ifdef TTY_256COLOR 4325 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4326 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4327 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4328 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4329 i += 2;
3434 } 4330 }
3435 break; 4331 break;
3436#endif
3437 case 49: /* default bg */ 4332 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 4333 scr_color (Color_bg, Color_bg);
3439 break; 4334 break;
4335
4336 //case 50: // not variable spacing
3440 4337
3441#ifndef NO_BRIGHTCOLOR 4338#ifndef NO_BRIGHTCOLOR
3442 case 90: 4339 case 90:
3443 case 91: /* set bright fg color */ 4340 case 91: /* set bright fg color */
3444 case 92: 4341 case 92:
3445 case 93: 4342 case 93:
3446 case 94: 4343 case 94:
3447 case 95: 4344 case 95:
3448 case 96: 4345 case 96:
3449 case 97: 4346 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4347 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 4348 break;
3453 case 100: 4349 case 100:
3454 case 101: /* set bright bg color */ 4350 case 101: /* set bright bg color */
3455 case 102: 4351 case 102:
3456 case 103: 4352 case 103:
3457 case 104: 4353 case 104:
3458 case 105: 4354 case 105:
3459 case 106: 4355 case 106:
3460 case 107: 4356 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 4358 break;
3464#endif 4359#endif
3465
3466 } 4360 }
3467 } 4361 }
3468} 4362}
3469/*}}} */ 4363/*}}} */
3470 4364
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4365/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4366void
3473rxvt_term::process_graphics () 4367rxvt_term::process_graphics ()
3474{ 4368{
3475 unsigned char ch, cmd = cmd_getc (); 4369 unicode_t ch, cmd = cmd_getc ();
3476 4370
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4371 if (cmd == 'Q')
3479 { /* query graphics */ 4372 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4373 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4374 return;
3482 } 4375 }
3483 /* swallow other graphics sequences until terminating ':' */ 4376 /* swallow other graphics sequences until terminating ':' */
3484 do 4377 do
3485 ch = cmd_getc (); 4378 ch = cmd_getc ();
3486 while (ch != ':'); 4379 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} 4380}
3533/*}}} */ 4381/*}}} */
3534 4382
3535/* ------------------------------------------------------------------------- */ 4383/* ------------------------------------------------------------------------- */
3536 4384
… …
3545 unsigned char buf[256]; 4393 unsigned char buf[256];
3546 4394
3547 va_start (arg_ptr, fmt); 4395 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4396 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4397 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4398 tt_write (buf, strlen (buf));
3551} 4399}
3552 4400
3553/* ---------------------------------------------------------------------- */ 4401/* ---------------------------------------------------------------------- */
3554/* Write data to the pty as typed by the user, pasted with the mouse, 4402/* 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. 4403 * or generated by us in response to a query ESC sequence.
3556 */ 4404 */
4405const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4406
3557void 4407void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4408rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3559{ 4409{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4410 if (v_buflen == 0)
4411 {
4412 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3561 4413
3562 if (len) 4414 if ((unsigned int)written == len)
4415 return;
4416
4417 data += written;
4418 len -= written;
3563 { 4419 }
4420
4421 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4422
4423 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len;
4425
4426 pty_ev.set (EVENT_READ | EVENT_WRITE);
4427}
4428
4429void rxvt_term::pty_write ()
4430{
4431 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4432
4433 if (written > 0)
4434 {
4435 v_buflen -= written;
4436
3564 if (v_buflen == 0) 4437 if (v_buflen == 0)
3565 { 4438 {
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); 4439 free (v_buffer);
3593 v_buffer = 0; 4440 v_buffer = 0;
3594 v_buflen = 0; 4441 v_buflen = 0;
3595 4442
3596 pty_ev.set (EVENT_READ); 4443 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; 4444 return;
3609 } 4445 }
4446
4447 memmove (v_buffer, v_buffer + written, v_buflen);
3610 } 4448 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ);
3611} 4451}
3612 4452
3613/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
3614 4454

Diff Legend

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