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

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

Diff Legend

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