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

Diff Legend

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