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

Diff Legend

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