ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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