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

Diff Legend

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