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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.213 by root, Thu Dec 22 16:44:10 2005 UTC

… …
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/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 64class out_of_input { } out_of_input;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
129 XK_KP_Space, 0x2422,
130#endif
131 0,
132};
133
134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || !IN_RANGE_EXC (y, 0, nrow))
142 return;
143
144 for (;;)
145 {
146 const line_t &l = ROW(-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#endif
161
162#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173#if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181#endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 int width = wcswidth (fname, wcslen (fname));
191
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
193
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195
196 for (int y = 0; y < len; y++)
197 {
198 char buf[9];
199
200 ch = *chr++;
201
202 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '=');
205#if !UNICODE3
206 if (ch >= 0x10000)
207 ch = 0xfffd;
208#endif
209 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r);
211 }
212
213 scr_overlay_set (0, len, fname);
214
215 free (fname);
216
217#if ENABLE_COMBINING
218 if (alloc)
219 delete [] alloc;
220#endif
221}
222#endif
223
224void
225rxvt_term::commit_iso14755 ()
226{
227 wchar_t ch[2];
228
229 ch[0] = iso14755buf & ISO_14755_MASK;
230 ch[1] = 0;
231
232 if (iso14755buf & ISO_14755_51)
233 {
234 char mb[16];
235 int len;
236
237 // allow verbatim 0-bytes and control-bytes to be entered
238 if (ch[0] >= 0x20)
239 len = wcstombs (mb, ch, 16);
240 else
241 {
242 mb[0] = ch[0];
243 len = 1;
244 }
245
246 if (len > 0)
247 tt_write ((unsigned char *)mb, len);
248 else
249 scr_bell ();
250 }
251
252 iso14755buf = 0;
253}
254
255int
256rxvt_term::hex_keyval (XKeyEvent &ev)
257{
258 // check wether this event corresponds to a hex digit
259 // if the modifiers had not been pressed.
260 for (int index = 0; index < 8; index++)
261 {
262 KeySym k = XLookupKeysym (&ev, index);
263
264 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
265 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
266 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
267 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
268 }
269
270 return -1;
271}
272#endif
61 273
62/*{{{ Convert the keypress event into a string */ 274/*{{{ Convert the keypress event into a string */
63void 275void
64rxvt_term::lookup_key (XKeyEvent &ev) 276rxvt_term::lookup_key (XKeyEvent &ev)
65{ 277{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
78 * 290 *
79 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
80 */ 292 */
81 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
84 296
85 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
86 { 298 {
87 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
108 320
109 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
113 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
116 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 331 SET_LOCALE (locale);
118 332
119 if (status_return == XLookupChars 333 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
147 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
148 } 362 }
149 363
150 if (valid_keysym) 364 if (valid_keysym)
151 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
152 if (TermWin.saveLines) 371 if (saveLines)
153 { 372 {
154#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 374 if (!ctrl && !meta)
156 {
157#else 375#else
158 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
377#endif
159 { 378 {
160#endif
161 int lnsppg; 379 int lnsppg;
162 380
163#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 383#else
166 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
167#endif 385#endif
168 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
169 { 387 {
170 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
171 return; 389 return;
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 432 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 433 {
216 keysym += (XK_F11 - XK_F1); 434 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 435 shft = 0; /* turn off Shift */
218 } 436 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 437 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 438 {
221 switch (keysym) 439 switch (keysym)
222 { 440 {
223 /* normal XTerm key bindings */ 441 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 442 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 443 selection_request (ev.time, 0, 0);
226 return; 444 return;
445#if TODO
227 /* rxvt extras */ 446 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 447 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 448 change_font (FONT_UP);
230 return; 449 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 450 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 451 change_font (FONT_DN);
233 return; 452 return;
453#endif
234 } 454 }
235 } 455 }
236 } 456 }
237#ifdef PRINTPIPE 457
238 if (keysym == XK_Print) 458#if ENABLE_FRILLS || ISO_14755
239 { 459 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 460 if (shft && ctrl)
241 return;
242 } 461 {
243#endif 462 int hv;
244 463
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 464 if (iso14755buf & ISO_14755_51
246 { 465 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 466 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 467 {
250 unsigned int l; 468 commit_iso14755 ();
251 const unsigned char *kbuf0; 469 iso14755buf = ISO_14755_51;
252 470# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 471 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 472# endif
261 ) 473 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 474 }
266 475 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 476 {
477 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
478 | hv | ISO_14755_51;
479# if ISO_14755
480 iso14755_51 (iso14755buf & ISO_14755_MASK);
481# endif
268 return; 482 return;
269 } 483 }
270 else 484 else
485 {
486# if ENABLE_OVERLAY
487 scr_overlay_off ();
271#endif 488# endif
489 iso14755buf = 0;
490 }
491 }
492 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
493 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
494 if (!(iso14755buf & ISO_14755_STARTED))
495 {
496 iso14755buf |= ISO_14755_STARTED;
497# if ENABLE_OVERLAY
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif
501 }
502#endif
503
504#ifdef PRINTPIPE
505 if (keysym == XK_Print)
506 {
507 scr_printscreen (ctrl | shft);
508 return;
509 }
510#endif
511
512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
513 {
272 { 514 {
273 newlen = 1; 515 newlen = 1;
274 switch (keysym) 516 switch (keysym)
275 { 517 {
276#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 519 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 520 if (priv_modes & PrivMode_HaveBackSpace)
279 { 521 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 523 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 524 kbuf[1] = '\0';
283 } 525 }
284 else 526 else
285 STRCPY (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
286 break; 528 break;
287#endif 529#endif
288#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
289 case XK_Delete: 541 case XK_Delete:
290 STRCPY (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
291 break; 543 break;
292#endif 544#endif
293 case XK_Tab: 545 case XK_Tab:
294 if (shft) 546 if (shft)
295 STRCPY (kbuf, "\033[Z"); 547 strcpy (kbuf, "\033[Z");
296 else 548 else
297 { 549 {
298#ifdef CTRL_TAB_MAKES_META 550#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 551 if (ctrl)
300 meta = 1; 552 meta = 1;
… …
306 newlen = 0; 558 newlen = 0;
307 } 559 }
308 break; 560 break;
309 561
310#ifdef XK_KP_Left 562#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 563 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 564 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 565 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 566 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 568 {
317 STRCPY (kbuf, "\033OZ"); 569 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 570 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 571 break;
320 } 572 }
321 else 573 else
322 /* translate to std. cursor key */ 574 /* translate to std. cursor key */
… …
325#endif 577#endif
326 case XK_Up: /* "\033[A" */ 578 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 579 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 580 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 581 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 582 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 583 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 584 /* do Shift first */
333 if (shft) 585 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 586 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 587 else if (ctrl)
336 { 588 {
337 kbuf[1] = 'O'; 589 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 590 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 591 }
340 else if (PrivateModes & PrivMode_aplCUR) 592 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 593 kbuf[1] = 'O';
342 break; 594 break;
343 595
344#ifndef UNSHIFTED_SCROLLKEYS 596#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 597# ifdef XK_KP_Prior
346 case XK_KP_Prior: 598 case XK_KP_Prior:
347 /* allow shift to override */ 599 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 601 {
350 STRCPY (kbuf, "\033Oy"); 602 strcpy (kbuf, "\033Oy");
351 break; 603 break;
352 } 604 }
353 /* FALLTHROUGH */ 605 /* FALLTHROUGH */
354# endif 606# endif
355 case XK_Prior: 607 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 608 strcpy (kbuf, "\033[5~");
357 break; 609 break;
358# ifdef XK_KP_Next 610# ifdef XK_KP_Next
359 case XK_KP_Next: 611 case XK_KP_Next:
360 /* allow shift to override */ 612 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 614 {
363 STRCPY (kbuf, "\033Os"); 615 strcpy (kbuf, "\033Os");
364 break; 616 break;
365 } 617 }
366 /* FALLTHROUGH */ 618 /* FALLTHROUGH */
367# endif 619# endif
368 case XK_Next: 620 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 621 strcpy (kbuf, "\033[6~");
370 break; 622 break;
371#endif 623#endif
372 case XK_KP_Enter: 624 case XK_KP_Enter:
373 /* allow shift to override */ 625 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 627 {
376 STRCPY (kbuf, "\033OM"); 628 strcpy (kbuf, "\033OM");
629 break;
630 }
631
632 /* FALLTHROUGH */
633
634 case XK_Return:
635 if (priv_modes & PrivMode_LFNL)
636 {
637 kbuf[0] = '\015';
638 kbuf[1] = '\012';
639 kbuf[2] = '\0';
377 } 640 }
378 else 641 else
379 { 642 {
380 kbuf[0] = '\r'; 643 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 644 kbuf[1] = '\0';
382 } 645 }
383 break; 646 break;
384 647
385#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
386 case XK_KP_Begin: 649 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
388 break; 651 break;
389 652
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
438 case XK_Insert: 705 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
440 break; 707 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 709 case DXK_Remove:
443 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
444#endif 711#endif
445 case XK_Execute: 712 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 713 strcpy (kbuf, "\033[3~");
447 break; 714 break;
448 case XK_Select: 715 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 716 strcpy (kbuf, "\033[4~");
450 break; 717 break;
451#ifdef XK_KP_End 718#ifdef XK_KP_End
452 case XK_KP_End: 719 case XK_KP_End:
453 /* allow shift to override */ 720 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 722 {
456 STRCPY (kbuf, "\033Oq"); 723 strcpy (kbuf, "\033Oq");
457 break; 724 break;
458 } 725 }
459 /* FALLTHROUGH */ 726 /* FALLTHROUGH */
460#endif 727#endif
461 case XK_End: 728 case XK_End:
462 STRCPY (kbuf, KS_END); 729 strcpy (kbuf, KS_END);
463 break; 730 break;
464#ifdef XK_KP_Home 731#ifdef XK_KP_Home
465 case XK_KP_Home: 732 case XK_KP_Home:
466 /* allow shift to override */ 733 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 735 {
469 STRCPY (kbuf, "\033Ow"); 736 strcpy (kbuf, "\033Ow");
470 break; 737 break;
471 } 738 }
472 /* FALLTHROUGH */ 739 /* FALLTHROUGH */
473#endif 740#endif
474 case XK_Home: 741 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 742 strcpy (kbuf, KS_HOME);
476 break; 743 break;
477 744
478#define FKEY(n, fkey) \ 745#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 746 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 747
… …
532#undef FKEY 799#undef FKEY
533 default: 800 default:
534 newlen = 0; 801 newlen = 0;
535 break; 802 break;
536 } 803 }
804
537 if (newlen) 805 if (newlen)
538 len = STRLEN (kbuf); 806 len = strlen (kbuf);
539 } 807 }
540 808
541 /* 809 /*
542 * Pass meta for all function keys, if 'meta' option set 810 * Pass meta for all function keys, if 'meta' option set
543 */ 811 */
… …
550 else if (ctrl && keysym == XK_minus) 818 else if (ctrl && keysym == XK_minus)
551 { 819 {
552 len = 1; 820 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 821 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 822 }
823 else if (keysym == XK_ISO_Left_Tab)
824 {
825 strcpy (kbuf, "\033[Z");
826 len = 3;
827 }
555 else 828 else
556 { 829 {
557#ifdef META8_OPTION 830#ifdef META8_OPTION
558 /* set 8-bit on */ 831 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 832 if (meta && (meta_char == 0x80))
… …
571 } 844 }
572 845
573 if (len <= 0) 846 if (len <= 0)
574 return; /* not mapped */ 847 return; /* not mapped */
575 848
576 if (Options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 850 if (view_start)
578 { 851 {
579 TermWin.view_start = 0; 852 view_start = 0;
580 want_refresh = 1; 853 want_refresh = 1;
581 } 854 }
582 855
583 /* 856 /*
584 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
… …
617#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
619} 892}
620/*}}} */ 893/*}}} */
621 894
622#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
625unsigned int 898unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 900{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 903 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 905
633 if (n > 0 && s < count) 906 if (n > 0 && s < count)
634 { 907 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 908 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 909 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 910 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 911 cmdbuf_endp -= n;
639 s += n; 912 s += n;
640 } 913 }
… …
650 923
651 cmd_parse (); 924 cmd_parse ();
652 925
653 return 0; 926 return 0;
654} 927}
655#endif /* MENUBAR_MAX */ 928#endif
656 929
657void 930void
658rxvt_term::flush () 931rxvt_term::flush ()
659{ 932{
933 flush_ev.stop ();
934
660#ifdef TRANSPARENT 935#ifdef TRANSPARENT
661 if (want_full_refresh) 936 if (want_full_refresh)
662 { 937 {
663 want_full_refresh = 0; 938 want_full_refresh = 0;
664 scr_clear (); 939 scr_clear ();
665 scr_touch (false); 940 scr_touch (false);
666 want_refresh = 1;
667 } 941 }
668#endif 942#endif
669 943
670 if (want_refresh) 944 if (want_refresh)
671 { 945 {
… …
675 IMSendSpot (); 949 IMSendSpot ();
676#endif 950#endif
677 } 951 }
678 952
679 display->flush (); 953 display->flush ();
680
681 flush_ev.stop ();
682} 954}
683 955
684void 956void
685rxvt_term::check_cb (check_watcher &w) 957rxvt_term::check_cb (check_watcher &w)
686{ 958{
687 SET_R (this); 959 SET_R (this);
688 SET_LOCALE (locale); 960 SET_LOCALE (locale);
689 961
690 display->flush (); 962 display->flush ();
691 963
692 if (!flush_ev.active) 964 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 965 flush_ev.start (NOW + 0.01);
694} 966}
695 967
696void 968void
697rxvt_term::flush_cb (time_watcher &w) 969rxvt_term::flush_cb (time_watcher &w)
… …
762{ 1034{
763 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1038 {
1039 if (view_start == nsaved ||
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
767 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1044 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1046 }
771} 1047}
… …
784 1060
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1061 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1062 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1063 cmdbuf_endp = cmdbuf_ptr + n;
788 1064
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1066
791 if (n > 0) 1067 if (n > 0)
792 { 1068 {
793 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
794 return true; 1070 return true;
795 } 1071 }
796 else if (n < 0 && errno != EAGAIN) 1072 else if (n < 0 && errno != EAGAIN && errno != EINTR)
797 destroy (); 1073 pty_ev.stop ();
798 1074
799 return false; 1075 return false;
800} 1076}
801 1077
802void 1078void
803rxvt_term::pty_cb (io_watcher &w, short revents) 1079rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1080{
805 SET_R (this); 1081 SET_R (this);
806 SET_LOCALE (locale); 1082 SET_LOCALE (locale);
807 1083
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1084 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1085 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1086 while (pty_fill ())
813 if (cmd_parse ()) 1087 if (cmd_parse ())
814 break; 1088 break;
1089
1090 if (revents & EVENT_WRITE)
1091 pty_write ();
815} 1092}
816 1093
817void 1094void
818rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
819{ 1096{
820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1097 XDefineCursor (display->display, vt, TermWin_cursor);
821 recolour_cursor (); 1098 recolour_cursor ();
822 1099
823#ifdef POINTER_BLANK 1100#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1101 hidden_pointer = 0;
825 1102
826 if (Options & Opt_pointerBlank) 1103 if (options & Opt_pointerBlank)
827 pointer_ev.start (NOW + pointerBlankDelay); 1104 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1105#endif
829} 1106}
830 1107
831#ifdef POINTER_BLANK 1108#ifdef POINTER_BLANK
832void 1109void
833rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
834{ 1111{
835 if (! (Options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
836 return; 1113 return;
837 1114
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, vt, display->blank_cursor);
839 XFlush (display->display); 1116 XFlush (display->display);
840 1117
841 hidden_pointer = 1; 1118 hidden_pointer = 1;
842} 1119}
843 1120
… …
860 x = ev.x; 1137 x = ev.x;
861 y = ev.y; 1138 y = ev.y;
862 pixel_position (&x, &y); 1139 pixel_position (&x, &y);
863 1140
864 if (MEvent.button == AnyButton) 1141 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1142 button_number = 3;
867 }
868 else 1143 else
869 { 1144 {
870 button_number = MEvent.button - Button1; 1145 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1146 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1147 if (button_number >= 3)
873 button_number += (64 - 3); 1148 button_number += (64 - 3);
874 } 1149 }
875 1150
876 if (PrivateModes & PrivMode_MouseX10) 1151 if (priv_modes & PrivMode_MouseX10)
877 { 1152 {
878 /* 1153 /*
879 * do not report ButtonRelease 1154 * do not report ButtonRelease
880 * no state info allowed 1155 * no state info allowed
881 */ 1156 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1171 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1172 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1173#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1174 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1175#endif
901
902 } 1176 }
903 1177
904#ifdef DEBUG_MOUSEREPORT 1178#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1179 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1180 if (key_state & 16)
907 fputc ('C', stderr); 1181 fputc ('C', stderr);
908 if (key_state & 4) 1182 if (key_state & 4)
909 fputc ('S', stderr); 1183 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1187 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1188 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1189 button_number,
916 x + 1, 1190 x + 1,
917 y + 1); 1191 y + 1);
918#else 1192#endif
1193
919 tt_printf ("\033[M%c%c%c", 1194 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1195 (32 + button_number + key_state),
921 (32 + x + 1), 1196 (32 + x + 1),
922 (32 + y + 1)); 1197 (32 + y + 1));
923#endif
924} 1198}
925 1199
926#ifdef USING_W11LIB 1200#ifdef USING_W11LIB
927void 1201void
928rxvt_W11_process_x_event (XEvent *ev) 1202rxvt_W11_process_x_event (XEvent *ev)
… …
935 1209
936/*{{{ process an X event */ 1210/*{{{ process an X event */
937void 1211void
938rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
939{ 1213{
1214 dDisp;
1215
940 SET_R (this); 1216 SET_R (this);
941 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
942 1218
943#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
945 { 1221 {
946 if (hidden_cursor) 1222 if (hidden_cursor)
947 { 1223 {
948 hidden_cursor = 0; 1224 hidden_cursor = 0;
949 want_refresh = 1; 1225 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1229 }
954#endif 1230#endif
955 1231
956#if defined(POINTER_BLANK) 1232#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1234 {
959 if (ev.type == MotionNotify 1235 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1236 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1237 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1238 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1241 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1242 pointer_blank ();
967 } 1243 }
968#endif 1244#endif
969 1245
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1246 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1247 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1248 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1249
1028 switch (ev.type) 1250 switch (ev.type)
1029 { 1251 {
1030 case KeyPress: 1252 case KeyPress:
1253#if ISO_14755
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1031 lookup_key (ev.xkey); 1256 lookup_key (ev.xkey);
1257
1258 break;
1259
1260 case KeyRelease:
1261 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1032 break; 1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1033 1321
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1323 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1324 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1326 mouse_slip_wheel_speed = 0;
1046 } 1327#endif
1047 break; 1328 break;
1048 } 1329 }
1049#endif
1050 1330
1051 case ButtonPress: 1331 case ButtonPress:
1052 button_press (ev.xbutton); 1332 button_press (ev.xbutton);
1053 break; 1333 break;
1054 1334
… …
1056 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1057 break; 1337 break;
1058 1338
1059 case ClientMessage: 1339 case ClientMessage:
1060 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1062 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1063#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1064 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1066 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1067 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1068 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1069 { 1367 {
1070 /* Get Dnd data */ 1368 /* Get Dnd data */
1071 Atom ActualType; 1369 Atom ActualType;
1072 int ActualFormat; 1370 int ActualFormat;
1073 unsigned char *data; 1371 unsigned char *data;
1074 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1075 1373
1076 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1077 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1078 0L, 1000000L, 1376 0L, 1000000L,
1079 False, AnyPropertyType, 1377 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1082 &data); 1380 &data);
1083 XChangeProperty (display->display, display->root, 1381 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1382 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1090 } 1385 }
1091#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1092 break; 1387 break;
1093 1388
1094 case MappingNotify: 1389 case MappingNotify:
… …
1119 break; 1414 break;
1120 } 1415 }
1121 break; 1416 break;
1122 1417
1123 case FocusIn: 1418 case FocusIn:
1124 if (!TermWin.focus) 1419 focus_in ();
1420 break;
1421
1422 case FocusOut:
1423 focus_out ();
1424 break;
1425
1426 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0])
1125 { 1428 {
1126 TermWin.focus = 1; 1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1127 want_refresh = 1; 1430 ;
1128#ifdef USE_XIM 1431
1129 if (Input_Context != NULL) 1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1130 XSetICFocus (Input_Context);
1131#endif
1132#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 { 1433 {
1139 PixColors = PixColorsFocused; 1434 seen_resize = 1;
1140 set_colorfgbg (); 1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1141 scr_clear ();
1142 scr_touch (true);
1143 } 1436 }
1144#endif
1145 1437
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1439 if (options & Opt_transparent)
1440 check_our_parents ();
1441#endif
1146 } 1442 }
1147 break; 1443 break;
1148 1444
1149 case FocusOut:
1150 if (TermWin.focus)
1151 {
1152 TermWin.focus = 0;
1153 want_refresh = 1;
1154#ifdef USE_XIM
1155 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context);
1157#endif
1158#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink)
1160 cursor_blink_ev.stop ();
1161 hidden_cursor = 0;
1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1172
1173 }
1174 break;
1175
1176 case ConfigureNotify: 1445 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 { 1447 && ev.xproperty.state == PropertyNewValue)
1179 int height, width; 1448 selection_property (ev.xproperty.window, ev.xproperty.atom);
1180 1449
1181 do
1182 { /* Wrap lots of configures into one */
1183 width = ev.xconfigure.width;
1184 height = ev.xconfigure.height;
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188
1189 if (szHint.width != width || szHint.height != height)
1190 resize_all_windows (width, height, 1);
1191
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent)
1194 {
1195 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif
1200 }
1201 break; 1450 break;
1202 1451
1203 case SelectionClear: 1452 case SelectionClear:
1204 selection_clear (); 1453 selection_clear ();
1205 break; 1454 break;
1206 1455
1207 case SelectionNotify: 1456 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1457 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1459 break;
1212 1460
1213 case SelectionRequest: 1461 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1462 selection_send (ev.xselectionrequest);
1215 break; 1463 break;
1216 1464
1217 case UnmapNotify: 1465 case UnmapNotify:
1218 TermWin.mapped = 0; 1466 mapped = 0;
1219#ifdef TEXT_BLINK 1467#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1468 text_blink_ev.stop ();
1221#endif 1469#endif
1222 break; 1470 break;
1223 1471
1224 case MapNotify: 1472 case MapNotify:
1225 TermWin.mapped = 1; 1473 mapped = 1;
1226#ifdef TEXT_BLINK 1474#ifdef TEXT_BLINK
1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1228#endif 1476#endif
1229 break; 1477 break;
1230 1478
… …
1234 break; 1482 break;
1235#endif /* TRANSPARENT */ 1483#endif /* TRANSPARENT */
1236 1484
1237 case GraphicsExpose: 1485 case GraphicsExpose:
1238 case Expose: 1486 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1487 if (ev.xany.window == vt)
1240 { 1488 {
1241 do 1489 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1490 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1491 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1245 1493
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1495
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1251 1499
1252 scr_refresh (refresh_type); 1500 scr_refresh (refresh_type);
1253 } 1501 }
1254 else 1502 else
1255 { 1503 {
1256 XEvent unused_event; 1504 XEvent unused_event;
1257 1505
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1259 ; 1507 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1509 ;
1262 1510
1263 if (isScrollbarWindow (ev.xany.window)) 1511 if (isScrollbarWindow (ev.xany.window))
1264 { 1512 {
1265 scrollBar.setIdle (); 1513 scrollBar.setIdle ();
… …
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose (); 1518 menubar_expose ();
1271#endif 1519#endif
1272 1520
1273#ifdef TRANSPARENT 1521#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1522 if (am_transparent && ev.xany.window == parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1523 XClearWindow (disp, ev.xany.window);
1276#endif 1524#endif
1277 } 1525 }
1278 break; 1526 break;
1279 1527
1280 case MotionNotify: 1528 case MotionNotify:
… …
1287 { 1535 {
1288 menubar_control (ev.xbutton); 1536 menubar_control (ev.xbutton);
1289 break; 1537 break;
1290 } 1538 }
1291#endif 1539#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1541 break;
1294 1542
1295 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1296 { 1544 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1545 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1546 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1300 ; 1548 ;
1301 1549
1302 XQueryPointer (display->display, TermWin.vt, 1550 XQueryPointer (disp, vt,
1303 &unused_root, &unused_child, 1551 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1552 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1553 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1554 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1555#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1556 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1557 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1558 {
1311#endif 1559#endif
1560#if ISO_14755
1561 // 5.4
1562 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1563 {
1564 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1565 break;
1566 }
1567#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1568 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1569 ev.xbutton.state & Button3Mask ? 2 : 0);
1570
1314#ifdef SELECTION_SCROLLING 1571#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1572 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1573 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1574 {
1318 int dist; 1575 int dist;
1319 1576
1320 /* don't clobber the current delay if we are 1577 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1578 * already in the middle of scrolling.
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1581 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1582
1326 /* save the event params so we can highlight 1583 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1584 * the selection in the pending-scroll loop
1328 */ 1585 */
1329 selection_save_x=ev.xbutton.x; 1586 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1587 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1588 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1589
1334 /* calc number of lines to scroll */ 1590 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1591 if (ev.xbutton.y < int_bwidth)
1336 { 1592 {
1337 scroll_selection_dir = UP; 1593 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1594 dist = int_bwidth - ev.xbutton.y;
1339 } 1595 }
1340 else 1596 else
1341 { 1597 {
1342 scroll_selection_dir = DN; 1598 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1599 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1600 }
1601
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1602 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1603 / SELECTION_SCROLL_LINE_SPEEDUP
1604 + 1;
1348 MIN_IT (scroll_selection_lines, 1605 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1606 SELECTION_SCROLL_MAX_LINES);
1350 } 1607 }
1351 else 1608 else
1352 { 1609 {
1353 /* we are within the text window, so we 1610 /* we are within the text window, so we
1354 * shouldn't be scrolling 1611 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1613 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1614 sel_scroll_ev.stop();
1358 } 1615 }
1359#endif 1616#endif
1360#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1361
1362 } 1618 }
1363#endif 1619#endif
1364
1365 } 1620 }
1366 } 1621 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1623 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1624 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1370 MotionNotify, &ev)) ; 1625 MotionNotify, &ev))
1626 ;
1627
1371 XQueryPointer (display->display, scrollBar.win, 1628 XQueryPointer (disp, scrollBar.win,
1372 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1631 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1632 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1634 scrollbar_size ());
1378 scr_refresh (refresh_type); 1635 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1636 refresh_limit = 0;
… …
1382 break; 1639 break;
1383 } 1640 }
1384} 1641}
1385 1642
1386void 1643void
1644rxvt_term::focus_in ()
1645{
1646 if (!focus)
1647 {
1648 focus = 1;
1649 want_refresh = 1;
1650#if USE_XIM
1651 if (Input_Context != NULL)
1652 {
1653 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context);
1655 }
1656#endif
1657#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink)
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1660#endif
1661#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade])
1663 {
1664 pix_colors = pix_colors_focused;
1665 scr_recolour ();
1666 }
1667#endif
1668 }
1669}
1670
1671void
1672rxvt_term::focus_out ()
1673{
1674 if (focus)
1675 {
1676 focus = 0;
1677 want_refresh = 1;
1678
1679#if ENABLE_FRILLS || ISO_14755
1680 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY
1683 scr_overlay_off ();
1684#endif
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context);
1688#endif
1689#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink)
1691 cursor_blink_ev.stop ();
1692 hidden_cursor = 0;
1693#endif
1694#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade])
1696 {
1697 pix_colors = pix_colors_unfocused;
1698 scr_recolour ();
1699 }
1700#endif
1701 }
1702}
1703
1704#if TRANSPARENT
1705void
1387rxvt_term::rootwin_cb (XEvent &ev) 1706rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1707{
1389 SET_R (this); 1708 SET_R (this);
1390 SET_LOCALE (locale); 1709 SET_LOCALE (locale);
1391 1710
1392 switch (ev.type) 1711 switch (ev.type)
1393 { 1712 {
1394 case PropertyNotify: 1713 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1714 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1715 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on. 1716 * use the property to determine the pixmap. We use it later on.
1407 */ 1717 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1412 return; 1720 return;
1413 }
1414 1721
1415 /* FALLTHROUGH */ 1722 /* FALLTHROUGH */
1416 case ReparentNotify: 1723 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1725 want_refresh = want_full_refresh = 1;
1419 break; 1726 break;
1420#endif
1421 } 1727 }
1422} 1728}
1729#endif
1423 1730
1424void 1731void
1425rxvt_term::button_press (XButtonEvent &ev) 1732rxvt_term::button_press (XButtonEvent &ev)
1426{ 1733{
1427 int reportmode = 0, clickintime; 1734 int reportmode = 0, clickintime;
1428 1735
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate) 1737 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1738 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739
1432 /* 1740 /*
1433 * VT window processing of button press 1741 * VT window processing of button press
1434 */ 1742 */
1435 if (ev.window == TermWin.vt) 1743 if (ev.window == vt)
1436 { 1744 {
1745#if ISO_14755
1746 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 {
1749 iso14755_54 (ev.x, ev.y);
1750 return;
1751 }
1752#endif
1753
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1754 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1755
1438 if (reportmode) 1756 if (reportmode)
1439 { 1757 {
1440 /* mouse report from vt window */ 1758 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1759 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1760 MEvent.state = ev.state;
… …
1471 } 1789 }
1472 else 1790 else
1473 { 1791 {
1474 if (ev.button != MEvent.button) 1792 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1793 MEvent.clicks = 0;
1794
1476 switch (ev.button) 1795 switch (ev.button)
1477 { 1796 {
1478 case Button1: 1797 case Button1:
1798 /* allow meta + click to select rectangular areas */
1799 /* should be done in screen.C */
1800#if ENABLE_FRILLS
1801 selection.rect = !!(ev.state & ModMetaMask);
1802#else
1803 selection.rect = false;
1804#endif
1805
1479 /* allow shift+left click to extend selection */ 1806 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1808 {
1482 if (MEvent.button == Button1 && clickintime) 1809 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1810 selection_rotate (ev.x, ev.y);
1484 else 1811 else
1485 selection_extend (ev.x, ev.y, 1); 1812 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1827 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1828 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1829 selection_rotate (ev.x, ev.y);
1503 else 1830 else
1504 selection_extend (ev.x, ev.y, 1); 1831 selection_extend (ev.x, ev.y, 1);
1832
1505 MEvent.button = Button3; 1833 MEvent.button = Button3;
1506 break; 1834 break;
1507 } 1835 }
1508 } 1836 }
1837
1509 MEvent.time = ev.time; 1838 MEvent.time = ev.time;
1510 return; 1839 return;
1511 } 1840 }
1512 1841
1513 /* 1842 /*
… …
1605 break; 1934 break;
1606 case R_SB_ALIGN_BOTTOM: 1935 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1936 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1937 break;
1609 } 1938 }
1939
1610 if (scrollBar.style == R_SB_XTERM 1940 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1941 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1942 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1943 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1944
1615 scrollBar.setMotion (); 1945 scrollBar.setMotion ();
1616 break; 1946 break;
1617 1947
1618 case Button1: 1948 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1949 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1623 case Button3: 1953 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 1954 if (scrollBar.style != R_SB_XTERM)
1625 { 1955 {
1626 if (scrollbar_above_slider (ev.y)) 1956 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 1957# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 1958 scr_page (UP, nrow - 1);
1629# else 1959# else
1630 scr_page (UP, TermWin.nrow / 4); 1960 scr_page (UP, nrow / 4);
1631# endif 1961# endif
1632 else if (scrollbar_below_slider (ev.y)) 1962 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 1963# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 1964 scr_page (DN, nrow - 1);
1635# else 1965# else
1636 scr_page (DN, TermWin.nrow / 4); 1966 scr_page (DN, nrow / 4);
1637# endif 1967# endif
1638 else 1968 else
1639 scrollBar.setMotion (); 1969 scrollBar.setMotion ();
1640 } 1970 }
1641 else 1971 else
1642 { 1972 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 1973 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1974 (nrow
1645 * scrollbar_position (ev.y) 1975 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1976 / scrollbar_size ()));
1647 } 1977 }
1978
1648 break; 1979 break;
1649 } 1980 }
1650 } 1981 }
1651 return; 1982 return;
1652 } 1983 }
… …
1664{ 1995{
1665 int reportmode = 0; 1996 int reportmode = 0;
1666 1997
1667 csrO = 0; /* reset csr Offset */ 1998 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 1999 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2000 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2001
1671 if (scrollbar_isUpDn ()) 2002 if (scrollbar_isUpDn ())
1672 { 2003 {
1673 scrollBar.setIdle (); 2004 scrollBar.setIdle ();
1674 scrollbar_show (0); 2005 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 2007 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 2008#endif
1678
1679 } 2009 }
2010
1680#ifdef SELECTION_SCROLLING 2011#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 2012 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2013 sel_scroll_ev.stop();
1683#endif 2014#endif
2015
1684 if (ev.window == TermWin.vt) 2016 if (ev.window == vt)
1685 { 2017 {
2018#if ISO_14755
2019 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return;
2022#endif
1686 if (reportmode) 2023 if (reportmode)
1687 { 2024 {
1688 /* mouse report from vt window */ 2025 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2026 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2027 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 2041 MEvent.button = AnyButton;
1705 mouse_report (ev); 2042 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2043#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2044 return;
1708 } 2045 }
2046
1709 /* 2047 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2048 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2049 * when overriding mouse reporting
1712 */ 2050 */
1713 if (PrivateModes & PrivMode_mouse_report 2051 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2052 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2053 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2054 selection_extend (ev.x, ev.y, 0);
1717 2055
1718 switch (ev.button) 2056 switch (ev.button)
… …
1733 2071
1734 v = ev.button == Button4 ? UP : DN; 2072 v = ev.button == Button4 ? UP : DN;
1735 2073
1736 if (ev.state & ShiftMask) 2074 if (ev.state & ShiftMask)
1737 i = 1; 2075 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2076 else if (options & Opt_mouseWheelScrollPage)
1739 i = TermWin.nrow - 1; 2077 i = nrow - 1;
1740 else 2078 else
1741 i = 5; 2079 i = 5;
1742 2080
1743# ifdef MOUSE_SLIP_WHEELING 2081# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2082 if (ev.state & ControlMask)
1745 { 2083 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2084 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2085 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1748 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1749 2087
1750 if (slip_wheel_ev.at < NOW) 2088 if (slip_wheel_ev.at < NOW)
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752 2090
1753 slip_wheel_ev.start (); 2091 slip_wheel_ev.start ();
… …
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2135 int i;
1798 2136
1799 Visual* visual = display->visual; 2137 Visual *visual = display->visual;
1800 2138
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2140
1803 /* for convenience */ 2141 /* for convenience */
1804 mask_r = visual->red_mask; 2142 mask_r = visual->red_mask;
… …
2025 Atom atype; 2363 Atom atype;
2026 unsigned char *prop = NULL; 2364 unsigned char *prop = NULL;
2027 Window root, oldp, *list; 2365 Window root, oldp, *list;
2028 Pixmap rootpixmap = None; 2366 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2030 2369
2031 pchanged = 0; 2370 pchanged = 0;
2032 2371
2033 if (!(Options & Opt_transparent)) 2372 if (!(options & Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2373 return pchanged; /* Don't try any more */
2035 2374
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2376 rootdepth = wrootattr.depth;
2038 2377
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2378 XGetWindowAttributes (disp, parent[0], &wattr);
2040 2379
2041 if (rootdepth != wattr.depth) 2380 if (rootdepth != wattr.depth)
2042 { 2381 {
2043 if (am_transparent) 2382 if (am_transparent)
2044 { 2383 {
2045 pchanged = 1; 2384 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2386 am_transparent = am_pixmap_trans = 0;
2048 } 2387 }
2049 2388
2050 return pchanged; /* Don't try any more */ 2389 return pchanged; /* Don't try any more */
2051 } 2390 }
2052 2391
2053 /* Get all X ops out of the queue so that our information is up-to-date. */ 2392 /* Get all X ops out of the queue so that our information is up-to-date. */
2054 XSync (display->display, False); 2393 XSync (disp, False);
2055 2394
2056 /* 2395 /*
2057 * Make the frame window set by the window manager have 2396 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2397 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that. 2398 * windows for each client, so we have to take care about that.
2060 */ 2399 */
2061 i = (xa[XA_XROOTPMAPID] 2400 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2065 2404
2066 if (!i || prop == NULL) 2405 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2406 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2409 &nitems, &bytes_after, &prop) == Success);
2071 2410
2072 if (!i || prop == NULL 2411 if (!i || prop == NULL
2073#if TINTING 2412#if TINTING
… …
2092 Window cr; 2431 Window cr;
2093 XImage *image; 2432 XImage *image;
2094 GC gc; 2433 GC gc;
2095 XGCValues gcvalue; 2434 XGCValues gcvalue;
2096 2435
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2436 XTranslateCoordinates (disp, parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2437 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2438 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2439 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2440 nx = ny = 0;
2102 2441
… …
2112 nh += sy; 2451 nh += sy;
2113 ny = -sy; 2452 ny = -sy;
2114 sy = 0; 2453 sy = 0;
2115 } 2454 }
2116 2455
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458
2459 XSync (disp, False);
2119 allowedxerror = -1; 2460 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2462
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2464 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2465 allowedxerror = 0;
2125 2466
2126 if (image == NULL) 2467 if (image == NULL)
2127 { 2468 {
2128 if (am_transparent && am_pixmap_trans) 2469 if (am_transparent && am_pixmap_trans)
2129 { 2470 {
2130 pchanged = 1; 2471 pchanged = 1;
2131 if (TermWin.pixmap != None) 2472 if (pixmap != None)
2132 { 2473 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2474 XFreePixmap (disp, pixmap);
2134 TermWin.pixmap = None; 2475 pixmap = None;
2135 } 2476 }
2136 } 2477 }
2137 2478
2138 am_pixmap_trans = 0; 2479 am_pixmap_trans = 0;
2139 } 2480 }
2140 else 2481 else
2141 { 2482 {
2142 if (TermWin.pixmap != None) 2483 if (pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2484 XFreePixmap (disp, pixmap);
2144 2485
2145#if TINTING 2486#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2487 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2488 {
2148 unsigned short rm, gm, bm; 2489 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2491
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2493
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2494 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2495 }
2155#endif 2496#endif
2156 2497
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2498 pixmap = XCreatePixmap (disp, vt,
2158 szHint.width, szHint.height, image->depth); 2499 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2502 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2503 XFreeGC (disp, gc);
2163 XDestroyImage (image); 2504 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2506 XClearWindow (disp, parent[0]);
2166 2507
2167 if (!am_transparent || !am_pixmap_trans) 2508 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2509 pchanged = 1;
2169 2510
2170 am_transparent = am_pixmap_trans = 1; 2511 am_transparent = am_pixmap_trans = 1;
2171 } 2512 }
2172 } 2513 }
2173 2514
2174 if (!am_pixmap_trans) 2515 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2517 else
2175 { 2518 {
2176 unsigned int n; 2519 unsigned int n;
2177 /* 2520 /*
2178 * InheritPixmap transparency 2521 * InheritPixmap transparency
2179 */ 2522 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2182 { 2524 {
2183 oldp = TermWin.parent[i]; 2525 oldp = parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2526 XQueryTree (disp, parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2527 &parent[i], &list, &n);
2186 XFree (list); 2528 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2529
2189 if (TermWin.parent[i] == display->root) 2530 if (parent[i] == display->root)
2190 { 2531 {
2191 if (oldp != None) 2532 if (oldp != None)
2192 pchanged = 1; 2533 pchanged = 1;
2193 2534
2194 break; 2535 break;
2195 } 2536 }
2196 2537
2197 if (oldp != TermWin.parent[i]) 2538 if (oldp != parent[i])
2198 pchanged = 1; 2539 pchanged = 1;
2199 } 2540 }
2200 2541
2201 n = 0; 2542 n = 0;
2202 2543
2203 if (pchanged) 2544 if (pchanged)
2204 { 2545 {
2205 for (; n < (unsigned int)i; n++) 2546 for (; n < (unsigned int)i; n++)
2206 { 2547 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2548 XGetWindowAttributes (disp, parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2550 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2212 break; 2552 break;
2213 } 2553 }
2214 } 2554 }
2215 } 2555 }
2216 2556
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2218 { 2558 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2561 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2562 /* XXX: also turn off Opt_transparent? */
2224 } 2563 }
2225 else 2564 else
2226 { 2565 {
2227#if WAIT_FOR_WM 2566#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2567 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2568 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2569 sleep (1);
2231#endif 2570#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2571 for (n = 0; n < (unsigned int)i; n++)
2234 { 2572 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2574 XClearWindow (disp, parent[n]);
2237 } 2575 }
2238 2576
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2240 am_transparent = 1; 2578 am_transparent = 1;
2241 } 2579 }
2242 2580
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2582 parent[i] = None;
2245 } 2583 }
2246 2584
2247 // this is experimental
2248 if (scrollBar.win) 2585 if (scrollBar.win)
2249 { 2586 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2588 scrollBar.setIdle ();
2253 scrollbar_show (0); 2589 scrollbar_show (0);
2590 }
2591
2592 if (am_transparent)
2593 {
2594 want_refresh = want_full_refresh = 1;
2595 if (am_pixmap_trans)
2596 flush ();
2254 } 2597 }
2255 2598
2256 return pchanged; 2599 return pchanged;
2257} 2600}
2258#endif 2601#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2620 if (ch == NOCHAR) // TODO: improve
2278 break; 2621 break;
2279 2622
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2624 {
2625 if (!seen_input)
2626 {
2627 seen_input = 1;
2628 // many badly-written programs (e.g. jed) contain a race condition:
2629 // they first read the screensize and then install a SIGWINCH handler.
2630 // some window managers resize the window early, and these programs
2631 // then sometimes get the size wrong.
2632 // unfortunately other programs are even more buggy and dislike
2633 // being sent SIGWINCH, so only do it when we were in fact being
2634 // resized.
2635 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH);
2637 }
2638
2282 /* Read a text string from the input buffer */ 2639 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2640 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2641 bool refreshnow = false;
2285 int nlines = 0; 2642 int nlines = 0;
2286 unicode_t *str = buf; 2643 unicode_t *str = buf;
2287 2644 unicode_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2645
2290 for (;;) 2646 for (;;)
2291 { 2647 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2649 break;
2297 2650
2298 *str++ = ch; 2651 *str++ = ch;
2299 2652
2300 if (ch == C0_LF) 2653 if (ch == C0_LF || str >= eol)
2301 { 2654 {
2655 if (ch == C0_LF)
2302 nlines++; 2656 nlines++;
2657
2303 refresh_count++; 2658 refresh_count++;
2304 2659
2305 if (! (Options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2307 { 2662 {
2308 refreshnow = true; 2663 refreshnow = true;
2309 ch = NOCHAR; 2664 ch = NOCHAR;
2310 break; 2665 break;
2311 } 2666 }
2312 2667
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= nrow - 1)
2315 { 2670 {
2316 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2672 nlines = 0;
2318 str = buf; 2673 str = buf;
2674 eol = str + min (ncol, UBUFSIZ);
2319 } 2675 }
2676
2677 if (str >= eol)
2678 {
2679 if (eol >= buf + UBUFSIZ)
2680 {
2681 ch = NOCHAR;
2682 break;
2683 }
2684 else
2685 eol = min (eol + ncol, buf + UBUFSIZ);
2686 }
2687
2320 } 2688 }
2321 2689
2322 if (str >= buf + UBUFSIZ) 2690 seq_begin = cmdbuf_ptr;
2323 { 2691 ch = next_char ();
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2692 }
2328 2693
2329 scr_add_lines (buf, nlines, str - buf); 2694 scr_add_lines (buf, nlines, str - buf);
2330 2695
2331 /* 2696 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2699 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2700 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2701 */
2337 if (refreshnow) 2702 if (refreshnow)
2338 { 2703 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2705 refresh_limit++;
2341 else 2706 else
2342 { 2707 {
2343 flag = true; 2708 flag = true;
2344 scr_refresh (refresh_type); 2709 scr_refresh (refresh_type);
… …
2398 if (len == (size_t)-1) 2763 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400 2765
2401 // assume wchar == unicode 2766 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2767 cmdbuf_ptr += len;
2403 return wc; 2768 return wc & UNICODE_MASK;
2404 } 2769 }
2405 2770
2406 return NOCHAR; 2771 return NOCHAR;
2407} 2772}
2408 2773
… …
2534 process_escape_seq (); 2899 process_escape_seq ();
2535 break; 2900 break;
2536 case C0_ENQ: /* terminal Status */ 2901 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2902 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2905 else
2541 tt_write ((unsigned char *)VT100_ANS, 2906 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2907 (unsigned int)strlen (VT100_ANS));
2543 break; 2908 break;
2544 case C0_BEL: /* bell */ 2909 case C0_BEL: /* bell */
2545 scr_bell (); 2910 scr_bell ();
2546 break; 2911 break;
2547 case C0_BS: /* backspace */ 2912 case C0_BS: /* backspace */
… …
2646void 3011void
2647rxvt_term::process_escape_seq () 3012rxvt_term::process_escape_seq ()
2648{ 3013{
2649 unicode_t ch = cmd_getc (); 3014 unicode_t ch = cmd_getc ();
2650 3015
2651 if (PrivateModes & PrivMode_vt52) 3016 if (priv_modes & PrivMode_vt52)
2652 { 3017 {
2653 process_escape_vt52 (ch); 3018 process_escape_vt52 (ch);
2654 return; 3019 return;
2655 } 3020 }
2656 3021
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 3036 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 3037 break;
2673 case '+': 3038 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 3039 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 3040 break;
2676#ifndef NO_FRILLS 3041#if ENABLE_FRILLS
2677 case '6': 3042 case '6':
2678 scr_backindex (); 3043 scr_backindex ();
2679 break; 3044 break;
2680#endif 3045#endif
2681 case '7': 3046 case '7':
2682 scr_cursor (SAVE); 3047 scr_cursor (SAVE);
2683 break; 3048 break;
2684 case '8': 3049 case '8':
2685 scr_cursor (RESTORE); 3050 scr_cursor (RESTORE);
2686 break; 3051 break;
2687#ifndef NO_FRILLS 3052#if ENABLE_FRILLS
2688 case '9': 3053 case '9':
2689 scr_forwardindex (); 3054 scr_forwardindex ();
2690 break; 3055 break;
2691#endif 3056#endif
2692 case '=': 3057 case '=':
… …
2871 { 3236 {
2872 switch (priv) 3237 switch (priv)
2873 { 3238 {
2874 case '>': 3239 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 3240 if (ch == CSI_DA) /* secondary device attributes */
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2877 break; 3242 break;
2878 case '?': 3243 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3245 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3246 break;
… …
2986 3351
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3352 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 3353 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 3354 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 3357 break;
2993 3358
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3360 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3361 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3362 break;
2998 3363
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3365 process_sgr_mode (nargs, arg);
3001 break; 3366 break;
… …
3008 break; 3373 break;
3009 case 6: /* CPR requested */ 3374 case 6: /* CPR requested */
3010 scr_report_position (); 3375 scr_report_position ();
3011 break; 3376 break;
3012 case 7: /* unofficial extension */ 3377 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3378 if (options & Opt_insecure)
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3379 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3380 break;
3016 case 8: /* unofficial extension */ 3381 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3383 break;
3019 } 3384 }
… …
3055 break; 3420 break;
3056 3421
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3422 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3423 if (arg[0] == 4)
3059 scr_insert_mode (0); 3424 scr_insert_mode (0);
3425 else if (arg[0] == 20)
3426 priv_modes &= ~PrivMode_LFNL;
3060 break; 3427 break;
3061 3428
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3429 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3430 if (arg[0] == 4)
3064 scr_insert_mode (1); 3431 scr_insert_mode (1);
3432 else if (arg[0] == 20)
3433 priv_modes |= PrivMode_LFNL;
3065 break; 3434 break;
3066 3435
3067 /* 3436 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3437 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3438 */
… …
3081 break; 3450 break;
3082 case CSI_75: 3451 case CSI_75:
3083 scr_cursor (RESTORE); 3452 scr_cursor (RESTORE);
3084 break; 3453 break;
3085 3454
3086#ifndef NO_FRILLS 3455#if ENABLE_FRILLS
3087 case CSI_74: 3456 case CSI_74:
3088 process_window_ops (arg, nargs); 3457 process_window_ops (arg, nargs);
3089 break; 3458 break;
3090#endif 3459#endif
3091 3460
… …
3098 break; 3467 break;
3099 } 3468 }
3100} 3469}
3101/*}}} */ 3470/*}}} */
3102 3471
3103#ifndef NO_FRILLS 3472#if ENABLE_FRILLS
3104/* ARGSUSED */ 3473/* ARGSUSED */
3105void 3474void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3475rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3476{
3108 int x, y; 3477 int x, y;
3109 XWindowAttributes wattr; 3478 XWindowAttributes wattr;
3110 Window wdummy; 3479 Window wdummy;
3480 dDisp;
3111 3481
3112 if (nargs == 0) 3482 if (nargs == 0)
3113 return; 3483 return;
3114 3484
3115 switch (args[0]) 3485 switch (args[0])
3116 { 3486 {
3117 /* 3487 /*
3118 * commands 3488 * commands
3119 */ 3489 */
3120 case 1: /* deiconify window */ 3490 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3491 XMapWindow (disp, parent[0]);
3122 break; 3492 break;
3123 case 2: /* iconify window */ 3493 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3494 XIconifyWindow (disp, parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3495 break;
3127 case 3: /* set position (pixels) */ 3496 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3497 XMoveWindow (disp, parent[0], args[1], args[2]);
3129 break; 3498 break;
3130 case 4: /* set size (pixels) */ 3499 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3501 break;
3133 case 5: /* raise window */ 3502 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3503 XRaiseWindow (disp, parent[0]);
3135 break; 3504 break;
3136 case 6: /* lower window */ 3505 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3506 XLowerWindow (disp, parent[0]);
3138 break; 3507 break;
3139 case 7: /* refresh window */ 3508 case 7: /* refresh window */
3140 scr_touch (true); 3509 scr_touch (true);
3141 break; 3510 break;
3142 case 8: /* set size (chars) */ 3511 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3512 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3513 (unsigned int) (args[1] * fheight));
3145 break; 3514 break;
3146 3515
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3516 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3517 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3518 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3519 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3520 (unsigned int) (args[1] * fheight));
3152 break; 3521 break;
3153 3522
3154 3523
3155 /* 3524 /*
3156 * reports - some output format copied from XTerm 3525 * reports - some output format copied from XTerm
3157 */ 3526 */
3158 case 11: /* report window state */ 3527 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3528 XGetWindowAttributes (disp, parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3530 break;
3162 case 13: /* report window position */ 3531 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3533 XTranslateCoordinates (disp, parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3534 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3535 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3536 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3537 break;
3169 case 14: /* report window size (pixels) */ 3538 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3541 break;
3173 case 18: /* report text area size (chars) */ 3542 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3543 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3544 break;
3176 case 19: /* report window size (chars) */ 3545 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3546 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3547 break;
3179 case 20: /* report icon label */ 3548 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3549 {
3182 char *s; 3550 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3551 XGetIconName (disp, parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s);
3185 } 3554 }
3186 break; 3555 break;
3187 case 21: /* report window title */ 3556 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3557 {
3190 char *s; 3558 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3559 XFetchName (disp, parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s);
3193 } 3562 }
3194 break; 3563 break;
3195 } 3564 }
3196} 3565}
3197#endif 3566#endif
3198 3567
… …
3202 * ends_how is terminator used. returned input must be free()'d 3571 * ends_how is terminator used. returned input must be free()'d
3203 */ 3572 */
3204unsigned char * 3573unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3574rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3575{
3207 unicode_t prev = 0, ch; 3576 unicode_t ch;
3577 bool seen_esc = false;
3208 unsigned int n = 0; 3578 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3579 wchar_t string[STRING_MAX];
3211 3580
3212 while ((ch = cmd_getc ()) != NOCHAR) 3581 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3582 {
3214 if (prev == C0_ESC) 3583 if (seen_esc)
3215 { 3584 {
3216 if (ch == 0x5c) /* 7bit ST */ 3585 if (ch == 0x5c) /* 7bit ST */
3217 break; 3586 break;
3218 else 3587 else
3219 return NULL; 3588 return NULL;
3220 } 3589 }
3590 else if (ch == C0_ESC)
3591 {
3592 seen_esc = true;
3593 continue;
3594 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3595 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3596 break;
3223 else if (ch < 0x20) 3597 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3598 return NULL; /* other control character - exit */
3225 3599
3226 if (n >= sizeof (string) - 1) 3600 seen_esc = false;
3601
3602 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3603 // stop at some sane length
3228 return NULL; 3604 return NULL;
3229 3605
3230 if (ch == C0_SYN) 3606 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3607 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3608 else
3236 string[n++] = prev = ch; 3609 string[n++] = ch;
3237 } 3610 }
3238 3611
3239 string[n++] = '\0'; 3612 string[n++] = '\0';
3240 3613
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3614 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3615
3246 return s; 3616 return (unsigned char *)rxvt_wcstombs (string);
3247} 3617}
3248 3618
3249/*----------------------------------------------------------------------*/ 3619/*----------------------------------------------------------------------*/
3250/* 3620/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3295void 3665void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{ 3667{
3298 if (str[0] == '?' && !str[1]) 3668 if (str[0] == '?' && !str[1])
3299 { 3669 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3670 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3671 pix_colors_focused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 } 3673 }
3307 else 3674 else
3308 set_window_color (color, str); 3675 set_window_color (color, str);
3309} 3676}
3310 3677
3311/* 3678/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 * 0 = change iconName/title
3314 * 1 = change iconName
3315 * 2 = change title
3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3319 * 12 = change text color
3320 * 13 = change mouse foreground color
3321 * 17 = change highlight character colour
3322 * 18 = change bold character color
3323 * 19 = change underlined character color
3324 * 46 = change logfile (not implemented)
3325 * 50 = change font
3326 *
3327 * rxvt extensions:
3328 * 20 = bg pixmap
3329 * 39 = change default fg color
3330 * 49 = change default bg color
3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3335 */ 3680 */
3336void 3681void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3338{ 3683{
3339 int changed = 0; 3684 int changed = 0;
3340 int color; 3685 int color;
3341 char *buf, *name; 3686 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3687 bool query = str[0] == '?' && !str[1];
3688 int saveop = op;
3689 dDisp;
3343 3690
3344 assert (str != NULL); 3691 assert (str != NULL);
3345 switch (op) 3692 switch (op)
3346 { 3693 {
3347 case XTerm_name: 3694 case XTerm_name:
… …
3354 set_title (str); 3701 set_title (str);
3355 break; 3702 break;
3356 case XTerm_property: 3703 case XTerm_property:
3357 if (str[0] == '?') 3704 if (str[0] == '?')
3358 { 3705 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3706 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3707 Atom actual_type;
3361 int actual_format; 3708 int actual_format;
3362 unsigned long nitems; 3709 unsigned long nitems;
3363 unsigned long bytes_after; 3710 unsigned long bytes_after;
3364 unsigned char *value = 0; 3711 unsigned char *value = 0;
3365 const char *str = ""; 3712 const char *str = "";
3366 3713
3367 if (prop 3714 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3715 && XGetWindowProperty (disp, parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3716 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3717 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3718 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3719 && actual_type != None
3373 && actual_format == 8) 3720 && actual_format == 8)
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3729 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3730
3384 if (eq) 3731 if (eq)
3385 { 3732 {
3386 *eq = 0; 3733 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3734 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3735 }
3392 else 3736 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3737 XDeleteProperty (disp, parent[0],
3394 display->atom (str)); 3738 display->atom (str));
3395 } 3739 }
3396 break; 3740 break;
3397 3741
3398 case XTerm_Color: 3742 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3743 for (buf = (char *)str; buf && *buf;)
3400 { 3744 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3745 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3746 break;
3403 3747
3404 *name++ = '\0'; 3748 *name++ = '\0';
3405 color = atoi (buf); 3749 color = atoi (buf);
3406 3750
3407 if (color < 0 || color >= TOTAL_COLORS) 3751 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3752 break;
3409 3753
3410 if ((buf = STRCHR (name, ';')) != NULL) 3754 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3755 *buf++ = '\0';
3412 3756
3413 if (name[0] == '?' && !name[1]) 3757 if (name[0] == '?' && !name[1])
3414 { 3758 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3759 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3762 }
3422 else 3763 else
3423 set_window_color (color + minCOLOR, name); 3764 set_window_color (color + minCOLOR, name);
3424 } 3765 }
3425 break; 3766 break;
… …
3447 case XTerm_Color_UL: 3788 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3790 break;
3450 case XTerm_Color_RV: 3791 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3793 break;
3794 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3796 break;
3797#endif
3798#if TRANSPARENT && TINTING
3799 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3801 check_our_parents ();
3802 if (am_transparent)
3803 want_full_refresh = want_refresh = 1;
3452 break; 3804 break;
3453#endif 3805#endif
3454 3806
3455 case XTerm_Pixmap: 3807 case XTerm_Pixmap:
3456 if (*str != ';') 3808 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3811 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3812 set_bgPixmap (str); /* change pixmap */
3461#endif 3813#endif
3462 scr_touch (true); 3814 scr_touch (true);
3463 } 3815 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3816 while ((str = strchr (str, ';')) != NULL)
3465 { 3817 {
3466 str++; 3818 str++;
3467#if XPM_BACKGROUND 3819#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3820 changed += scale_pixmap (str);
3469#endif 3821#endif
3470
3471 } 3822 }
3823
3472 if (changed) 3824 if (changed)
3473 { 3825 {
3474#ifdef XPM_BACKGROUND 3826#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3827 resize_pixmap ();
3476#endif 3828#endif
… …
3487 3839
3488 case XTerm_logfile: 3840 case XTerm_logfile:
3489 // TODO, when secure mode? 3841 // TODO, when secure mode?
3490 break; 3842 break;
3491 3843
3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR 3844#ifdef MENUBAR
3533 case XTerm_Menu: 3845 case URxvt_Menu:
3534 if (Options & Opt_insecure) 3846 if (options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3848 break;
3537#endif 3849#endif
3538#if 0 3850#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
… …
3543 { 3855 {
3544 scr_dump (fd); 3856 scr_dump (fd);
3545 close (fd); 3857 close (fd);
3546 } 3858 }
3547 } 3859 }
3860 break;
3861#endif
3862 case XTerm_font:
3863 op = URxvt_font;
3864 case URxvt_font:
3865#if ENABLE_STYLES
3866 case URxvt_boldFont:
3867 case URxvt_italicFont:
3868 case URxvt_boldItalicFont:
3869#endif
3870 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp);
3875 else
3876 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)];
3878
3879 res = strdup (str);
3880 allocated.push_back ((void *)res);
3881 set_fonts ();
3882 }
3883 break;
3884
3885#if ENABLE_FRILLS
3886 case URxvt_locale:
3887 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3889 else
3890 {
3891 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8);
3893 init_xlocale ();
3894 }
3895 break;
3896
3897 case URxvt_view_up:
3898 case URxvt_view_down:
3899 int lines = atoi (str);
3900
3901 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else
3904 {
3905 scr_erase_savelines ();
3906 }
3907
3548 break; 3908 break;
3549#endif 3909#endif
3550 } 3910 }
3551} 3911}
3552/*----------------------------------------------------------------------*/ 3912/*----------------------------------------------------------------------*/
… …
3566{ 3926{
3567 int state; 3927 int state;
3568 3928
3569 if (mode == 's') 3929 if (mode == 's')
3570 { 3930 {
3571 SavedModes |= (PrivateModes & bit); 3931 SavedModes |= (priv_modes & bit);
3572 return -1; 3932 return -1;
3573 } 3933 }
3574 else 3934 else
3575 { 3935 {
3576 if (mode == 'r') 3936 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3937 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3938 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3939 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3940 PrivMode (state, bit);
3581 } 3941 }
3582 3942
3583 return state; 3943 return state;
3584} 3944}
… …
3602 { 3, PrivMode_132 }, 3962 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 3963 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 3964 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 3965 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 3966 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 3968 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3969#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 3970 { menuBar_esc, PrivMode_menuBar },
3610#endif 3971#endif
3972 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 3974#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3975 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3976#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3977 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 3978 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3979 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3980 // 45 margin bell NYI
3621 // 46 start logging 3981 // 46 start logging
… …
3662 4022
3663 /* extra handling for values with state unkept */ 4023 /* extra handling for values with state unkept */
3664 switch (arg[i]) 4024 switch (arg[i])
3665 { 4025 {
3666 case 1048: /* alternative cursor save */ 4026 case 1048: /* alternative cursor save */
4027 case 1049:
3667 if (Options & Opt_secondaryScreen) 4028 if (options & Opt_secondaryScreen)
3668 if (mode == 0) 4029 if (mode == 0)
3669 scr_cursor (RESTORE); 4030 scr_cursor (RESTORE);
3670 else if (mode == 1) 4031 else if (mode == 1)
3671 scr_cursor (SAVE); 4032 scr_cursor (SAVE);
3672 break; 4033 break;
… …
3683 * within VT52 mode 4044 * within VT52 mode
3684 */ 4045 */
3685 PrivMode (1, PrivMode_vt52); 4046 PrivMode (1, PrivMode_vt52);
3686 break; 4047 break;
3687 case 3: /* 80/132 */ 4048 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4049 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4050 set_widthheight (((state ? 132 : 80) * fwidth), height);
3690 break; 4051 break;
3691 case 4: /* smooth scrolling */ 4052 case 4: /* smooth scrolling */
3692 if (state) 4053 if (state)
3693 Options &= ~Opt_jumpScroll; 4054 options &= ~Opt_jumpScroll;
3694 else 4055 else
3695 Options |= Opt_jumpScroll; 4056 options |= Opt_jumpScroll;
3696 break; 4057 break;
3697 case 5: /* reverse video */ 4058 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4059 scr_rvideo_mode (state);
3699 break; 4060 break;
3700 case 6: /* relative/absolute origins */ 4061 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4065 scr_autowrap (state);
3705 break; 4066 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4067 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4068 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4069 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4070 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4071 break;
3711#ifdef menuBar_esc 4072#ifdef menuBar_esc
3712 case menuBar_esc: 4073 case menuBar_esc:
3713#ifdef MENUBAR 4074#ifdef MENUBAR
3714 map_menuBar (state); 4075 map_menuBar (state);
… …
3734 break; 4095 break;
3735 /* case 66: - application key pad */ 4096 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4097 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4098 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4099 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4100 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4101 break;
3741#if 0 4102#if 0
3742 case 1001: 4103 case 1001:
3743 break; /* X11 mouse highlighting */ 4104 break; /* X11 mouse highlighting */
3744#endif 4105#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4106 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4107 if (state)
3747 Options &= ~Opt_scrollTtyOutput; 4108 options &= ~Opt_scrollTtyOutput;
3748 else 4109 else
3749 Options |= Opt_scrollTtyOutput; 4110 options |= Opt_scrollTtyOutput;
3750 break; 4111 break;
3751 case 1011: /* scroll to bottom on key press */ 4112 case 1011: /* scroll to bottom on key press */
3752 if (state) 4113 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4114 options |= Opt_scrollTtyKeypress;
3754 else 4115 else
3755 Options &= ~Opt_scrollTtyKeypress; 4116 options &= ~Opt_scrollTtyKeypress;
3756 break; 4117 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4118 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4119 if (options & Opt_secondaryScreen)
3759 if (current_screen != PRIMARY) 4120 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4121 scr_erase_screen (2);
3761 scr_change_screen (state); 4122 scr_change_screen (state);
3762 break; 4123 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4124 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4125 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4126 if (options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY) 4127 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4128 scr_erase_screen (2);
3768 break; 4129 break;
3769 default: 4130 default:
3770 break; 4131 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4157 rendset = 0, rendstyle = ~RS_None;
3797 break; 4158 break;
3798 case 1: 4159 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4160 rendset = 1, rendstyle = RS_Bold;
3800 break; 4161 break;
3801 //case 2: // faint or second colour 4162 //case 2: // low intensity
4163 case 3:
4164 rendset = 1, rendstyle = RS_Italic;
4165 break;
3802 case 4: 4166 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4167 rendset = 1, rendstyle = RS_Uline;
3804 break; 4168 break;
3805 case 5: // slowly blinking 4169 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4170 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4182 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4183 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4184 //...
3821 //case 19: // ninth alt font 4185 //case 19: // ninth alt font
3822 //case 20: // gothic 4186 //case 20: // gothic
3823 case 21: // disable bold, faint 4187 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4188 rendset = 0, rendstyle = RS_Bold;
3825 break; 4189 break;
3826 case 22: 4190 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4191 rendset = 0, rendstyle = RS_Bold;
3828 break; 4192 break;
3829 //case 23: disable italic 4193 case 23: // disable italic
4194 rendset = 0, rendstyle = RS_Italic;
4195 break;
3830 case 24: 4196 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4197 rendset = 0, rendstyle = RS_Uline;
3832 break; 4198 break;
3833 case 25: 4199 case 25:
4200 rendset = 0, rendstyle = RS_Blink;
4201 break;
4202 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4203 rendset = 0, rendstyle = RS_Blink;
3835 break; 4204 break;
3836 case 27: 4205 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4206 rendset = 0, rendstyle = RS_RVid;
3838 break; 4207 break;
… …
3856 case 35: 4225 case 35:
3857 case 36: 4226 case 36:
3858 case 37: 4227 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4228 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4229 break;
3861#ifdef TTY_256COLOR 4230 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4231 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4232 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4233 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4234 i += 2;
3867 } 4235 }
3868 break; 4236 break;
3869#endif
3870 case 39: /* default fg */ 4237 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4238 scr_color (Color_fg, Color_fg);
3872 break; 4239 break;
3873 4240
3874 case 40: 4241 case 40:
… …
3879 case 45: 4246 case 45:
3880 case 46: 4247 case 46:
3881 case 47: 4248 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4249 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4250 break;
3884#ifdef TTY_256COLOR 4251 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4252 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4253 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4254 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4255 i += 2;
3890 } 4256 }
3891 break; 4257 break;
3892#endif
3893 case 49: /* default bg */ 4258 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4259 scr_color (Color_bg, Color_bg);
3895 break; 4260 break;
4261
4262 //case 50: // not variable spacing
3896 4263
3897#ifndef NO_BRIGHTCOLOR 4264#ifndef NO_BRIGHTCOLOR
3898 case 90: 4265 case 90:
3899 case 91: /* set bright fg color */ 4266 case 91: /* set bright fg color */
3900 case 92: 4267 case 92:
3901 case 93: 4268 case 93:
3902 case 94: 4269 case 94:
3903 case 95: 4270 case 95:
3904 case 96: 4271 case 96:
3905 case 97: 4272 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4273 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4274 break;
3909 case 100: 4275 case 100:
3910 case 101: /* set bright bg color */ 4276 case 101: /* set bright bg color */
3911 case 102: 4277 case 102:
3912 case 103: 4278 case 103:
3913 case 104: 4279 case 104:
3914 case 105: 4280 case 105:
3915 case 106: 4281 case 106:
3916 case 107: 4282 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4284 break;
3920#endif 4285#endif
3921 4286
3922 } 4287 }
3923 } 4288 }
… …
3930{ 4295{
3931 unicode_t ch, cmd = cmd_getc (); 4296 unicode_t ch, cmd = cmd_getc ();
3932 4297
3933 if (cmd == 'Q') 4298 if (cmd == 'Q')
3934 { /* query graphics */ 4299 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4300 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4301 return;
3937 } 4302 }
3938 /* swallow other graphics sequences until terminating ':' */ 4303 /* swallow other graphics sequences until terminating ':' */
3939 do 4304 do
3940 ch = cmd_getc (); 4305 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4320 unsigned char buf[256];
3956 4321
3957 va_start (arg_ptr, fmt); 4322 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4324 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4325 tt_write (buf, strlen (buf));
3961} 4326}
3962 4327
3963/* ---------------------------------------------------------------------- */ 4328/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4329/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 4330 * or generated by us in response to a query ESC sequence.
3966 */ 4331 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333
3967void 4334void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4335rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4336{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4337 if (v_buflen == 0)
4338 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3971 4340
3972 if (len) 4341 if ((unsigned int)written == len)
4342 return;
4343
4344 data += written;
4345 len -= written;
3973 { 4346 }
4347
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4349
4350 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len;
4352
4353 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354}
4355
4356void rxvt_term::pty_write ()
4357{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359
4360 if (written > 0)
4361 {
4362 v_buflen -= written;
4363
3974 if (v_buflen == 0) 4364 if (v_buflen == 0)
3975 { 4365 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4366 free (v_buffer);
4003 v_buffer = 0; 4367 v_buffer = 0;
4004 v_buflen = 0; 4368 v_buflen = 0;
4005 4369
4006 pty_ev.set (EVENT_READ); 4370 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4371 return;
4019 } 4372 }
4373
4374 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4375 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 pty_ev.set (EVENT_READ);
4021} 4378}
4022 4379
4023/*----------------------- end-of-file (C source) -----------------------*/ 4380/*----------------------- end-of-file (C source) -----------------------*/
4024 4381

Diff Legend

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