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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 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(y - view_start);
147
148 text_t t = l.t[x];
149
150 if (t != NOCHAR || !x)
151 {
152 iso14755_51 (l.t[x], l.r[x]);
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;
… …
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 ();
… …
674 IMSendSpot (); 949 IMSendSpot ();
675#endif 950#endif
676 } 951 }
677 952
678 display->flush (); 953 display->flush ();
679
680 flush_ev.stop ();
681} 954}
682 955
683void 956void
684rxvt_term::check_cb (check_watcher &w) 957rxvt_term::check_cb (check_watcher &w)
685{ 958{
… …
761{ 1034{
762 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
763 || 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)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1038 {
1039 if (view_start == nsaved ||
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
766 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
767 want_refresh = 1; 1044 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1046 }
770} 1047}
… …
783 1060
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1061 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1062 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1063 cmdbuf_endp = cmdbuf_ptr + n;
787 1064
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
789 1066
790 if (n > 0) 1067 if (n > 0)
791 { 1068 {
792 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
793 return true; 1070 return true;
794 } 1071 }
795 else if (n < 0 && errno != EAGAIN) 1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1073 {
1074 pty_ev.stop ();
1075
1076 if (!(options & Opt_hold))
796 destroy (); 1077 destroy ();
1078 }
797 1079
798 return false; 1080 return false;
799} 1081}
800 1082
801void 1083void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1084rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1085{
804 SET_R (this); 1086 SET_R (this);
805 SET_LOCALE (locale); 1087 SET_LOCALE (locale);
806 1088
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1089 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1090 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1091 while (pty_fill ())
812 if (cmd_parse ()) 1092 if (cmd_parse ())
813 break; 1093 break;
1094
1095 if (revents & EVENT_WRITE)
1096 pty_write ();
814} 1097}
815 1098
816void 1099void
817rxvt_term::pointer_unblank () 1100rxvt_term::pointer_unblank ()
818{ 1101{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1102 XDefineCursor (display->display, vt, TermWin_cursor);
820 recolour_cursor (); 1103 recolour_cursor ();
821 1104
822#ifdef POINTER_BLANK 1105#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1106 hidden_pointer = 0;
824 1107
825 if (Options & Opt_pointerBlank) 1108 if (options & Opt_pointerBlank)
826 pointer_ev.start (NOW + pointerBlankDelay); 1109 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1110#endif
828} 1111}
829 1112
830#ifdef POINTER_BLANK 1113#ifdef POINTER_BLANK
831void 1114void
832rxvt_term::pointer_blank () 1115rxvt_term::pointer_blank ()
833{ 1116{
834 if (! (Options & Opt_pointerBlank)) 1117 if (! (options & Opt_pointerBlank))
835 return; 1118 return;
836 1119
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1120 XDefineCursor (display->display, vt, display->blank_cursor);
838 XFlush (display->display); 1121 XFlush (display->display);
839 1122
840 hidden_pointer = 1; 1123 hidden_pointer = 1;
841} 1124}
842 1125
… …
859 x = ev.x; 1142 x = ev.x;
860 y = ev.y; 1143 y = ev.y;
861 pixel_position (&x, &y); 1144 pixel_position (&x, &y);
862 1145
863 if (MEvent.button == AnyButton) 1146 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1147 button_number = 3;
866 }
867 else 1148 else
868 { 1149 {
869 button_number = MEvent.button - Button1; 1150 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1151 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1152 if (button_number >= 3)
872 button_number += (64 - 3); 1153 button_number += (64 - 3);
873 } 1154 }
874 1155
875 if (PrivateModes & PrivMode_MouseX10) 1156 if (priv_modes & PrivMode_MouseX10)
876 { 1157 {
877 /* 1158 /*
878 * do not report ButtonRelease 1159 * do not report ButtonRelease
879 * no state info allowed 1160 * no state info allowed
880 */ 1161 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1176 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1177 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1178#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1179 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1180#endif
900
901 } 1181 }
902 1182
903#ifdef DEBUG_MOUSEREPORT 1183#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1184 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1185 if (key_state & 16)
906 fputc ('C', stderr); 1186 fputc ('C', stderr);
907 if (key_state & 4) 1187 if (key_state & 4)
908 fputc ('S', stderr); 1188 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1192 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1193 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1194 button_number,
915 x + 1, 1195 x + 1,
916 y + 1); 1196 y + 1);
917#else 1197#endif
1198
918 tt_printf ("\033[M%c%c%c", 1199 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1200 (32 + button_number + key_state),
920 (32 + x + 1), 1201 (32 + x + 1),
921 (32 + y + 1)); 1202 (32 + y + 1));
922#endif
923} 1203}
924 1204
925#ifdef USING_W11LIB 1205#ifdef USING_W11LIB
926void 1206void
927rxvt_W11_process_x_event (XEvent *ev) 1207rxvt_W11_process_x_event (XEvent *ev)
… …
934 1214
935/*{{{ process an X event */ 1215/*{{{ process an X event */
936void 1216void
937rxvt_term::x_cb (XEvent &ev) 1217rxvt_term::x_cb (XEvent &ev)
938{ 1218{
1219 dDisp;
1220
939 SET_R (this); 1221 SET_R (this);
940 SET_LOCALE (locale); 1222 SET_LOCALE (locale);
941 1223
942#if defined(CURSOR_BLINK) 1224#if defined(CURSOR_BLINK)
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
944 { 1226 {
945 if (hidden_cursor) 1227 if (hidden_cursor)
946 { 1228 {
947 hidden_cursor = 0; 1229 hidden_cursor = 0;
948 want_refresh = 1; 1230 want_refresh = 1;
… …
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
952 } 1234 }
953#endif 1235#endif
954 1236
955#if defined(POINTER_BLANK) 1237#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 { 1239 {
958 if (ev.type == MotionNotify 1240 if (ev.type == MotionNotify
959 || ev.type == ButtonPress 1241 || ev.type == ButtonPress
960 || ev.type == ButtonRelease) 1242 || ev.type == ButtonRelease)
961 if (hidden_pointer) 1243 if (hidden_pointer)
… …
964 if (ev.type == KeyPress && hidden_pointer == 0) 1246 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank (); 1247 pointer_blank ();
966 } 1248 }
967#endif 1249#endif
968 1250
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return;
972#endif
973
974 Window unused_root, unused_child; 1251 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1252 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1253 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 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));
1025#endif
1026 1254
1027 switch (ev.type) 1255 switch (ev.type)
1028 { 1256 {
1029 case KeyPress: 1257 case KeyPress:
1258#if ISO_14755
1259 if (!(iso14755buf & ISO_14755_52))
1260#endif
1030 lookup_key (ev.xkey); 1261 lookup_key (ev.xkey);
1262
1263 break;
1264
1265 case KeyRelease:
1266 {
1267#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1268 KeySym ks;
1269
1270 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1271#endif
1272
1273#if ENABLE_FRILLS || ISO_14755
1274 // ISO 14755 support
1275 if (iso14755buf)
1276 if (iso14755buf & ISO_14755_52)
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281# if ISO_14755
1282 // iso14755 part 5.2 handling: release time
1283 // first: controls
1284 if ((ev.xkey.state & ControlMask)
1285 && ((ks >= 0x40 && ks <= 0x5f)
1286 || (ks >= 0x61 && ks <= 0x7f)))
1287 {
1288 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1289 commit_iso14755 ();
1290 return; // case-break;
1291 }
1292
1293 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1294 if (i[0] == ks)
1295 {
1296 iso14755buf = ISO_14755_51 | i[1];
1297 commit_iso14755 ();
1298 return; // case-break;
1299 }
1300
1301 scr_bell ();
1302# endif
1303 iso14755buf = 0;
1031 break; 1304 break;
1305 }
1306 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311 if (iso14755buf & ISO_14755_51)
1312 commit_iso14755 ();
1313#if ISO_14755
1314 else if (iso14755buf & ISO_14755_STARTED)
1315 {
1316 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1317
1318 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1319 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1320 }
1321# endif
1322 else
1323 iso14755buf = 0;
1324 }
1325#endif
1032 1326
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1327#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1328 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1329 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1330 else if (ks == XK_Control_L || ks == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1331 mouse_slip_wheel_speed = 0;
1045 } 1332#endif
1046 break; 1333 break;
1047 } 1334 }
1048#endif
1049 1335
1050 case ButtonPress: 1336 case ButtonPress:
1051 button_press (ev.xbutton); 1337 button_press (ev.xbutton);
1052 break; 1338 break;
1053 1339
… …
1055 button_release (ev.xbutton); 1341 button_release (ev.xbutton);
1056 break; 1342 break;
1057 1343
1058 case ClientMessage: 1344 case ClientMessage:
1059 if (ev.xclient.format == 32 1345 if (ev.xclient.format == 32
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1347 {
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1061 destroy (); 1349 destroy ();
1350#if ENABLE_EWMH
1351 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1352 XSendEvent (disp, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &ev);
1355#endif
1356 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1062#ifdef OFFIX_DND 1366#ifdef OFFIX_DND
1063 /* OffiX Dnd (drag 'n' drop) protocol */ 1367 /* OffiX Dnd (drag 'n' drop) protocol */
1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1065 && (ev.xclient.data.l[0] == DndFile 1369 && (ev.xclient.data.l[0] == DndFile
1066 || ev.xclient.data.l[0] == DndDir 1370 || ev.xclient.data.l[0] == DndDir
1067 || ev.xclient.data.l[0] == DndLink)) 1371 || ev.xclient.data.l[0] == DndLink))
1068 { 1372 {
1069 /* Get Dnd data */ 1373 /* Get Dnd data */
1070 Atom ActualType; 1374 Atom ActualType;
1071 int ActualFormat; 1375 int ActualFormat;
1072 unsigned char *data; 1376 unsigned char *data;
1073 unsigned long Size, RemainingBytes; 1377 unsigned long Size, RemainingBytes;
1074 1378
1075 XGetWindowProperty (display->display, display->root, 1379 XGetWindowProperty (disp, display->root,
1076 xa[XA_DNDSELECTION], 1380 xa[XA_DNDSELECTION],
1077 0L, 1000000L, 1381 0L, 1000000L,
1078 False, AnyPropertyType, 1382 False, AnyPropertyType,
1079 &ActualType, &ActualFormat, 1383 &ActualType, &ActualFormat,
1080 &Size, &RemainingBytes, 1384 &Size, &RemainingBytes,
1081 &data); 1385 &data);
1082 XChangeProperty (display->display, display->root, 1386 set_string_property (XA_CUT_BUFFER0, data);
1083 XA_CUT_BUFFER0, XA_STRING,
1084 8, PropModeReplace,
1085 data, STRLEN (data));
1086 XFree (data); 1387 XFree (data);
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1388 selection_paste (display->root, XA_CUT_BUFFER0, true);
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1389 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1089 } 1390 }
1090#endif /* OFFIX_DND */ 1391#endif /* OFFIX_DND */
1091 break; 1392 break;
1092 1393
1093 case MappingNotify: 1394 case MappingNotify:
… …
1118 break; 1419 break;
1119 } 1420 }
1120 break; 1421 break;
1121 1422
1122 case FocusIn: 1423 case FocusIn:
1123 if (!TermWin.focus) 1424 focus_in ();
1425 break;
1426
1427 case FocusOut:
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == parent[0])
1124 { 1433 {
1125 TermWin.focus = 1; 1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1435 ;
1127#ifdef USE_XIM 1436
1128 if (Input_Context != NULL) 1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1129 XSetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 { 1438 {
1138 PixColors = PixColorsFocused; 1439 seen_resize = 1;
1139 set_colorfgbg (); 1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1441 }
1143#endif
1144 1442
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1444 if (options & Opt_transparent)
1445 check_our_parents ();
1446#endif
1145 } 1447 }
1146 break; 1448 break;
1147 1449
1148 case FocusOut:
1149 if (TermWin.focus)
1150 {
1151 TermWin.focus = 0;
1152 want_refresh = 1;
1153#ifdef USE_XIM
1154 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context);
1156#endif
1157#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink)
1159 cursor_blink_ev.stop ();
1160 hidden_cursor = 0;
1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1171
1172 }
1173 break;
1174
1175 case ConfigureNotify: 1450 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1451 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1177 { 1452 && ev.xproperty.state == PropertyNewValue)
1178 int height, width; 1453 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1454
1180 do
1181 { /* Wrap lots of configures into one */
1182 width = ev.xconfigure.width;
1183 height = ev.xconfigure.height;
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187
1188 if (szHint.width != width || szHint.height != height)
1189 resize_all_windows (width, height, 1);
1190
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent)
1193 {
1194 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif
1199 }
1200 break; 1455 break;
1201 1456
1202 case SelectionClear: 1457 case SelectionClear:
1203 selection_clear (); 1458 selection_clear ();
1204 break; 1459 break;
1205 1460
1206 case SelectionNotify: 1461 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1462 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1463 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1464 break;
1211 1465
1212 case SelectionRequest: 1466 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1467 selection_send (ev.xselectionrequest);
1214 break; 1468 break;
1215 1469
1216 case UnmapNotify: 1470 case UnmapNotify:
1217 TermWin.mapped = 0; 1471 mapped = 0;
1218#ifdef TEXT_BLINK 1472#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1473 text_blink_ev.stop ();
1220#endif 1474#endif
1221 break; 1475 break;
1222 1476
1223 case MapNotify: 1477 case MapNotify:
1224 TermWin.mapped = 1; 1478 mapped = 1;
1225#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1226 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1227#endif 1481#endif
1228 break; 1482 break;
1229 1483
… …
1233 break; 1487 break;
1234#endif /* TRANSPARENT */ 1488#endif /* TRANSPARENT */
1235 1489
1236 case GraphicsExpose: 1490 case GraphicsExpose:
1237 case Expose: 1491 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1492 if (ev.xany.window == vt)
1239 { 1493 {
1240 do 1494 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1495 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1496 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1244 1498
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1500
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1250 1504
1251 scr_refresh (refresh_type); 1505 scr_refresh (refresh_type);
1252 } 1506 }
1253 else 1507 else
1254 { 1508 {
1255 XEvent unused_event; 1509 XEvent unused_event;
1256 1510
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1258 ; 1512 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1514 ;
1261 1515
1262 if (isScrollbarWindow (ev.xany.window)) 1516 if (isScrollbarWindow (ev.xany.window))
1263 { 1517 {
1264 scrollBar.setIdle (); 1518 scrollBar.setIdle ();
… …
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose (); 1523 menubar_expose ();
1270#endif 1524#endif
1271 1525
1272#ifdef TRANSPARENT 1526#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1527 if (am_transparent && ev.xany.window == parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1528 XClearWindow (disp, ev.xany.window);
1275#endif 1529#endif
1276 } 1530 }
1277 break; 1531 break;
1278 1532
1279 case MotionNotify: 1533 case MotionNotify:
… …
1286 { 1540 {
1287 menubar_control (ev.xbutton); 1541 menubar_control (ev.xbutton);
1288 break; 1542 break;
1289 } 1543 }
1290#endif 1544#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1292 break; 1546 break;
1293 1547
1294 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1295 { 1549 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1550 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1551 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1299 ; 1553 ;
1300 1554
1301 XQueryPointer (display->display, TermWin.vt, 1555 XQueryPointer (disp, vt,
1302 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1558 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1559 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1560#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1561 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1562 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1563 {
1310#endif 1564#endif
1565#if ISO_14755
1566 // 5.4
1567 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1568 {
1569 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1570 break;
1571 }
1572#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1573 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1574 ev.xbutton.state & Button3Mask ? 2 : 0);
1575
1313#ifdef SELECTION_SCROLLING 1576#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1577 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1578 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1579 {
1317 int dist; 1580 int dist;
1318 1581
1319 /* don't clobber the current delay if we are 1582 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1583 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1586 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1587
1325 /* save the event params so we can highlight 1588 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1589 * the selection in the pending-scroll loop
1327 */ 1590 */
1328 selection_save_x=ev.xbutton.x; 1591 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1592 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1593 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1594
1333 /* calc number of lines to scroll */ 1595 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1596 if (ev.xbutton.y < int_bwidth)
1335 { 1597 {
1336 scroll_selection_dir = UP; 1598 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1599 dist = int_bwidth - ev.xbutton.y;
1338 } 1600 }
1339 else 1601 else
1340 { 1602 {
1341 scroll_selection_dir = DN; 1603 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1604 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1605 }
1606
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1607 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1608 / SELECTION_SCROLL_LINE_SPEEDUP
1609 + 1;
1347 MIN_IT (scroll_selection_lines, 1610 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1611 SELECTION_SCROLL_MAX_LINES);
1349 } 1612 }
1350 else 1613 else
1351 { 1614 {
1352 /* we are within the text window, so we 1615 /* we are within the text window, so we
1353 * shouldn't be scrolling 1616 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1618 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1619 sel_scroll_ev.stop();
1357 } 1620 }
1358#endif 1621#endif
1359#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1360
1361 } 1623 }
1362#endif 1624#endif
1363
1364 } 1625 }
1365 } 1626 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1627 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1628 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1629 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1369 MotionNotify, &ev)) ; 1630 MotionNotify, &ev))
1631 ;
1632
1370 XQueryPointer (display->display, scrollBar.win, 1633 XQueryPointer (disp, scrollBar.win,
1371 &unused_root, &unused_child, 1634 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1635 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1636 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1637 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1638 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1639 scrollbar_size ());
1377 scr_refresh (refresh_type); 1640 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1641 refresh_limit = 0;
… …
1381 break; 1644 break;
1382 } 1645 }
1383} 1646}
1384 1647
1385void 1648void
1649rxvt_term::focus_in ()
1650{
1651 if (!focus)
1652 {
1653 focus = 1;
1654 want_refresh = 1;
1655#if USE_XIM
1656 if (Input_Context != NULL)
1657 {
1658 IMSetStatusPosition ();
1659 XSetICFocus (Input_Context);
1660 }
1661#endif
1662#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink)
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1665#endif
1666#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade])
1668 {
1669 pix_colors = pix_colors_focused;
1670 scr_recolour ();
1671 }
1672#endif
1673 }
1674}
1675
1676void
1677rxvt_term::focus_out ()
1678{
1679 if (focus)
1680 {
1681 focus = 0;
1682 want_refresh = 1;
1683
1684#if ENABLE_FRILLS || ISO_14755
1685 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY
1688 scr_overlay_off ();
1689#endif
1690#if USE_XIM
1691 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context);
1693#endif
1694#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink)
1696 cursor_blink_ev.stop ();
1697 hidden_cursor = 0;
1698#endif
1699#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade])
1701 {
1702 pix_colors = pix_colors_unfocused;
1703 scr_recolour ();
1704 }
1705#endif
1706 }
1707}
1708
1709#if TRANSPARENT
1710void
1386rxvt_term::rootwin_cb (XEvent &ev) 1711rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1712{
1388 SET_R (this); 1713 SET_R (this);
1389 SET_LOCALE (locale); 1714 SET_LOCALE (locale);
1390 1715
1391 switch (ev.type) 1716 switch (ev.type)
1392 { 1717 {
1393 case PropertyNotify: 1718 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1719 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1720 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on. 1721 * use the property to determine the pixmap. We use it later on.
1406 */ 1722 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1723 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1725 return;
1412 }
1413 1726
1414 /* FALLTHROUGH */ 1727 /* FALLTHROUGH */
1415 case ReparentNotify: 1728 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1730 want_refresh = want_full_refresh = 1;
1418 break; 1731 break;
1419#endif
1420 } 1732 }
1421} 1733}
1734#endif
1422 1735
1423void 1736void
1424rxvt_term::button_press (XButtonEvent &ev) 1737rxvt_term::button_press (XButtonEvent &ev)
1425{ 1738{
1426 int reportmode = 0, clickintime; 1739 int reportmode = 0, clickintime;
1427 1740
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1741 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1429 if (!bypass_keystate) 1742 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1743 reportmode = !! (priv_modes & PrivMode_mouse_report);
1744
1431 /* 1745 /*
1432 * VT window processing of button press 1746 * VT window processing of button press
1433 */ 1747 */
1434 if (ev.window == TermWin.vt) 1748 if (ev.window == vt)
1435 { 1749 {
1750#if ISO_14755
1751 // 5.4
1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1753 {
1754 iso14755_54 (ev.x, ev.y);
1755 return;
1756 }
1757#endif
1758
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1759 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1760
1437 if (reportmode) 1761 if (reportmode)
1438 { 1762 {
1439 /* mouse report from vt window */ 1763 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1764 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1765 MEvent.state = ev.state;
… …
1470 } 1794 }
1471 else 1795 else
1472 { 1796 {
1473 if (ev.button != MEvent.button) 1797 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1798 MEvent.clicks = 0;
1799
1475 switch (ev.button) 1800 switch (ev.button)
1476 { 1801 {
1477 case Button1: 1802 case Button1:
1803 /* allow meta + click to select rectangular areas */
1804 /* should be done in screen.C */
1805#if ENABLE_FRILLS
1806 selection.rect = !!(ev.state & ModMetaMask);
1807#else
1808 selection.rect = false;
1809#endif
1810
1478 /* allow shift+left click to extend selection */ 1811 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1812 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1480 { 1813 {
1481 if (MEvent.button == Button1 && clickintime) 1814 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1815 selection_rotate (ev.x, ev.y);
1483 else 1816 else
1484 selection_extend (ev.x, ev.y, 1); 1817 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1832 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1833 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1834 selection_rotate (ev.x, ev.y);
1502 else 1835 else
1503 selection_extend (ev.x, ev.y, 1); 1836 selection_extend (ev.x, ev.y, 1);
1837
1504 MEvent.button = Button3; 1838 MEvent.button = Button3;
1505 break; 1839 break;
1506 } 1840 }
1507 } 1841 }
1842
1508 MEvent.time = ev.time; 1843 MEvent.time = ev.time;
1509 return; 1844 return;
1510 } 1845 }
1511 1846
1512 /* 1847 /*
… …
1623 case Button3: 1958 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 1959 if (scrollBar.style != R_SB_XTERM)
1625 { 1960 {
1626 if (scrollbar_above_slider (ev.y)) 1961 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 1962# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 1963 scr_page (UP, nrow - 1);
1629# else 1964# else
1630 scr_page (UP, TermWin.nrow / 4); 1965 scr_page (UP, nrow / 4);
1631# endif 1966# endif
1632 else if (scrollbar_below_slider (ev.y)) 1967 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 1968# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 1969 scr_page (DN, nrow - 1);
1635# else 1970# else
1636 scr_page (DN, TermWin.nrow / 4); 1971 scr_page (DN, nrow / 4);
1637# endif 1972# endif
1638 else 1973 else
1639 scrollBar.setMotion (); 1974 scrollBar.setMotion ();
1640 } 1975 }
1641 else 1976 else
1642 { 1977 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 1978 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1979 (nrow
1645 * scrollbar_position (ev.y) 1980 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1981 / scrollbar_size ()));
1647 } 1982 }
1648 1983
1649 break; 1984 break;
… …
1665{ 2000{
1666 int reportmode = 0; 2001 int reportmode = 0;
1667 2002
1668 csrO = 0; /* reset csr Offset */ 2003 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2004 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2005 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2006
1672 if (scrollbar_isUpDn ()) 2007 if (scrollbar_isUpDn ())
1673 { 2008 {
1674 scrollBar.setIdle (); 2009 scrollBar.setIdle ();
1675 scrollbar_show (0); 2010 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH; 2012 refresh_type &= ~SMOOTH_REFRESH;
1678#endif 2013#endif
1679
1680 } 2014 }
2015
1681#ifdef SELECTION_SCROLLING 2016#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2017 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2018 sel_scroll_ev.stop();
1684#endif 2019#endif
2020
1685 if (ev.window == TermWin.vt) 2021 if (ev.window == vt)
1686 { 2022 {
2023#if ISO_14755
2024 // 5.4
2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2026 return;
2027#endif
1687 if (reportmode) 2028 if (reportmode)
1688 { 2029 {
1689 /* mouse report from vt window */ 2030 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2031 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2032 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2046 MEvent.button = AnyButton;
1706 mouse_report (ev); 2047 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2048#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2049 return;
1709 } 2050 }
2051
1710 /* 2052 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2053 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2054 * when overriding mouse reporting
1713 */ 2055 */
1714 if (PrivateModes & PrivMode_mouse_report 2056 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2057 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2058 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2059 selection_extend (ev.x, ev.y, 0);
1718 2060
1719 switch (ev.button) 2061 switch (ev.button)
… …
1734 2076
1735 v = ev.button == Button4 ? UP : DN; 2077 v = ev.button == Button4 ? UP : DN;
1736 2078
1737 if (ev.state & ShiftMask) 2079 if (ev.state & ShiftMask)
1738 i = 1; 2080 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2081 else if (options & Opt_mouseWheelScrollPage)
1740 i = TermWin.nrow - 1; 2082 i = nrow - 1;
1741 else 2083 else
1742 i = 5; 2084 i = 5;
1743 2085
1744# ifdef MOUSE_SLIP_WHEELING 2086# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2087 if (ev.state & ControlMask)
1746 { 2088 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2089 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2090 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1749 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2092
1751 if (slip_wheel_ev.at < NOW) 2093 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2095
1754 slip_wheel_ev.start (); 2096 slip_wheel_ev.start ();
… …
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2137 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2138 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2139 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2140 int i;
1799 2141
1800 Visual* visual = display->visual; 2142 Visual *visual = display->visual;
1801 2143
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2144 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2145
1804 /* for convenience */ 2146 /* for convenience */
1805 mask_r = visual->red_mask; 2147 mask_r = visual->red_mask;
… …
2026 Atom atype; 2368 Atom atype;
2027 unsigned char *prop = NULL; 2369 unsigned char *prop = NULL;
2028 Window root, oldp, *list; 2370 Window root, oldp, *list;
2029 Pixmap rootpixmap = None; 2371 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2372 XWindowAttributes wattr, wrootattr;
2373 dDisp;
2031 2374
2032 pchanged = 0; 2375 pchanged = 0;
2033 2376
2034 if (!(Options & Opt_transparent)) 2377 if (!(options & Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2378 return pchanged; /* Don't try any more */
2036 2379
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2381 rootdepth = wrootattr.depth;
2039 2382
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2383 XGetWindowAttributes (disp, parent[0], &wattr);
2041 2384
2042 if (rootdepth != wattr.depth) 2385 if (rootdepth != wattr.depth)
2043 { 2386 {
2044 if (am_transparent) 2387 if (am_transparent)
2045 { 2388 {
2046 pchanged = 1; 2389 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2391 am_transparent = am_pixmap_trans = 0;
2049 } 2392 }
2050 2393
2051 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2052 } 2395 }
2053 2396
2054 /* Get all X ops out of the queue so that our information is up-to-date. */ 2397 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False); 2398 XSync (disp, False);
2056 2399
2057 /* 2400 /*
2058 * Make the frame window set by the window manager have 2401 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2402 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that. 2403 * windows for each client, so we have to take care about that.
2061 */ 2404 */
2062 i = (xa[XA_XROOTPMAPID] 2405 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2406 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2407 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2408 &nitems, &bytes_after, &prop) == Success);
2066 2409
2067 if (!i || prop == NULL) 2410 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2411 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2412 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2413 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2414 &nitems, &bytes_after, &prop) == Success);
2072 2415
2073 if (!i || prop == NULL 2416 if (!i || prop == NULL
2074#if TINTING 2417#if TINTING
… …
2093 Window cr; 2436 Window cr;
2094 XImage *image; 2437 XImage *image;
2095 GC gc; 2438 GC gc;
2096 XGCValues gcvalue; 2439 XGCValues gcvalue;
2097 2440
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2441 XTranslateCoordinates (disp, parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2442 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2443 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2444 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2445 nx = ny = 0;
2103 2446
… …
2113 nh += sy; 2456 nh += sy;
2114 ny = -sy; 2457 ny = -sy;
2115 sy = 0; 2458 sy = 0;
2116 } 2459 }
2117 2460
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2463
2464 XSync (disp, False);
2120 allowedxerror = -1; 2465 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2467
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2468 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2469 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2470 allowedxerror = 0;
2126 2471
2127 if (image == NULL) 2472 if (image == NULL)
2128 { 2473 {
2129 if (am_transparent && am_pixmap_trans) 2474 if (am_transparent && am_pixmap_trans)
2130 { 2475 {
2131 pchanged = 1; 2476 pchanged = 1;
2132 if (TermWin.pixmap != None) 2477 if (pixmap != None)
2133 { 2478 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2479 XFreePixmap (disp, pixmap);
2135 TermWin.pixmap = None; 2480 pixmap = None;
2136 } 2481 }
2137 } 2482 }
2138 2483
2139 am_pixmap_trans = 0; 2484 am_pixmap_trans = 0;
2140 } 2485 }
2141 else 2486 else
2142 { 2487 {
2143 if (TermWin.pixmap != None) 2488 if (pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2489 XFreePixmap (disp, pixmap);
2145 2490
2146#if TINTING 2491#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2492 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2493 {
2149 unsigned short rm, gm, bm; 2494 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2495 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2496
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2497 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2153 2498
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2499 ShadeXImage (display, image, shade, rm, gm, bm);
2155 } 2500 }
2156#endif 2501#endif
2157 2502
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2503 pixmap = XCreatePixmap (disp, vt,
2159 szHint.width, szHint.height, image->depth); 2504 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2507 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2508 XFreeGC (disp, gc);
2164 XDestroyImage (image); 2509 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2511 XClearWindow (disp, parent[0]);
2167 2512
2168 if (!am_transparent || !am_pixmap_trans) 2513 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2514 pchanged = 1;
2170 2515
2171 am_transparent = am_pixmap_trans = 1; 2516 am_transparent = am_pixmap_trans = 1;
2172 } 2517 }
2173 } 2518 }
2174 2519
2175 if (!am_pixmap_trans) 2520 if (am_pixmap_trans)
2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2522 else
2176 { 2523 {
2177 unsigned int n; 2524 unsigned int n;
2178 /* 2525 /*
2179 * InheritPixmap transparency 2526 * InheritPixmap transparency
2180 */ 2527 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2183 { 2529 {
2184 oldp = TermWin.parent[i]; 2530 oldp = parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2531 XQueryTree (disp, parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n); 2532 &parent[i], &list, &n);
2187 XFree (list); 2533 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2534
2190 if (TermWin.parent[i] == display->root) 2535 if (parent[i] == display->root)
2191 { 2536 {
2192 if (oldp != None) 2537 if (oldp != None)
2193 pchanged = 1; 2538 pchanged = 1;
2194 2539
2195 break; 2540 break;
2196 } 2541 }
2197 2542
2198 if (oldp != TermWin.parent[i]) 2543 if (oldp != parent[i])
2199 pchanged = 1; 2544 pchanged = 1;
2200 } 2545 }
2201 2546
2202 n = 0; 2547 n = 0;
2203 2548
2204 if (pchanged) 2549 if (pchanged)
2205 { 2550 {
2206 for (; n < (unsigned int)i; n++) 2551 for (; n < (unsigned int)i; n++)
2207 { 2552 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2553 XGetWindowAttributes (disp, parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2555 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2213 break; 2557 break;
2214 } 2558 }
2215 } 2559 }
2216 } 2560 }
2217 2561
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2219 { 2563 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2566 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2567 /* XXX: also turn off Opt_transparent? */
2225 } 2568 }
2226 else 2569 else
2227 { 2570 {
2228#if WAIT_FOR_WM 2571#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing 2572 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */ 2573 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1); 2574 sleep (1);
2232#endif 2575#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2576 for (n = 0; n < (unsigned int)i; n++)
2235 { 2577 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2579 XClearWindow (disp, parent[n]);
2238 } 2580 }
2239 2581
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2241 am_transparent = 1; 2583 am_transparent = 1;
2242 } 2584 }
2243 2585
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2587 parent[i] = None;
2246 } 2588 }
2247 2589
2248 // this is experimental
2249 if (scrollBar.win) 2590 if (scrollBar.win)
2250 { 2591 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2593 scrollBar.setIdle ();
2254 scrollbar_show (0); 2594 scrollbar_show (0);
2595 }
2596
2597 if (am_transparent)
2598 {
2599 want_refresh = want_full_refresh = 1;
2600 if (am_pixmap_trans)
2601 flush ();
2255 } 2602 }
2256 2603
2257 return pchanged; 2604 return pchanged;
2258} 2605}
2259#endif 2606#endif
… …
2278 if (ch == NOCHAR) // TODO: improve 2625 if (ch == NOCHAR) // TODO: improve
2279 break; 2626 break;
2280 2627
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2628 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2629 {
2630 if (!seen_input)
2631 {
2632 seen_input = 1;
2633 // many badly-written programs (e.g. jed) contain a race condition:
2634 // they first read the screensize and then install a SIGWINCH handler.
2635 // some window managers resize the window early, and these programs
2636 // then sometimes get the size wrong.
2637 // unfortunately other programs are even more buggy and dislike
2638 // being sent SIGWINCH, so only do it when we were in fact being
2639 // resized.
2640 if (seen_resize && cmd_pid)
2641 kill (-cmd_pid, SIGWINCH);
2642 }
2643
2283 /* Read a text string from the input buffer */ 2644 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2645 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2646 bool refreshnow = false;
2286 int nlines = 0; 2647 int nlines = 0;
2287 unicode_t *str = buf; 2648 unicode_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ);
2288 2650
2289 for (;;) 2651 for (;;)
2290 { 2652 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break; 2654 break;
2293 2655
2294 *str++ = ch; 2656 *str++ = ch;
2295 2657
2296 if (ch == C0_LF) 2658 if (ch == C0_LF || str >= eol)
2297 { 2659 {
2660 if (ch == C0_LF)
2298 nlines++; 2661 nlines++;
2662
2299 refresh_count++; 2663 refresh_count++;
2300 2664
2301 if (!(Options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2303 { 2667 {
2304 refreshnow = true; 2668 refreshnow = true;
2305 ch = NOCHAR; 2669 ch = NOCHAR;
2306 break; 2670 break;
2307 } 2671 }
2308 2672
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2673 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= nrow - 1)
2311 { 2675 {
2312 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2313 nlines = 0; 2677 nlines = 0;
2314 str = buf; 2678 str = buf;
2679 eol = str + min (ncol, UBUFSIZ);
2315 } 2680 }
2316 }
2317 2681
2318 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2319 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2320 ch = NOCHAR; 2686 ch = NOCHAR;
2321 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + ncol, buf + UBUFSIZ);
2691 }
2692
2322 } 2693 }
2323 2694
2324 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2696 ch = next_char ();
2326 } 2697 }
… …
2333 * the number of pages between refreshes is refresh_limit, which 2704 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2705 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2706 */
2336 if (refreshnow) 2707 if (refreshnow)
2337 { 2708 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2710 refresh_limit++;
2340 else 2711 else
2341 { 2712 {
2342 flag = true; 2713 flag = true;
2343 scr_refresh (refresh_type); 2714 scr_refresh (refresh_type);
… …
2397 if (len == (size_t)-1) 2768 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2770
2400 // assume wchar == unicode 2771 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2772 cmdbuf_ptr += len;
2402 return wc; 2773 return wc & UNICODE_MASK;
2403 } 2774 }
2404 2775
2405 return NOCHAR; 2776 return NOCHAR;
2406} 2777}
2407 2778
… …
2533 process_escape_seq (); 2904 process_escape_seq ();
2534 break; 2905 break;
2535 case C0_ENQ: /* terminal Status */ 2906 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2907 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2539 else 2910 else
2540 tt_write ((unsigned char *)VT100_ANS, 2911 tt_write ((unsigned char *)VT100_ANS,
2541 (unsigned int)STRLEN (VT100_ANS)); 2912 (unsigned int)strlen (VT100_ANS));
2542 break; 2913 break;
2543 case C0_BEL: /* bell */ 2914 case C0_BEL: /* bell */
2544 scr_bell (); 2915 scr_bell ();
2545 break; 2916 break;
2546 case C0_BS: /* backspace */ 2917 case C0_BS: /* backspace */
… …
2645void 3016void
2646rxvt_term::process_escape_seq () 3017rxvt_term::process_escape_seq ()
2647{ 3018{
2648 unicode_t ch = cmd_getc (); 3019 unicode_t ch = cmd_getc ();
2649 3020
2650 if (PrivateModes & PrivMode_vt52) 3021 if (priv_modes & PrivMode_vt52)
2651 { 3022 {
2652 process_escape_vt52 (ch); 3023 process_escape_vt52 (ch);
2653 return; 3024 return;
2654 } 3025 }
2655 3026
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 3041 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 3042 break;
2672 case '+': 3043 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 3044 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3045 break;
2675#ifndef NO_FRILLS 3046#if ENABLE_FRILLS
2676 case '6': 3047 case '6':
2677 scr_backindex (); 3048 scr_backindex ();
2678 break; 3049 break;
2679#endif 3050#endif
2680 case '7': 3051 case '7':
2681 scr_cursor (SAVE); 3052 scr_cursor (SAVE);
2682 break; 3053 break;
2683 case '8': 3054 case '8':
2684 scr_cursor (RESTORE); 3055 scr_cursor (RESTORE);
2685 break; 3056 break;
2686#ifndef NO_FRILLS 3057#if ENABLE_FRILLS
2687 case '9': 3058 case '9':
2688 scr_forwardindex (); 3059 scr_forwardindex ();
2689 break; 3060 break;
2690#endif 3061#endif
2691 case '=': 3062 case '=':
… …
2870 { 3241 {
2871 switch (priv) 3242 switch (priv)
2872 { 3243 {
2873 case '>': 3244 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 3245 if (ch == CSI_DA) /* secondary device attributes */
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2876 break; 3247 break;
2877 case '?': 3248 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 3250 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 3251 break;
… …
2985 3356
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 3358 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 3359 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 3362 break;
2992 3363
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3365 tt_write ((const unsigned char *)VT100_ANS,
2995 (unsigned int) (sizeof (VT100_ANS) - 1)); 3366 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3367 break;
2997 3368
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3370 process_sgr_mode (nargs, arg);
3000 break; 3371 break;
… …
3007 break; 3378 break;
3008 case 6: /* CPR requested */ 3379 case 6: /* CPR requested */
3009 scr_report_position (); 3380 scr_report_position ();
3010 break; 3381 break;
3011 case 7: /* unofficial extension */ 3382 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3383 if (options & Opt_insecure)
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3384 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3385 break;
3015 case 8: /* unofficial extension */ 3386 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3388 break;
3018 } 3389 }
… …
3054 break; 3425 break;
3055 3426
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3427 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3428 if (arg[0] == 4)
3058 scr_insert_mode (0); 3429 scr_insert_mode (0);
3430 else if (arg[0] == 20)
3431 priv_modes &= ~PrivMode_LFNL;
3059 break; 3432 break;
3060 3433
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3434 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3435 if (arg[0] == 4)
3063 scr_insert_mode (1); 3436 scr_insert_mode (1);
3437 else if (arg[0] == 20)
3438 priv_modes |= PrivMode_LFNL;
3064 break; 3439 break;
3065 3440
3066 /* 3441 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3442 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3443 */
… …
3080 break; 3455 break;
3081 case CSI_75: 3456 case CSI_75:
3082 scr_cursor (RESTORE); 3457 scr_cursor (RESTORE);
3083 break; 3458 break;
3084 3459
3085#ifndef NO_FRILLS 3460#if ENABLE_FRILLS
3086 case CSI_74: 3461 case CSI_74:
3087 process_window_ops (arg, nargs); 3462 process_window_ops (arg, nargs);
3088 break; 3463 break;
3089#endif 3464#endif
3090 3465
… …
3097 break; 3472 break;
3098 } 3473 }
3099} 3474}
3100/*}}} */ 3475/*}}} */
3101 3476
3102#ifndef NO_FRILLS 3477#if ENABLE_FRILLS
3103/* ARGSUSED */ 3478/* ARGSUSED */
3104void 3479void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3480rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3481{
3107 int x, y; 3482 int x, y;
3108 XWindowAttributes wattr; 3483 XWindowAttributes wattr;
3109 Window wdummy; 3484 Window wdummy;
3485 dDisp;
3110 3486
3111 if (nargs == 0) 3487 if (nargs == 0)
3112 return; 3488 return;
3113 3489
3114 switch (args[0]) 3490 switch (args[0])
3115 { 3491 {
3116 /* 3492 /*
3117 * commands 3493 * commands
3118 */ 3494 */
3119 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3496 XMapWindow (disp, parent[0]);
3121 break; 3497 break;
3122 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3499 XIconifyWindow (disp, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3500 break;
3126 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, parent[0], args[1], args[2]);
3128 break; 3503 break;
3129 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3506 break;
3132 case 5: /* raise window */ 3507 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3508 XRaiseWindow (disp, parent[0]);
3134 break; 3509 break;
3135 case 6: /* lower window */ 3510 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3511 XLowerWindow (disp, parent[0]);
3137 break; 3512 break;
3138 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3139 scr_touch (true); 3514 scr_touch (true);
3140 break; 3515 break;
3141 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3517 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3518 (unsigned int) (args[1] * fheight));
3144 break; 3519 break;
3145 3520
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3521 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3522 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3523 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3524 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3525 (unsigned int) (args[1] * fheight));
3151 break; 3526 break;
3152 3527
3153 3528
3154 /* 3529 /*
3155 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3156 */ 3531 */
3157 case 11: /* report window state */ 3532 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3535 break;
3161 case 13: /* report window position */ 3536 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3542 break;
3168 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3546 break;
3172 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3549 break;
3175 case 19: /* report window size (chars) */ 3550 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3552 break;
3178 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3554 {
3181 char *s; 3555 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3556 XGetIconName (disp, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s);
3184 } 3559 }
3185 break; 3560 break;
3186 case 21: /* report window title */ 3561 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3562 {
3189 char *s; 3563 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3564 XFetchName (disp, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s);
3192 } 3567 }
3193 break; 3568 break;
3194 } 3569 }
3195} 3570}
3196#endif 3571#endif
3197 3572
… …
3201 * ends_how is terminator used. returned input must be free()'d 3576 * ends_how is terminator used. returned input must be free()'d
3202 */ 3577 */
3203unsigned char * 3578unsigned char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3579rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3580{
3206 unicode_t prev = 0, ch; 3581 unicode_t ch;
3582 bool seen_esc = false;
3207 unsigned int n = 0; 3583 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3584 wchar_t string[STRING_MAX];
3210 3585
3211 while ((ch = cmd_getc ()) != NOCHAR) 3586 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3587 {
3213 if (prev == C0_ESC) 3588 if (seen_esc)
3214 { 3589 {
3215 if (ch == 0x5c) /* 7bit ST */ 3590 if (ch == 0x5c) /* 7bit ST */
3216 break; 3591 break;
3217 else 3592 else
3218 return NULL; 3593 return NULL;
3219 } 3594 }
3595 else if (ch == C0_ESC)
3596 {
3597 seen_esc = true;
3598 continue;
3599 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3600 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3601 break;
3222 else if (ch < 0x20) 3602 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3224 3604
3225 if (n >= sizeof (string) - 1) 3605 seen_esc = false;
3606
3607 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3608 // stop at some sane length
3227 return NULL; 3609 return NULL;
3228 3610
3229 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3613 else
3235 string[n++] = prev = ch; 3614 string[n++] = ch;
3236 } 3615 }
3237 3616
3238 string[n++] = '\0'; 3617 string[n++] = '\0';
3239 3618
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3619 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3620
3245 return s; 3621 return (unsigned char *)rxvt_wcstombs (string);
3246} 3622}
3247 3623
3248/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3249/* 3625/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3294void 3670void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{ 3672{
3297 if (str[0] == '?' && !str[1]) 3673 if (str[0] == '?' && !str[1])
3298 { 3674 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b; 3675 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b); 3676 pix_colors_focused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3677 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 } 3678 }
3306 else 3679 else
3307 set_window_color (color, str); 3680 set_window_color (color, str);
3308} 3681}
3309 3682
3310/* 3683/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3312 * 0 = change iconName/title
3313 * 1 = change iconName
3314 * 2 = change title
3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3318 * 12 = change text color
3319 * 13 = change mouse foreground color
3320 * 17 = change highlight character colour
3321 * 18 = change bold character color
3322 * 19 = change underlined character color
3323 * 46 = change logfile (not implemented)
3324 * 50 = change font
3325 *
3326 * rxvt extensions:
3327 * 20 = bg pixmap
3328 * 39 = change default fg color
3329 * 49 = change default bg color
3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3334 */ 3685 */
3335void 3686void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3337{ 3688{
3338 int changed = 0; 3689 int changed = 0;
3339 int color; 3690 int color;
3340 char *buf, *name; 3691 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3692 bool query = str[0] == '?' && !str[1];
3693 int saveop = op;
3694 dDisp;
3342 3695
3343 assert (str != NULL); 3696 assert (str != NULL);
3344 switch (op) 3697 switch (op)
3345 { 3698 {
3346 case XTerm_name: 3699 case XTerm_name:
… …
3353 set_title (str); 3706 set_title (str);
3354 break; 3707 break;
3355 case XTerm_property: 3708 case XTerm_property:
3356 if (str[0] == '?') 3709 if (str[0] == '?')
3357 { 3710 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3711 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3712 Atom actual_type;
3360 int actual_format; 3713 int actual_format;
3361 unsigned long nitems; 3714 unsigned long nitems;
3362 unsigned long bytes_after; 3715 unsigned long bytes_after;
3363 unsigned char *value = 0; 3716 unsigned char *value = 0;
3364 const char *str = ""; 3717 const char *str = "";
3365 3718
3366 if (prop 3719 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3720 && XGetWindowProperty (disp, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3724 && actual_type != None
3372 && actual_format == 8) 3725 && actual_format == 8)
… …
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3734 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3735
3383 if (eq) 3736 if (eq)
3384 { 3737 {
3385 *eq = 0; 3738 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3739 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3740 }
3391 else 3741 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3742 XDeleteProperty (disp, parent[0],
3393 display->atom (str)); 3743 display->atom (str));
3394 } 3744 }
3395 break; 3745 break;
3396 3746
3397 case XTerm_Color: 3747 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3748 for (buf = (char *)str; buf && *buf;)
3399 { 3749 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3750 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3751 break;
3402 3752
3403 *name++ = '\0'; 3753 *name++ = '\0';
3404 color = atoi (buf); 3754 color = atoi (buf);
3405 3755
3406 if (color < 0 || color >= TOTAL_COLORS) 3756 if (color < 0 || color >= TOTAL_COLORS)
3407 break; 3757 break;
3408 3758
3409 if ((buf = STRCHR (name, ';')) != NULL) 3759 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3760 *buf++ = '\0';
3411 3761
3412 if (name[0] == '?' && !name[1]) 3762 if (name[0] == '?' && !name[1])
3413 { 3763 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b; 3764 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3765 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3766 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 } 3767 }
3421 else 3768 else
3422 set_window_color (color + minCOLOR, name); 3769 set_window_color (color + minCOLOR, name);
3423 } 3770 }
3424 break; 3771 break;
… …
3446 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break; 3795 break;
3449 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3802#endif
3803#if TRANSPARENT && TINTING
3804 case URxvt_Color_tint:
3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3806 check_our_parents ();
3807 if (am_transparent)
3808 want_full_refresh = want_refresh = 1;
3451 break; 3809 break;
3452#endif 3810#endif
3453 3811
3454 case XTerm_Pixmap: 3812 case XTerm_Pixmap:
3455 if (*str != ';') 3813 if (*str != ';')
… …
3458 scale_pixmap (""); /* reset to default scaling */ 3816 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3817 set_bgPixmap (str); /* change pixmap */
3460#endif 3818#endif
3461 scr_touch (true); 3819 scr_touch (true);
3462 } 3820 }
3463 while ((str = STRCHR (str, ';')) != NULL) 3821 while ((str = strchr (str, ';')) != NULL)
3464 { 3822 {
3465 str++; 3823 str++;
3466#if XPM_BACKGROUND 3824#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3825 changed += scale_pixmap (str);
3468#endif 3826#endif
3469
3470 } 3827 }
3828
3471 if (changed) 3829 if (changed)
3472 { 3830 {
3473#ifdef XPM_BACKGROUND 3831#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3832 resize_pixmap ();
3475#endif 3833#endif
… …
3486 3844
3487 case XTerm_logfile: 3845 case XTerm_logfile:
3488 // TODO, when secure mode? 3846 // TODO, when secure mode?
3489 break; 3847 break;
3490 3848
3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR 3849#ifdef MENUBAR
3532 case XTerm_Menu: 3850 case URxvt_Menu:
3533 if (Options & Opt_insecure) 3851 if (options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break; 3853 break;
3536#endif 3854#endif
3537#if 0 3855#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3856 case XTerm_dumpscreen: /* no error notices */
… …
3542 { 3860 {
3543 scr_dump (fd); 3861 scr_dump (fd);
3544 close (fd); 3862 close (fd);
3545 } 3863 }
3546 } 3864 }
3865 break;
3866#endif
3867 case XTerm_font:
3868 op = URxvt_font;
3869 case URxvt_font:
3870#if ENABLE_STYLES
3871 case URxvt_boldFont:
3872 case URxvt_italicFont:
3873 case URxvt_boldItalicFont:
3874#endif
3875 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp);
3880 else
3881 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)];
3883
3884 res = strdup (str);
3885 allocated.push_back ((void *)res);
3886 set_fonts ();
3887 }
3888 break;
3889
3890#if ENABLE_FRILLS
3891 case URxvt_locale:
3892 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3894 else
3895 {
3896 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8);
3898 init_xlocale ();
3899 }
3900 break;
3901
3902 case URxvt_view_up:
3903 case URxvt_view_down:
3904 int lines = atoi (str);
3905
3906 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else
3909 {
3910 scr_erase_savelines ();
3911 }
3912
3547 break; 3913 break;
3548#endif 3914#endif
3549 } 3915 }
3550} 3916}
3551/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/
… …
3565{ 3931{
3566 int state; 3932 int state;
3567 3933
3568 if (mode == 's') 3934 if (mode == 's')
3569 { 3935 {
3570 SavedModes |= (PrivateModes & bit); 3936 SavedModes |= (priv_modes & bit);
3571 return -1; 3937 return -1;
3572 } 3938 }
3573 else 3939 else
3574 { 3940 {
3575 if (mode == 'r') 3941 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3942 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3943 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3944 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3945 PrivMode (state, bit);
3580 } 3946 }
3581 3947
3582 return state; 3948 return state;
3583} 3949}
… …
3601 { 3, PrivMode_132 }, 3967 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3968 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3969 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3970 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3971 { 7, PrivMode_Autowrap },
3972 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3973 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3974#ifdef menuBar_esc
3608 { menuBar_esc, PrivMode_menuBar }, 3975 { menuBar_esc, PrivMode_menuBar },
3609#endif 3976#endif
3977 // 18, 19 printing-related
3978 { 25, PrivMode_VisibleCursor },
3610#ifdef scrollBar_esc 3979#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3980 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3981#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3982 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3983 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3984 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3985 // 45 margin bell NYI
3620 // 46 start logging 3986 // 46 start logging
… …
3661 4027
3662 /* extra handling for values with state unkept */ 4028 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4029 switch (arg[i])
3664 { 4030 {
3665 case 1048: /* alternative cursor save */ 4031 case 1048: /* alternative cursor save */
4032 case 1049:
3666 if (Options & Opt_secondaryScreen) 4033 if (options & Opt_secondaryScreen)
3667 if (mode == 0) 4034 if (mode == 0)
3668 scr_cursor (RESTORE); 4035 scr_cursor (RESTORE);
3669 else if (mode == 1) 4036 else if (mode == 1)
3670 scr_cursor (SAVE); 4037 scr_cursor (SAVE);
3671 break; 4038 break;
… …
3682 * within VT52 mode 4049 * within VT52 mode
3683 */ 4050 */
3684 PrivMode (1, PrivMode_vt52); 4051 PrivMode (1, PrivMode_vt52);
3685 break; 4052 break;
3686 case 3: /* 80/132 */ 4053 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4054 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4055 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 4056 break;
3690 case 4: /* smooth scrolling */ 4057 case 4: /* smooth scrolling */
3691 if (state) 4058 if (state)
3692 Options &= ~Opt_jumpScroll; 4059 options &= ~Opt_jumpScroll;
3693 else 4060 else
3694 Options |= Opt_jumpScroll; 4061 options |= Opt_jumpScroll;
3695 break; 4062 break;
3696 case 5: /* reverse video */ 4063 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4064 scr_rvideo_mode (state);
3698 break; 4065 break;
3699 case 6: /* relative/absolute origins */ 4066 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4070 scr_autowrap (state);
3704 break; 4071 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4072 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4073 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4074 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4075 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4076 break;
3710#ifdef menuBar_esc 4077#ifdef menuBar_esc
3711 case menuBar_esc: 4078 case menuBar_esc:
3712#ifdef MENUBAR 4079#ifdef MENUBAR
3713 map_menuBar (state); 4080 map_menuBar (state);
… …
3733 break; 4100 break;
3734 /* case 66: - application key pad */ 4101 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4102 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4103 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4104 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4105 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4106 break;
3740#if 0 4107#if 0
3741 case 1001: 4108 case 1001:
3742 break; /* X11 mouse highlighting */ 4109 break; /* X11 mouse highlighting */
3743#endif 4110#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4111 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state) 4112 if (state)
3746 Options &= ~Opt_scrollTtyOutput; 4113 options &= ~Opt_scrollTtyOutput;
3747 else 4114 else
3748 Options |= Opt_scrollTtyOutput; 4115 options |= Opt_scrollTtyOutput;
3749 break; 4116 break;
3750 case 1011: /* scroll to bottom on key press */ 4117 case 1011: /* scroll to bottom on key press */
3751 if (state) 4118 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4119 options |= Opt_scrollTtyKeypress;
3753 else 4120 else
3754 Options &= ~Opt_scrollTtyKeypress; 4121 options &= ~Opt_scrollTtyKeypress;
3755 break; 4122 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4123 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4124 if (options & Opt_secondaryScreen)
3758 if (current_screen != PRIMARY) 4125 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4126 scr_erase_screen (2);
3760 scr_change_screen (state); 4127 scr_change_screen (state);
3761 break; 4128 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4129 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4130 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4131 if (options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY) 4132 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4133 scr_erase_screen (2);
3767 break; 4134 break;
3768 default: 4135 default:
3769 break; 4136 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4162 rendset = 0, rendstyle = ~RS_None;
3796 break; 4163 break;
3797 case 1: 4164 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4165 rendset = 1, rendstyle = RS_Bold;
3799 break; 4166 break;
3800 //case 2: // faint or second colour 4167 //case 2: // low intensity
4168 case 3:
4169 rendset = 1, rendstyle = RS_Italic;
4170 break;
3801 case 4: 4171 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4172 rendset = 1, rendstyle = RS_Uline;
3803 break; 4173 break;
3804 case 5: // slowly blinking 4174 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4175 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4187 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4188 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4189 //...
3820 //case 19: // ninth alt font 4190 //case 19: // ninth alt font
3821 //case 20: // gothic 4191 //case 20: // gothic
3822 case 21: // disable bold, faint 4192 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4193 rendset = 0, rendstyle = RS_Bold;
3824 break; 4194 break;
3825 case 22: 4195 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4196 rendset = 0, rendstyle = RS_Bold;
3827 break; 4197 break;
3828 //case 23: disable italic 4198 case 23: // disable italic
4199 rendset = 0, rendstyle = RS_Italic;
4200 break;
3829 case 24: 4201 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4202 rendset = 0, rendstyle = RS_Uline;
3831 break; 4203 break;
3832 case 25: 4204 case 25:
4205 rendset = 0, rendstyle = RS_Blink;
4206 break;
4207 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4208 rendset = 0, rendstyle = RS_Blink;
3834 break; 4209 break;
3835 case 27: 4210 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4211 rendset = 0, rendstyle = RS_RVid;
3837 break; 4212 break;
… …
3855 case 35: 4230 case 35:
3856 case 36: 4231 case 36:
3857 case 37: 4232 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4233 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4234 break;
3860#ifdef TTY_256COLOR 4235 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4236 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4237 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4238 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4239 i += 2;
3866 } 4240 }
3867 break; 4241 break;
3868#endif
3869 case 39: /* default fg */ 4242 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4243 scr_color (Color_fg, Color_fg);
3871 break; 4244 break;
3872 4245
3873 case 40: 4246 case 40:
… …
3878 case 45: 4251 case 45:
3879 case 46: 4252 case 46:
3880 case 47: 4253 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4254 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4255 break;
3883#ifdef TTY_256COLOR 4256 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4257 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4258 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4259 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4260 i += 2;
3889 } 4261 }
3890 break; 4262 break;
3891#endif
3892 case 49: /* default bg */ 4263 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4264 scr_color (Color_bg, Color_bg);
3894 break; 4265 break;
4266
4267 //case 50: // not variable spacing
3895 4268
3896#ifndef NO_BRIGHTCOLOR 4269#ifndef NO_BRIGHTCOLOR
3897 case 90: 4270 case 90:
3898 case 91: /* set bright fg color */ 4271 case 91: /* set bright fg color */
3899 case 92: 4272 case 92:
3900 case 93: 4273 case 93:
3901 case 94: 4274 case 94:
3902 case 95: 4275 case 95:
3903 case 96: 4276 case 96:
3904 case 97: 4277 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4278 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4279 break;
3908 case 100: 4280 case 100:
3909 case 101: /* set bright bg color */ 4281 case 101: /* set bright bg color */
3910 case 102: 4282 case 102:
3911 case 103: 4283 case 103:
3912 case 104: 4284 case 104:
3913 case 105: 4285 case 105:
3914 case 106: 4286 case 106:
3915 case 107: 4287 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4289 break;
3919#endif 4290#endif
3920 4291
3921 } 4292 }
3922 } 4293 }
… …
3929{ 4300{
3930 unicode_t ch, cmd = cmd_getc (); 4301 unicode_t ch, cmd = cmd_getc ();
3931 4302
3932 if (cmd == 'Q') 4303 if (cmd == 'Q')
3933 { /* query graphics */ 4304 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4305 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4306 return;
3936 } 4307 }
3937 /* swallow other graphics sequences until terminating ':' */ 4308 /* swallow other graphics sequences until terminating ':' */
3938 do 4309 do
3939 ch = cmd_getc (); 4310 ch = cmd_getc ();
… …
3954 unsigned char buf[256]; 4325 unsigned char buf[256];
3955 4326
3956 va_start (arg_ptr, fmt); 4327 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4329 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4330 tt_write (buf, strlen (buf));
3960} 4331}
3961 4332
3962/* ---------------------------------------------------------------------- */ 4333/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4334/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 4335 * or generated by us in response to a query ESC sequence.
3965 */ 4336 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338
3966void 4339void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4340rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3968{ 4341{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4342 if (v_buflen == 0)
4343 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3970 4345
3971 if (len) 4346 if ((unsigned int)written == len)
4347 return;
4348
4349 data += written;
4350 len -= written;
3972 { 4351 }
4352
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4354
4355 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len;
4357
4358 pty_ev.set (EVENT_READ | EVENT_WRITE);
4359}
4360
4361void rxvt_term::pty_write ()
4362{
4363 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4364
4365 if (written > 0)
4366 {
4367 v_buflen -= written;
4368
3973 if (v_buflen == 0) 4369 if (v_buflen == 0)
3974 { 4370 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 4371 free (v_buffer);
4002 v_buffer = 0; 4372 v_buffer = 0;
4003 v_buflen = 0; 4373 v_buflen = 0;
4004 4374
4005 pty_ev.set (EVENT_READ); 4375 pty_ev.set (EVENT_READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 4376 return;
4018 } 4377 }
4378
4379 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4380 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 pty_ev.set (EVENT_READ);
4020} 4383}
4021 4384
4022/*----------------------- end-of-file (C source) -----------------------*/ 4385/*----------------------- end-of-file (C source) -----------------------*/
4023 4386

Diff Legend

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