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

Diff Legend

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