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

Diff Legend

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