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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC

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

Diff Legend

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