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

Diff Legend

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