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

Diff Legend

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