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

Diff Legend

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