ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.222 by root, Sat Dec 31 19:35:56 2005 UTC

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

Diff Legend

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