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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.193 by root, Sun Feb 13 08:56:27 2005 UTC

… …
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 XK_KP_Space, 0x2422,
123 0,
124};
125
126void
127rxvt_term::iso14755_54 (int x, int y)
128{
129 x = Pixel2Col (x);
130 y = Pixel2Row (y);
131
132 if (x < 0 || x >= TermWin.ncol
133 || y < 0 || y >= TermWin.nrow)
134 return;
135
136 for (;;)
137 {
138 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
139
140 if (t != NOCHAR || !x)
141 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
143 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144 iso14755buf = ISO_14755_54;
145 break;
146 }
147
148 x--;
149 }
150
151}
152#endif
153
154#if ENABLE_OVERLAY
155void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
157{
158 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2;
161 int len;
162
163#if ENABLE_COMBINING
164 if (IS_COMPOSE (ch))
165 {
166 len = rxvt_composite.expand (ch, 0);
167 alloc = chr = new wchar_t[len];
168 rxvt_composite.expand (ch, chr);
169 }
170 else
171#endif
172 {
173 ch2 = ch;
174
175 alloc = 0;
176 chr = &ch2;
177 len = 1;
178 }
179
180 int width = strlen (f->name);
181
182 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
183
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185
186 for (int y = 0; y < len; y++)
187 {
188 char buf[9];
189
190 ch = *chr++;
191
192 sprintf (buf, "%8x", ch);
193 scr_overlay_set (0, y, buf);
194 scr_overlay_set (9, y, '=');
195#if !UNICODE3
196 if (ch >= 0x10000)
197 ch = 0xfffd;
198#endif
199 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r);
201 }
202
203 scr_overlay_set (0, len, f->name);
204
205#if ENABLE_COMBINING
206 if (alloc)
207 delete [] alloc;
208#endif
209}
210#endif
211
212void
213rxvt_term::commit_iso14755 ()
214{
215 wchar_t ch[2];
216
217 ch[0] = iso14755buf & ISO_14755_MASK;
218 ch[1] = 0;
219
220 if (iso14755buf & ISO_14755_51)
221 {
222 char mb[16];
223 int len;
224
225 // allow verbatim 0-bytes and control-bytes to be entered
226 if (ch[0] >= 0x20)
227 len = wcstombs (mb, ch, 16);
228 else
229 {
230 mb[0] = ch[0];
231 len = 1;
232 }
233
234 if (len > 0)
235 tt_write ((unsigned char *)mb, len);
236 else
237 scr_bell ();
238 }
239
240 iso14755buf = 0;
241}
242
243int
244rxvt_term::hex_keyval (XKeyEvent &ev)
245{
246 // check wether this event corresponds to a hex digit
247 // if the modifiers had not been pressed.
248 for (int index = 0; index < 8; index++)
249 {
250 KeySym k = XLookupKeysym (&ev, index);
251
252 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
253 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
254 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
255 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
256 }
257
258 return -1;
259}
260#endif
61 261
62/*{{{ Convert the keypress event into a string */ 262/*{{{ Convert the keypress event into a string */
63void 263void
64rxvt_term::lookup_key (XKeyEvent &ev) 264rxvt_term::lookup_key (XKeyEvent &ev)
65{ 265{
… …
147 valid_keysym = keysym != NoSymbol; 347 valid_keysym = keysym != NoSymbol;
148 } 348 }
149 349
150 if (valid_keysym) 350 if (valid_keysym)
151 { 351 {
352#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state))
354 return;
355#endif
356
152 if (TermWin.saveLines) 357 if (TermWin.saveLines)
153 { 358 {
154#ifdef UNSHIFTED_SCROLLKEYS 359#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 360 if (!ctrl && !meta)
156 {
157#else 361#else
158 if (IS_SCROLL_MOD) 362 if (IS_SCROLL_MOD)
363#endif
159 { 364 {
160#endif
161 int lnsppg; 365 int lnsppg;
162 366
163#ifdef PAGING_CONTEXT_LINES 367#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 369#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 418 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 419 {
216 keysym += (XK_F11 - XK_F1); 420 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 421 shft = 0; /* turn off Shift */
218 } 422 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 423 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 424 {
221 switch (keysym) 425 switch (keysym)
222 { 426 {
223 /* normal XTerm key bindings */ 427 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 428 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 429 selection_request (ev.time, 0, 0);
226 return; 430 return;
431#if TODO
227 /* rxvt extras */ 432 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 433 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 434 change_font (FONT_UP);
230 return; 435 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 436 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 437 change_font (FONT_DN);
233 return; 438 return;
439#endif
234 } 440 }
235 } 441 }
236 } 442 }
237#ifdef PRINTPIPE 443
238 if (keysym == XK_Print) 444#if ENABLE_FRILLS || ISO_14755
239 { 445 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 446 if (shft && ctrl)
241 return;
242 } 447 {
243#endif 448 int hv;
244 449
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 450 if (iso14755buf & ISO_14755_51
246 { 451 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 452 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 453 {
250 unsigned int l; 454 commit_iso14755 ();
251 const unsigned char *kbuf0; 455 iso14755buf = ISO_14755_51;
252 456# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 457 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 458# endif
261 ) 459 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 460 }
266 461 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 462 {
463 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
464 | hv | ISO_14755_51;
465# if ISO_14755
466 iso14755_51 (iso14755buf & ISO_14755_MASK);
467# endif
268 return; 468 return;
269 } 469 }
270 else 470 else
471 {
472# if ENABLE_OVERLAY
473 scr_overlay_off ();
271#endif 474# endif
475 iso14755buf = 0;
476 }
477 }
478 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
479 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
480 if (!(iso14755buf & ISO_14755_STARTED))
481 {
482 iso14755buf |= ISO_14755_STARTED;
483# if ENABLE_OVERLAY
484 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
485 scr_overlay_set (0, 0, "ISO 14755 mode");
486# endif
487 }
488#endif
489
490#ifdef PRINTPIPE
491 if (keysym == XK_Print)
492 {
493 scr_printscreen (ctrl | shft);
494 return;
495 }
496#endif
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
272 { 500 {
273 newlen = 1; 501 newlen = 1;
274 switch (keysym) 502 switch (keysym)
275 { 503 {
276#ifndef NO_BACKSPACE_KEY 504#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 505 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 506 if (priv_modes & PrivMode_HaveBackSpace)
279 { 507 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 508 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 509 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 510 kbuf[1] = '\0';
283 } 511 }
284 else 512 else
285 STRCPY (kbuf, key_backspace); 513 strcpy (kbuf, key_backspace);
286 break; 514 break;
287#endif 515#endif
288#ifndef NO_DELETE_KEY 516#ifndef NO_DELETE_KEY
289 case XK_Delete: 517 case XK_Delete:
290 STRCPY (kbuf, key_delete); 518 strcpy (kbuf, key_delete);
291 break; 519 break;
292#endif 520#endif
293 case XK_Tab: 521 case XK_Tab:
294 if (shft) 522 if (shft)
295 STRCPY (kbuf, "\033[Z"); 523 strcpy (kbuf, "\033[Z");
296 else 524 else
297 { 525 {
298#ifdef CTRL_TAB_MAKES_META 526#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 527 if (ctrl)
300 meta = 1; 528 meta = 1;
… …
306 newlen = 0; 534 newlen = 0;
307 } 535 }
308 break; 536 break;
309 537
310#ifdef XK_KP_Left 538#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 539 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 540 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 541 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 542 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 543 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 544 {
317 STRCPY (kbuf, "\033OZ"); 545 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 546 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 547 break;
320 } 548 }
321 else 549 else
322 /* translate to std. cursor key */ 550 /* translate to std. cursor key */
… …
325#endif 553#endif
326 case XK_Up: /* "\033[A" */ 554 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 555 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 556 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 557 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 558 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 559 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 560 /* do Shift first */
333 if (shft) 561 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 562 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 563 else if (ctrl)
336 { 564 {
337 kbuf[1] = 'O'; 565 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 566 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 567 }
340 else if (PrivateModes & PrivMode_aplCUR) 568 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 569 kbuf[1] = 'O';
342 break; 570 break;
343 571
344#ifndef UNSHIFTED_SCROLLKEYS 572#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 573# ifdef XK_KP_Prior
346 case XK_KP_Prior: 574 case XK_KP_Prior:
347 /* allow shift to override */ 575 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 576 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 577 {
350 STRCPY (kbuf, "\033Oy"); 578 strcpy (kbuf, "\033Oy");
351 break; 579 break;
352 } 580 }
353 /* FALLTHROUGH */ 581 /* FALLTHROUGH */
354# endif 582# endif
355 case XK_Prior: 583 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 584 strcpy (kbuf, "\033[5~");
357 break; 585 break;
358# ifdef XK_KP_Next 586# ifdef XK_KP_Next
359 case XK_KP_Next: 587 case XK_KP_Next:
360 /* allow shift to override */ 588 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 590 {
363 STRCPY (kbuf, "\033Os"); 591 strcpy (kbuf, "\033Os");
364 break; 592 break;
365 } 593 }
366 /* FALLTHROUGH */ 594 /* FALLTHROUGH */
367# endif 595# endif
368 case XK_Next: 596 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 597 strcpy (kbuf, "\033[6~");
370 break; 598 break;
371#endif 599#endif
372 case XK_KP_Enter: 600 case XK_KP_Enter:
373 /* allow shift to override */ 601 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 602 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 603 {
376 STRCPY (kbuf, "\033OM"); 604 strcpy (kbuf, "\033OM");
605 break;
606 }
607
608 /* FALLTHROUGH */
609
610 case XK_Return:
611 if (priv_modes & PrivMode_LFNL)
612 {
613 kbuf[0] = '\015';
614 kbuf[1] = '\012';
615 kbuf[2] = '\0';
377 } 616 }
378 else 617 else
379 { 618 {
380 kbuf[0] = '\r'; 619 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 620 kbuf[1] = '\0';
382 } 621 }
383 break; 622 break;
384 623
385#ifdef XK_KP_Begin 624#ifdef XK_KP_Begin
386 case XK_KP_Begin: 625 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 626 strcpy (kbuf, "\033Ou");
388 break; 627 break;
389 628
390 case XK_KP_Insert: 629 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 630 strcpy (kbuf, "\033Op");
392 break; 631 break;
393 632
394 case XK_KP_Delete: 633 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 634 strcpy (kbuf, "\033On");
396 break; 635 break;
397#endif 636#endif
398 case XK_KP_F1: /* "\033OP" */ 637 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 638 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 639 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 640 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 641 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 642 kbuf[2] += (keysym - XK_KP_F1);
404 break; 643 break;
405 644
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 645 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 646 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 657 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 658 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 659 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 660 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 661 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 662 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 663 {
425 STRCPY (kbuf, "\033Oj"); 664 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 665 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 666 }
428 else 667 else
429 { 668 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 669 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
432 } 671 }
433 break; 672 break;
434 673
435 case XK_Find: 674 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 675 strcpy (kbuf, "\033[1~");
437 break; 676 break;
438 case XK_Insert: 677 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 678 strcpy (kbuf, "\033[2~");
440 break; 679 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 680#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 681 case DXK_Remove:
443 /* FALLTHROUGH */ 682 /* FALLTHROUGH */
444#endif 683#endif
445 case XK_Execute: 684 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 685 strcpy (kbuf, "\033[3~");
447 break; 686 break;
448 case XK_Select: 687 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 688 strcpy (kbuf, "\033[4~");
450 break; 689 break;
451#ifdef XK_KP_End 690#ifdef XK_KP_End
452 case XK_KP_End: 691 case XK_KP_End:
453 /* allow shift to override */ 692 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 693 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 694 {
456 STRCPY (kbuf, "\033Oq"); 695 strcpy (kbuf, "\033Oq");
457 break; 696 break;
458 } 697 }
459 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
460#endif 699#endif
461 case XK_End: 700 case XK_End:
462 STRCPY (kbuf, KS_END); 701 strcpy (kbuf, KS_END);
463 break; 702 break;
464#ifdef XK_KP_Home 703#ifdef XK_KP_Home
465 case XK_KP_Home: 704 case XK_KP_Home:
466 /* allow shift to override */ 705 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 707 {
469 STRCPY (kbuf, "\033Ow"); 708 strcpy (kbuf, "\033Ow");
470 break; 709 break;
471 } 710 }
472 /* FALLTHROUGH */ 711 /* FALLTHROUGH */
473#endif 712#endif
474 case XK_Home: 713 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 714 strcpy (kbuf, KS_HOME);
476 break; 715 break;
477 716
478#define FKEY(n, fkey) \ 717#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 718 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 719
… …
532#undef FKEY 771#undef FKEY
533 default: 772 default:
534 newlen = 0; 773 newlen = 0;
535 break; 774 break;
536 } 775 }
776
537 if (newlen) 777 if (newlen)
538 len = STRLEN (kbuf); 778 len = strlen (kbuf);
539 } 779 }
540 780
541 /* 781 /*
542 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
543 */ 783 */
… …
550 else if (ctrl && keysym == XK_minus) 790 else if (ctrl && keysym == XK_minus)
551 { 791 {
552 len = 1; 792 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
555 else 800 else
556 { 801 {
557#ifdef META8_OPTION 802#ifdef META8_OPTION
558 /* set 8-bit on */ 803 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 804 if (meta && (meta_char == 0x80))
… …
571 } 816 }
572 817
573 if (len <= 0) 818 if (len <= 0)
574 return; /* not mapped */ 819 return; /* not mapped */
575 820
576 if (Options & Opt_scrollTtyKeypress) 821 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 822 if (TermWin.view_start)
578 { 823 {
579 TermWin.view_start = 0; 824 TermWin.view_start = 0;
580 want_refresh = 1; 825 want_refresh = 1;
581 } 826 }
… …
617#endif /* DEBUG_CMD */ 862#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 863 tt_write (kbuf, (unsigned int)len);
619} 864}
620/*}}} */ 865/*}}} */
621 866
622#if (MENUBAR_MAX) 867#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 868/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 869/* attempt to `write' count to the input buffer */
625unsigned int 870unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 871rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 872{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 875 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 876 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 877
633 if (n > 0 && s < count) 878 if (n > 0 && s < count)
634 { 879 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 880 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 881 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 882 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 883 cmdbuf_endp -= n;
639 s += n; 884 s += n;
640 } 885 }
… …
650 895
651 cmd_parse (); 896 cmd_parse ();
652 897
653 return 0; 898 return 0;
654} 899}
655#endif /* MENUBAR_MAX */ 900#endif
656 901
657void 902void
658rxvt_term::flush () 903rxvt_term::flush ()
659{ 904{
905 flush_ev.stop ();
906
660#ifdef TRANSPARENT 907#ifdef TRANSPARENT
661 if (want_full_refresh) 908 if (want_full_refresh)
662 { 909 {
663 want_full_refresh = 0; 910 want_full_refresh = 0;
664 scr_clear (); 911 scr_clear ();
665 scr_touch (false); 912 scr_touch (false);
666 want_refresh = 1;
667 } 913 }
668#endif 914#endif
669 915
670 if (want_refresh) 916 if (want_refresh)
671 { 917 {
… …
683rxvt_term::check_cb (check_watcher &w) 929rxvt_term::check_cb (check_watcher &w)
684{ 930{
685 SET_R (this); 931 SET_R (this);
686 SET_LOCALE (locale); 932 SET_LOCALE (locale);
687 933
934 display->flush ();
935
936 if (want_refresh && !flush_ev.active)
937 flush_ev.start (NOW + 0.01);
938}
939
940void
941rxvt_term::flush_cb (time_watcher &w)
942{
943 SET_R (this);
944 SET_LOCALE (locale);
945
946 refresh_limit = 1;
947 refresh_count = 0;
688 flush (); 948 flush ();
689} 949}
690 950
691#ifdef CURSOR_BLINK 951#ifdef CURSOR_BLINK
692void 952void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 970 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 971 }
712} 972}
713#endif 973#endif
714 974
975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
976void
977rxvt_term::cont_scroll_cb (time_watcher &w)
978{
979 if ((scrollbar_isUp() || scrollbar_isDn()) &&
980 scr_page (scrollbar_isUp() ? UP : DN, 1))
981 {
982 refresh_type |= SMOOTH_REFRESH;
983 want_refresh = 1;
984 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
985 }
986}
987#endif
988
989#ifdef SELECTION_SCROLLING
990void
991rxvt_term::sel_scroll_cb (time_watcher &w)
992{
993 if (scr_page (scroll_selection_dir, scroll_selection_lines))
994 {
995 selection_extend (selection_save_x, selection_save_y, selection_save_state);
996 refresh_type |= SMOOTH_REFRESH;
997 want_refresh = 1;
998 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
999 }
1000}
1001#endif
1002
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004void
1005rxvt_term::slip_wheel_cb (time_watcher &w)
1006{
1007 if (mouse_slip_wheel_speed == 0
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed))
1010 {
1011 if (TermWin.view_start == TermWin.nscrolled ||
1012 TermWin.view_start == 0)
1013 mouse_slip_wheel_speed = 0;
1014
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1018 }
1019}
1020#endif
1021
715bool 1022bool
716rxvt_term::pty_fill () 1023rxvt_term::pty_fill ()
717{ 1024{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1025 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1026
… …
725 1032
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1033 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1034 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1035 cmdbuf_endp = cmdbuf_ptr + n;
729 1036
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1038
732 if (n > 0) 1039 if (n > 0)
733 { 1040 {
734 cmdbuf_endp += n; 1041 cmdbuf_endp += n;
735 return true; 1042 return true;
… …
744rxvt_term::pty_cb (io_watcher &w, short revents) 1051rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1052{
746 SET_R (this); 1053 SET_R (this);
747 SET_LOCALE (locale); 1054 SET_LOCALE (locale);
748 1055
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1056 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1057 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1058 while (pty_fill ())
754 if (cmd_parse ()) 1059 if (cmd_parse ())
755 break; 1060 break;
1061
1062 if (revents & EVENT_WRITE)
1063 pty_write ();
1064}
1065
1066void
1067rxvt_term::pointer_unblank ()
1068{
1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1070 recolour_cursor ();
1071
1072#ifdef POINTER_BLANK
1073 hidden_pointer = 0;
1074
1075 if (options & Opt_pointerBlank)
1076 pointer_ev.start (NOW + pointerBlankDelay);
1077#endif
756} 1078}
757 1079
758#ifdef POINTER_BLANK 1080#ifdef POINTER_BLANK
759void 1081void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769}
770
771void
772rxvt_term::pointer_blank () 1082rxvt_term::pointer_blank ()
773{ 1083{
774 if (! (Options & Opt_pointerBlank)) 1084 if (! (options & Opt_pointerBlank))
775 return; 1085 return;
776 1086
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
778 XFlush (display->display); 1088 XFlush (display->display);
779 1089
780 hidden_pointer = 1; 1090 hidden_pointer = 1;
781} 1091}
782 1092
… …
799 x = ev.x; 1109 x = ev.x;
800 y = ev.y; 1110 y = ev.y;
801 pixel_position (&x, &y); 1111 pixel_position (&x, &y);
802 1112
803 if (MEvent.button == AnyButton) 1113 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1114 button_number = 3;
806 }
807 else 1115 else
808 { 1116 {
809 button_number = MEvent.button - Button1; 1117 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1118 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1119 if (button_number >= 3)
812 button_number += (64 - 3); 1120 button_number += (64 - 3);
813 } 1121 }
814 1122
815 if (PrivateModes & PrivMode_MouseX10) 1123 if (priv_modes & PrivMode_MouseX10)
816 { 1124 {
817 /* 1125 /*
818 * do not report ButtonRelease 1126 * do not report ButtonRelease
819 * no state info allowed 1127 * no state info allowed
820 */ 1128 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1143 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1144 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1145#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1146 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1147#endif
840
841 } 1148 }
842 1149
843#ifdef DEBUG_MOUSEREPORT 1150#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1151 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1152 if (key_state & 16)
846 fputc ('C', stderr); 1153 fputc ('C', stderr);
847 if (key_state & 4) 1154 if (key_state & 4)
848 fputc ('S', stderr); 1155 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1159 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1160 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1161 button_number,
855 x + 1, 1162 x + 1,
856 y + 1); 1163 y + 1);
857#else 1164#endif
1165
858 tt_printf ("\033[M%c%c%c", 1166 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1167 (32 + button_number + key_state),
860 (32 + x + 1), 1168 (32 + x + 1),
861 (32 + y + 1)); 1169 (32 + y + 1));
862#endif
863} 1170}
864 1171
865#ifdef USING_W11LIB 1172#ifdef USING_W11LIB
866void 1173void
867rxvt_W11_process_x_event (XEvent *ev) 1174rxvt_W11_process_x_event (XEvent *ev)
… …
874 1181
875/*{{{ process an X event */ 1182/*{{{ process an X event */
876void 1183void
877rxvt_term::x_cb (XEvent &ev) 1184rxvt_term::x_cb (XEvent &ev)
878{ 1185{
1186 dDisp;
1187
879 SET_R (this); 1188 SET_R (this);
880 SET_LOCALE (locale); 1189 SET_LOCALE (locale);
881 1190
882#if defined(CURSOR_BLINK) 1191#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
884 { 1193 {
885 if (hidden_cursor) 1194 if (hidden_cursor)
886 { 1195 {
887 hidden_cursor = 0; 1196 hidden_cursor = 0;
888 want_refresh = 1; 1197 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1201 }
893#endif 1202#endif
894 1203
895#if defined(POINTER_BLANK) 1204#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1206 {
898 if (ev.type == MotionNotify 1207 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1208 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1209 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1210 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1213 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1214 pointer_blank ();
906 } 1215 }
907#endif 1216#endif
908 1217
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1218 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1219 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1220 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 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));
965#endif
966 1221
967 switch (ev.type) 1222 switch (ev.type)
968 { 1223 {
969 case KeyPress: 1224 case KeyPress:
1225#if ISO_14755
1226 if (!(iso14755buf & ISO_14755_52))
1227#endif
970 lookup_key (ev.xkey); 1228 lookup_key (ev.xkey);
1229
1230 break;
1231
1232 case KeyRelease:
1233 {
1234#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1235 KeySym ks;
1236
1237 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1238#endif
1239
1240#if ENABLE_FRILLS || ISO_14755
1241 // ISO 14755 support
1242 if (iso14755buf)
1243 if (iso14755buf & ISO_14755_52)
1244 {
1245# if ENABLE_OVERLAY
1246 scr_overlay_off ();
1247# endif
1248# if ISO_14755
1249 // iso14755 part 5.2 handling: release time
1250 // first: controls
1251 if ((ev.xkey.state & ControlMask)
1252 && ((ks >= 0x40 && ks <= 0x5f)
1253 || (ks >= 0x61 && ks <= 0x7f)))
1254 {
1255 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1256 commit_iso14755 ();
1257 return; // case-break;
1258 }
1259
1260 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1261 if (i[0] == ks)
1262 {
1263 iso14755buf = ISO_14755_51 | i[1];
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 scr_bell ();
1269# endif
1270 iso14755buf = 0;
971 break; 1271 break;
1272 }
1273 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1274 {
1275# if ENABLE_OVERLAY
1276 scr_overlay_off ();
1277# endif
1278 if (iso14755buf & ISO_14755_51)
1279 commit_iso14755 ();
1280#if ISO_14755
1281 else if (iso14755buf & ISO_14755_STARTED)
1282 {
1283 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1284
1285 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1286 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1287 }
1288# endif
1289 else
1290 iso14755buf = 0;
1291 }
1292#endif
972 1293
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1295 if (!(ev.xkey.state & ControlMask))
1296 slip_wheel_ev.stop ();
1297 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1298 mouse_slip_wheel_speed = 0;
978 else 1299#endif
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1300 break;
987 } 1301 }
988#endif
989 1302
990 case ButtonPress: 1303 case ButtonPress:
991 button_press (ev.xbutton); 1304 button_press (ev.xbutton);
992 break; 1305 break;
993 1306
… …
1010 Atom ActualType; 1323 Atom ActualType;
1011 int ActualFormat; 1324 int ActualFormat;
1012 unsigned char *data; 1325 unsigned char *data;
1013 unsigned long Size, RemainingBytes; 1326 unsigned long Size, RemainingBytes;
1014 1327
1015 XGetWindowProperty (display->display, display->root, 1328 XGetWindowProperty (disp, display->root,
1016 xa[XA_DNDSELECTION], 1329 xa[XA_DNDSELECTION],
1017 0L, 1000000L, 1330 0L, 1000000L,
1018 False, AnyPropertyType, 1331 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1332 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1333 &Size, &RemainingBytes,
1021 &data); 1334 &data);
1022 XChangeProperty (display->display, display->root, 1335 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1336 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1337 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1029 } 1339 }
1030#endif /* OFFIX_DND */ 1340#endif /* OFFIX_DND */
1031 break; 1341 break;
1032 1342
1033 case MappingNotify: 1343 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1344 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1345 break;
1036 1346
1037 /* 1347 /*
1038 * XXX: this is not the _current_ arrangement 1348 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1349 * Here's my conclusion:
… …
1064 { 1374 {
1065 TermWin.focus = 1; 1375 TermWin.focus = 1;
1066 want_refresh = 1; 1376 want_refresh = 1;
1067#ifdef USE_XIM 1377#ifdef USE_XIM
1068 if (Input_Context != NULL) 1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1069 XSetICFocus (Input_Context); 1381 XSetICFocus (Input_Context);
1382 }
1070#endif 1383#endif
1071#ifdef CURSOR_BLINK 1384#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink) 1385 if (options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387#endif
1388#ifdef OFF_FOCUS_FADING
1389 if (rs[Rs_fade])
1390 {
1391 pix_colors = pix_colors_focused;
1392 scr_recolour ();
1393 }
1074#endif 1394#endif
1075 1395
1076 } 1396 }
1077 break; 1397 break;
1078 1398
1079 case FocusOut: 1399 case FocusOut:
1080 if (TermWin.focus) 1400 if (TermWin.focus)
1081 { 1401 {
1082 TermWin.focus = 0; 1402 TermWin.focus = 0;
1083 want_refresh = 1; 1403 want_refresh = 1;
1404
1405#if ENABLE_FRILLS || ISO_14755
1406 iso14755buf = 0;
1407#endif
1408#if ENABLE_OVERLAY
1409 scr_overlay_off ();
1410#endif
1084#ifdef USE_XIM 1411#ifdef USE_XIM
1085 if (Input_Context != NULL) 1412 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context); 1413 XUnsetICFocus (Input_Context);
1087#endif 1414#endif
1088#ifdef CURSOR_BLINK 1415#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink) 1416 if (options & Opt_cursorBlink)
1090 cursor_blink_ev.stop (); 1417 cursor_blink_ev.stop ();
1091 hidden_cursor = 0; 1418 hidden_cursor = 0;
1092#endif 1419#endif
1093 1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1094 } 1427 }
1095 break; 1428 break;
1096 1429
1097 case ConfigureNotify: 1430 case ConfigureNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1431 if (ev.xconfigure.window == TermWin.parent[0])
… …
1103 { /* Wrap lots of configures into one */ 1436 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width; 1437 width = ev.xconfigure.width;
1105 height = ev.xconfigure.height; 1438 height = ev.xconfigure.height;
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 } 1440 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1109 1442
1110 if (szHint.width != width || szHint.height != height) 1443 if (szHint.width != width || szHint.height != height)
1111 { 1444 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1445 seen_resize = 1;
1113 resize_all_windows (width, height, 1); 1446 resize_all_windows (width, height, 1);
1114 } 1447 }
1115#ifdef DEBUG_SIZE 1448
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent) 1450 if (options & Opt_transparent)
1123 {
1124 check_our_parents (); 1451 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif 1452#endif
1129 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1130 break; 1461 break;
1131 1462
1132 case SelectionClear: 1463 case SelectionClear:
1133 selection_clear (); 1464 selection_clear ();
1134 break; 1465 break;
1135 1466
1136 case SelectionNotify: 1467 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1468 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1470 break;
1141 1471
1142 case SelectionRequest: 1472 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1144 break; 1474 break;
… …
1165 1495
1166 case GraphicsExpose: 1496 case GraphicsExpose:
1167 case Expose: 1497 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1498 if (ev.xany.window == TermWin.vt)
1169 { 1499 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1500 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1501 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1502 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1174 // I don't understand this, so I changed it :) 1504
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1510
1178 // ev.xexpose.width, TermWin.height, False); 1511 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1512 }
1182 else 1513 else
1183 { 1514 {
1184 XEvent unused_event; 1515 XEvent unused_event;
1185 1516
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1517 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 ; 1518 ;
1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1519 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 ; 1520 ;
1190 1521
1191 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1192 { 1523 {
1193 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
… …
1195 } 1526 }
1196#ifdef MENUBAR 1527#ifdef MENUBAR
1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1198 menubar_expose (); 1529 menubar_expose ();
1199#endif 1530#endif
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0])
1534 XClearWindow (disp, ev.xany.window);
1535#endif
1200 } 1536 }
1201 break; 1537 break;
1202 1538
1203 case MotionNotify: 1539 case MotionNotify:
1204#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
… …
1210 { 1546 {
1211 menubar_control (ev.xbutton); 1547 menubar_control (ev.xbutton);
1212 break; 1548 break;
1213 } 1549 }
1214#endif 1550#endif
1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1216 break; 1552 break;
1217 1553
1218 if (ev.xany.window == TermWin.vt) 1554 if (ev.xany.window == TermWin.vt)
1219 { 1555 {
1220 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1556 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1221 { 1557 {
1222 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1223 ; 1559 ;
1224 1560
1225 XQueryPointer (display->display, TermWin.vt, 1561 XQueryPointer (disp, TermWin.vt,
1226 &unused_root, &unused_child, 1562 &unused_root, &unused_child,
1227 &unused_root_x, &unused_root_y, 1563 &unused_root_x, &unused_root_y,
1228 & (ev.xbutton.x), & (ev.xbutton.y), 1564 &ev.xbutton.x, &ev.xbutton.y,
1229 &unused_mask); 1565 &ev.xbutton.state);
1230#ifdef MOUSE_THRESHOLD 1566#ifdef MOUSE_THRESHOLD
1231 /* deal with a `jumpy' mouse */ 1567 /* deal with a `jumpy' mouse */
1232 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1568 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1233 { 1569 {
1234#endif 1570#endif
1571#if ISO_14755
1572 // 5.4
1573 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1574 {
1575 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1576 break;
1577 }
1578#endif
1235 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1579 selection_extend (ev.xbutton.x, ev.xbutton.y,
1236 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1580 ev.xbutton.state & Button3Mask ? 2 : 0);
1581
1237#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1238 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1239 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1240 { 1585 {
1241 int dist; 1586 int dist;
1242 1587
1243 pending_scroll_selection=1;
1244
1245 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1246 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1247 */ 1590 */
1248 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1249 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1250 1593
1251 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1252 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1253 */ 1596 */
1254 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1255 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1256 selection_save_state=
1257 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1258 1600
1259 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1260 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y < TermWin.int_bwidth)
1261 { 1603 {
1262 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1263 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1264 } 1606 }
1265 else 1607 else
1266 { 1608 {
1267 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1268 dist = ev.xbutton.y -
1269 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1270 } 1611 }
1612
1271 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1272 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1273 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1274 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1275 } 1618 }
1276 else 1619 else
1277 { 1620 {
1278 /* we are within the text window, so we 1621 /* we are within the text window, so we
1279 * shouldn't be scrolling 1622 * shouldn't be scrolling
1280 */ 1623 */
1281 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1282 } 1626 }
1283#endif 1627#endif
1284#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1285
1286 } 1629 }
1287#endif 1630#endif
1288
1289 } 1631 }
1290 } 1632 }
1291 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1292 { 1634 {
1293 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1294 MotionNotify, &ev)) ; 1636 MotionNotify, &ev))
1637 ;
1638
1295 XQueryPointer (display->display, scrollBar.win, 1639 XQueryPointer (disp, scrollBar.win,
1296 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1297 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1298 & (ev.xbutton.x), & (ev.xbutton.y), 1642 &ev.xbutton.x, &ev.xbutton.y,
1299 &unused_mask); 1643 &unused_mask);
1300 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1301 scrollbar_size ()); 1645 scrollbar_size ());
1302 scr_refresh (refresh_type); 1646 scr_refresh (refresh_type);
1303 refresh_limit = 0; 1647 refresh_limit = 0;
… …
1305 } 1649 }
1306 break; 1650 break;
1307 } 1651 }
1308} 1652}
1309 1653
1654#if TRANSPARENT
1310void 1655void
1311rxvt_term::rootwin_cb (XEvent &ev) 1656rxvt_term::rootwin_cb (XEvent &ev)
1312{ 1657{
1313 SET_R (this); 1658 SET_R (this);
1314 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1315 1660
1316 switch (ev.type) 1661 switch (ev.type)
1317 { 1662 {
1318 case PropertyNotify: 1663 case PropertyNotify:
1319 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1320 {
1321 if (ev.xproperty.state == PropertyNewValue)
1322 selection_property (ev.xproperty.window, ev.xproperty.atom);
1323 break;
1324 }
1325#ifdef TRANSPARENT
1326 else
1327 {
1328 /* 1664 /*
1329 * if user used some Esetroot compatible prog to set the root bg, 1665 * if user used some Esetroot compatible prog to set the root bg,
1330 * use the property to determine the pixmap. We use it later on. 1666 * use the property to determine the pixmap. We use it later on.
1331 */ 1667 */
1332 if (xa[XA_XROOTPMAPID] == 0)
1333 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1334
1335 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1668 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1336 return; 1670 return;
1337 }
1338 1671
1339 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1340 case ReparentNotify: 1673 case ReparentNotify:
1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1342 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1343 break; 1676 break;
1344#endif
1345 } 1677 }
1346} 1678}
1679#endif
1347 1680
1348void 1681void
1349rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1350{ 1683{
1351 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1352 1685
1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1354 if (!bypass_keystate) 1687 if (!bypass_keystate)
1355 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1356 /* 1690 /*
1357 * VT window processing of button press 1691 * VT window processing of button press
1358 */ 1692 */
1359 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1360 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1705
1362 if (reportmode) 1706 if (reportmode)
1363 { 1707 {
1364 /* mouse report from vt window */ 1708 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */ 1709 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state; 1710 MEvent.state = ev.state;
… …
1395 } 1739 }
1396 else 1740 else
1397 { 1741 {
1398 if (ev.button != MEvent.button) 1742 if (ev.button != MEvent.button)
1399 MEvent.clicks = 0; 1743 MEvent.clicks = 0;
1744
1400 switch (ev.button) 1745 switch (ev.button)
1401 { 1746 {
1402 case Button1: 1747 case Button1:
1748 /* allow meta + click to select rectangular areas */
1749 /* should be done in screen.C */
1750#if ENABLE_FRILLS
1751 selection.rect = !!(ev.state & ModMetaMask);
1752#else
1753 selection.rect = false;
1754#endif
1755
1403 /* allow shift+left click to extend selection */ 1756 /* allow shift+left click to extend selection */
1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1405 { 1758 {
1406 if (MEvent.button == Button1 && clickintime) 1759 if (MEvent.button == Button1 && clickintime)
1407 selection_rotate (ev.x, ev.y); 1760 selection_rotate (ev.x, ev.y);
1408 else 1761 else
1409 selection_extend (ev.x, ev.y, 1); 1762 selection_extend (ev.x, ev.y, 1);
… …
1424 case Button3: 1777 case Button3:
1425 if (MEvent.button == Button3 && clickintime) 1778 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y); 1779 selection_rotate (ev.x, ev.y);
1427 else 1780 else
1428 selection_extend (ev.x, ev.y, 1); 1781 selection_extend (ev.x, ev.y, 1);
1782
1429 MEvent.button = Button3; 1783 MEvent.button = Button3;
1430 break; 1784 break;
1431 } 1785 }
1432 } 1786 }
1787
1433 MEvent.time = ev.time; 1788 MEvent.time = ev.time;
1434 return; 1789 return;
1435 } 1790 }
1436 1791
1437 /* 1792 /*
… …
1503 upordown = 1; /* down */ 1858 upordown = 1; /* down */
1504 } 1859 }
1505 if (upordown) 1860 if (upordown)
1506 { 1861 {
1507#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1862#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1508 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1863 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1509#endif 1864#endif
1510 if (scr_page (upordown < 0 ? UP : DN, 1)) 1865 if (scr_page (upordown < 0 ? UP : DN, 1))
1511 { 1866 {
1512 if (upordown < 0) 1867 if (upordown < 0)
1513 scrollBar.setUp (); 1868 scrollBar.setUp ();
… …
1529 break; 1884 break;
1530 case R_SB_ALIGN_BOTTOM: 1885 case R_SB_ALIGN_BOTTOM:
1531 csrO = scrollBar.bot - scrollBar.top; 1886 csrO = scrollBar.bot - scrollBar.top;
1532 break; 1887 break;
1533 } 1888 }
1889
1534 if (scrollBar.style == R_SB_XTERM 1890 if (scrollBar.style == R_SB_XTERM
1535 || scrollbar_above_slider (ev.y) 1891 || scrollbar_above_slider (ev.y)
1536 || scrollbar_below_slider (ev.y)) 1892 || scrollbar_below_slider (ev.y))
1537 scr_move_to ( scrollbar_position (ev.y) - csrO, 1893 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1538 scrollbar_size ()); 1894
1539 scrollBar.setMotion (); 1895 scrollBar.setMotion ();
1540 break; 1896 break;
1541 1897
1542 case Button1: 1898 case Button1:
1543 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1899 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1567 scr_page ((ev.button == Button1 ? DN : UP), 1923 scr_page ((ev.button == Button1 ? DN : UP),
1568 (TermWin.nrow 1924 (TermWin.nrow
1569 * scrollbar_position (ev.y) 1925 * scrollbar_position (ev.y)
1570 / scrollbar_size ())); 1926 / scrollbar_size ()));
1571 } 1927 }
1928
1572 break; 1929 break;
1573 } 1930 }
1574 } 1931 }
1575 return; 1932 return;
1576 } 1933 }
… …
1588{ 1945{
1589 int reportmode = 0; 1946 int reportmode = 0;
1590 1947
1591 csrO = 0; /* reset csr Offset */ 1948 csrO = 0; /* reset csr Offset */
1592 if (!bypass_keystate) 1949 if (!bypass_keystate)
1593 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1950 reportmode = !! (priv_modes & PrivMode_mouse_report);
1594 1951
1595 if (scrollbar_isUpDn ()) 1952 if (scrollbar_isUpDn ())
1596 { 1953 {
1597 scrollBar.setIdle (); 1954 scrollBar.setIdle ();
1598 scrollbar_show (0); 1955 scrollbar_show (0);
1599#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1600 refresh_type &= ~SMOOTH_REFRESH; 1957 refresh_type &= ~SMOOTH_REFRESH;
1601#endif 1958#endif
1602
1603 } 1959 }
1960
1604#ifdef SELECTION_SCROLLING 1961#ifdef SELECTION_SCROLLING
1605 pending_scroll_selection=0; 1962 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop();
1606#endif 1964#endif
1965
1607 if (ev.window == TermWin.vt) 1966 if (ev.window == TermWin.vt)
1608 { 1967 {
1968#if ISO_14755
1969 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return;
1972#endif
1609 if (reportmode) 1973 if (reportmode)
1610 { 1974 {
1611 /* mouse report from vt window */ 1975 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */ 1976 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4) 1977 if (ev.button >= 4)
… …
1627 MEvent.button = AnyButton; 1991 MEvent.button = AnyButton;
1628 mouse_report (ev); 1992 mouse_report (ev);
1629#endif /* MOUSE_REPORT_DOUBLECLICK */ 1993#endif /* MOUSE_REPORT_DOUBLECLICK */
1630 return; 1994 return;
1631 } 1995 }
1996
1632 /* 1997 /*
1633 * dumb hack to compensate for the failure of click-and-drag 1998 * dumb hack to compensate for the failure of click-and-drag
1634 * when overriding mouse reporting 1999 * when overriding mouse reporting
1635 */ 2000 */
1636 if (PrivateModes & PrivMode_mouse_report 2001 if (priv_modes & PrivMode_mouse_report
1637 && bypass_keystate 2002 && bypass_keystate
1638 && ev.button == Button1 && MEvent.clicks <= 1) 2003 && ev.button == Button1 && MEvent.clicks <= 1)
1639 selection_extend (ev.x, ev.y, 0); 2004 selection_extend (ev.x, ev.y, 0);
1640 2005
1641 switch (ev.button) 2006 switch (ev.button)
… …
1652 case Button5: 2017 case Button5:
1653 { 2018 {
1654 int i; 2019 int i;
1655 page_dirn v; 2020 page_dirn v;
1656 2021
1657 v = (ev.button == Button4) ? UP : DN; 2022 v = ev.button == Button4 ? UP : DN;
2023
1658 if (ev.state & ShiftMask) 2024 if (ev.state & ShiftMask)
1659 i = 1; 2025 i = 1;
1660 else if ((Options & Opt_mouseWheelScrollPage)) 2026 else if (options & Opt_mouseWheelScrollPage)
1661 i = TermWin.nrow - 1; 2027 i = TermWin.nrow - 1;
1662 else 2028 else
1663 i = 5; 2029 i = 5;
2030
1664# ifdef MOUSE_SLIP_WHEELING 2031# ifdef MOUSE_SLIP_WHEELING
1665 if (ev.state & ControlMask) 2032 if (ev.state & ControlMask)
1666 { 2033 {
1667 mouse_slip_wheel_speed += (v ? -1 : 1); 2034 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2036 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2037
2038 if (slip_wheel_ev.at < NOW)
1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040
2041 slip_wheel_ev.start ();
1669 } 2042 }
2043 else
2044 {
1670# endif 2045# endif
1671# ifdef JUMP_MOUSE_WHEEL 2046# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1678 scr_page (v, 1); 2047 scr_page (v, i);
1679 scr_refresh (SMOOTH_REFRESH); 2048 scr_refresh (SMOOTH_REFRESH);
1680 scrollbar_show (1); 2049 scrollbar_show (1);
2050# else
2051 while (i--)
2052 {
2053 scr_page (v, 1);
2054 scr_refresh (SMOOTH_REFRESH);
2055 scrollbar_show (1);
2056 }
2057# endif
2058# ifdef MOUSE_SLIP_WHEELING
1681 } 2059 }
1682# endif 2060#endif
1683
1684 } 2061 }
1685 break; 2062 break;
1686#endif 2063#endif
1687
1688 } 2064 }
1689 } 2065 }
1690#ifdef MENUBAR 2066#ifdef MENUBAR
1691 else if (isMenuBarWindow (ev.window)) 2067 else if (isMenuBarWindow (ev.window))
1692 menubar_control (ev); 2068 menubar_control (ev);
1693#endif 2069#endif
1694} 2070}
1695 2071
1696#ifdef TRANSPARENT 2072#ifdef TRANSPARENT
1697#if TINTING 2073#if TINTING
1698/* shading taken from eterm-0.9.2 */ 2074/* taken from aterm-0.4.2 */
1699/* RGB 15 */
1700 2075
1701static void 2076typedef uint32_t RUINT32T;
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706 2077
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2078void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2079{
1709 /* No saturation */ 2080 int sh_r, sh_g, sh_b;
1710 for (y = h; --y >= 0;) { 2081 RUINT32T mask_r, mask_g, mask_b;
1711 for (x = -w; x < 0; x++) { 2082 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1712 int r, g, b; 2083 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2084 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2085 int i;
1713 2086
1714 b = ((uint16_t *) ptr)[x]; 2087 Visual *visual = display->visual;
1715 r = (b & 0x7c00) * rm; 2088
1716 g = (b & 0x3e0) * gm; 2089 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1717 b = (b & 0x1f) * bm; 2090
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2091 /* for convenience */
1719 | ((g >> 8) & 0x3e0) 2092 mask_r = visual->red_mask;
1720 | ((b >> 8) & 0x1f); 2093 mask_g = visual->green_mask;
1721 } 2094 mask_b = visual->blue_mask;
1722 ptr += bpl; 2095
1723 } 2096 /* boring lookup table pre-initialization */
2097 switch (srcImage->bits_per_pixel) {
2098 case 15:
2099 if ((mask_r != 0x7c00) ||
2100 (mask_g != 0x03e0) ||
2101 (mask_b != 0x001f))
2102 return;
2103 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2104 lookup_r = lookup;
2105 lookup_g = lookup+32;
2106 lookup_b = lookup+32+32;
2107 sh_r = 10;
2108 sh_g = 5;
2109 sh_b = 0;
2110 break;
2111 case 16:
2112 if ((mask_r != 0xf800) ||
2113 (mask_g != 0x07e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+64;
2120 sh_r = 11;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 24:
2125 if ((mask_r != 0xff0000) ||
2126 (mask_g != 0x00ff00) ||
2127 (mask_b != 0x0000ff))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2130 lookup_r = lookup;
2131 lookup_g = lookup+256;
2132 lookup_b = lookup+256+256;
2133 sh_r = 16;
2134 sh_g = 8;
2135 sh_b = 0;
2136 break;
2137 case 32:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 default:
2151 return; /* we do not support this color depth */
2152 }
2153
2154 /* prepare limits for color transformation (each channel is handled separately) */
2155 if (shade < 0) {
2156 shade = -shade;
2157 if (shade < 0) shade = 0;
2158 if (shade > 100) shade = 100;
2159
2160 lower_lim_r = 65535-rm;
2161 lower_lim_g = 65535-gm;
2162 lower_lim_b = 65535-bm;
2163
2164 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2165 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2166 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2167
2168 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1724 } else { 2169 } else {
1725 for (y = h; --y >= 0;) { 2170 if (shade < 0) shade = 0;
1726 for (x = -w; x < 0; x++) { 2171 if (shade > 100) shade = 100;
1727 int r, g, b;
1728 2172
1729 b = ((uint16_t *) ptr)[x]; 2173 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1730 r = (b & 0x7c00) * rm; 2174
1731 g = (b & 0x3e0) * gm; 2175 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1732 b = (b & 0x1f) * bm; 2176 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1733 r |= (!(r >> 15) - 1); 2177 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1734 g |= (!(g >> 10) - 1); 2178 }
1735 b |= (!(b >> 5) - 1); 2179
1736 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2180 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1737 | ((g >> 8) & 0x3e0) 2181 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1738 | ((b >> 8) & 0x1f); 2182 {
1739 } 2183 unsigned int tmp;
1740 ptr += bpl; 2184
2185 tmp = lower_lim_r;
2186 lower_lim_r = lower_lim_b;
2187 lower_lim_b = tmp;
2188
2189 tmp = upper_lim_r;
2190 upper_lim_r = upper_lim_b;
2191 upper_lim_b = tmp;
2192 }
2193
2194 /* fill our lookup tables */
2195 for (i = 0; i <= mask_r>>sh_r; i++)
2196 {
2197 RUINT32T tmp;
2198 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2199 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2200 lookup_r[i] = (tmp/65535)<<sh_r;
2201 }
2202 for (i = 0; i <= mask_g>>sh_g; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2206 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2207 lookup_g[i] = (tmp/65535)<<sh_g;
2208 }
2209 for (i = 0; i <= mask_b>>sh_b; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2213 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2214 lookup_b[i] = (tmp/65535)<<sh_b;
2215 }
2216
2217 /* apply table to input image (replacing colors by newly calculated ones) */
2218 switch (srcImage->bits_per_pixel)
2219 {
2220 case 15:
2221 {
2222 unsigned short *p1, *pf, *p, *pl;
2223 p1 = (unsigned short *) srcImage->data;
2224 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2225 while (p1 < pf)
2226 {
2227 p = p1;
2228 pl = p1 + srcImage->width;
2229 for (; p < pl; p++)
1741 } 2230 {
2231 *p = lookup_r[(*p & 0x7c00)>>10] |
2232 lookup_g[(*p & 0x03e0)>> 5] |
2233 lookup_b[(*p & 0x001f)];
2234 }
2235 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1742 } 2236 }
1743} 2237 break;
1744 2238 }
1745/* RGB 16 */ 2239 case 16:
1746static void 2240 {
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2241 unsigned short *p1, *pf, *p, *pl;
1748{ 2242 p1 = (unsigned short *) srcImage->data;
1749 unsigned char *ptr; 2243 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1750 int x, y; 2244 while (p1 < pf)
1751 2245 {
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2246 p = p1;
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2247 pl = p1 + srcImage->width;
1754 /* No saturation */ 2248 for (; p < pl; p++)
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 } 2249 {
1769 } else { 2250 *p = lookup_r[(*p & 0xf800)>>11] |
1770 for (y = h; --y >= 0;) { 2251 lookup_g[(*p & 0x07e0)>> 5] |
1771 for (x = -w; x < 0; x++) { 2252 lookup_b[(*p & 0x001f)];
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 } 2253 }
1785 ptr += bpl; 2254 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2255 }
2256 break;
2257 }
2258 case 24:
2259 {
2260 unsigned char *p1, *pf, *p, *pl;
2261 p1 = (unsigned char *) srcImage->data;
2262 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2263 while (p1 < pf)
2264 {
2265 p = p1;
2266 pl = p1 + srcImage->width * 3;
2267 for (; p < pl; p += 3)
1786 } 2268 {
2269 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2270 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2271 p[2] = lookup_r[(p[2] & 0x0000ff)];
2272 }
2273 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2274 }
1788} 2275 break;
2276 }
2277 case 32:
2278 {
2279 RUINT32T *p1, *pf, *p, *pl;
2280 p1 = (RUINT32T *) srcImage->data;
2281 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1789 2282
1790/* RGB 24 */ 2283 while (p1 < pf)
1791static void 2284 {
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2285 p = p1;
1793{ 2286 pl = p1 + srcImage->width;
1794 unsigned char *ptr; 2287 for (; p < pl; p++)
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 } 2288 {
1822 } else { 2289 *p = lookup_r[(*p & 0xff0000)>>16] |
1823 for (y = h; --y >= 0;) { 2290 lookup_g[(*p & 0x00ff00)>> 8] |
1824 for (x = -(w * 3); x < 0; x += 3) { 2291 lookup_b[(*p & 0x0000ff)] |
1825 int r, g, b; 2292 (*p & ~0xffffff);
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 } 2293 }
1853 ptr += bpl; 2294 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1854 } 2295 }
2296 break;
2297 }
1855 } 2298 }
1856}
1857 2299
1858/* RGB 32 */ 2300 free (lookup);
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928} 2301}
1929
1930#endif 2302#endif
1931 2303
1932/* 2304/*
1933 * Check our parents are still who we think they are. 2305 * Check our parents are still who we think they are.
1934 * Do transparency updates if required 2306 * Do transparency updates if required
… …
1941 Atom atype; 2313 Atom atype;
1942 unsigned char *prop = NULL; 2314 unsigned char *prop = NULL;
1943 Window root, oldp, *list; 2315 Window root, oldp, *list;
1944 Pixmap rootpixmap = None; 2316 Pixmap rootpixmap = None;
1945 XWindowAttributes wattr, wrootattr; 2317 XWindowAttributes wattr, wrootattr;
2318 dDisp;
1946 2319
1947 pchanged = 0; 2320 pchanged = 0;
1948 2321
1949 if (!(Options & Opt_transparent)) 2322 if (!(options & Opt_transparent))
1950 return pchanged; /* Don't try any more */ 2323 return pchanged; /* Don't try any more */
1951 2324
1952 XGetWindowAttributes (display->display, display->root, &wrootattr); 2325 XGetWindowAttributes (disp, display->root, &wrootattr);
1953 rootdepth = wrootattr.depth; 2326 rootdepth = wrootattr.depth;
1954 2327
1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
1956 2329
1957 if (rootdepth != wattr.depth) 2330 if (rootdepth != wattr.depth)
1958 { 2331 {
1959 if (am_transparent) 2332 if (am_transparent)
1960 { 2333 {
1961 pchanged = 1; 2334 pchanged = 1;
1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1963 am_transparent = am_pixmap_trans = 0; 2336 am_transparent = am_pixmap_trans = 0;
1964 } 2337 }
1965 2338
1966 return pchanged; /* Don't try any more */ 2339 return pchanged; /* Don't try any more */
1967 } 2340 }
1968 2341
1969 /* Get all X ops out of the queue so that our information is up-to-date. */ 2342 /* Get all X ops out of the queue so that our information is up-to-date. */
1970 XSync (display->display, False); 2343 XSync (disp, False);
1971 2344
1972 /* 2345 /*
1973 * Make the frame window set by the window manager have 2346 * Make the frame window set by the window manager have
1974 * the root background. Some window managers put multiple nested frame 2347 * the root background. Some window managers put multiple nested frame
1975 * windows for each client, so we have to take care about that. 2348 * windows for each client, so we have to take care about that.
1976 */ 2349 */
1977 i = (xa[XA_XROOTPMAPID] 2350 i = (xa[XA_XROOTPMAP_ID]
1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2351 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2352 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1980 &nitems, &bytes_after, &prop) == Success); 2353 &nitems, &bytes_after, &prop) == Success);
1981 2354
1982 if (!i || prop == NULL) 2355 if (!i || prop == NULL)
1983 i = (xa[XA_XSETROOTID] 2356 i = (xa[XA_ESETROOT_PMAP_ID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2357 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success); 2359 &nitems, &bytes_after, &prop) == Success);
1987 2360
1988 if (!i || prop == NULL) 2361 if (!i || prop == NULL
2362#if TINTING
2363 || !rs[Rs_color + Color_tint]
2364#endif
2365 )
1989 have_pixmap = 0; 2366 have_pixmap = 0;
1990 else 2367 else
1991 { 2368 {
1992 have_pixmap = 1; 2369 have_pixmap = 1;
1993 rootpixmap = *(Pixmap *)prop; 2370 rootpixmap = *(Pixmap *)prop;
… …
2004 Window cr; 2381 Window cr;
2005 XImage *image; 2382 XImage *image;
2006 GC gc; 2383 GC gc;
2007 XGCValues gcvalue; 2384 XGCValues gcvalue;
2008 2385
2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2010 0, 0, &sx, &sy, &cr); 2387 0, 0, &sx, &sy, &cr);
2011 nw = (unsigned int)szHint.width; 2388 nw = (unsigned int)szHint.width;
2012 nh = (unsigned int)szHint.height; 2389 nh = (unsigned int)szHint.height;
2013 nx = ny = 0; 2390 nx = ny = 0;
2014 2391
… …
2026 sy = 0; 2403 sy = 0;
2027 } 2404 }
2028 2405
2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2408
2409 XSync (disp, False);
2031 allowedxerror = -1; 2410 allowedxerror = -1;
2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 2412
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2413 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2414 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2415 allowedxerror = 0;
2037 2416
… …
2040 if (am_transparent && am_pixmap_trans) 2419 if (am_transparent && am_pixmap_trans)
2041 { 2420 {
2042 pchanged = 1; 2421 pchanged = 1;
2043 if (TermWin.pixmap != None) 2422 if (TermWin.pixmap != None)
2044 { 2423 {
2045 XFreePixmap (display->display, TermWin.pixmap); 2424 XFreePixmap (disp, TermWin.pixmap);
2046 TermWin.pixmap = None; 2425 TermWin.pixmap = None;
2047 } 2426 }
2048 } 2427 }
2049 2428
2050 am_pixmap_trans = 0; 2429 am_pixmap_trans = 0;
2051 } 2430 }
2052 else 2431 else
2053 { 2432 {
2054 if (TermWin.pixmap != None) 2433 if (TermWin.pixmap != None)
2055 XFreePixmap (display->display, TermWin.pixmap); 2434 XFreePixmap (disp, TermWin.pixmap);
2056 2435
2057#if TINTING 2436#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint)) 2437 if (ISSET_PIXCOLOR (Color_tint))
2059 { 2438 {
2060 unsigned short shade, rm, gm, bm; 2439 unsigned short rm, gm, bm;
2440 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2061 2441
2062 PixColors[Color_tint].get (display, rm, gm, bm); 2442 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2063 2443
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2444 ShadeXImage (display, image, shade, rm, gm, bm);
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 } 2445 }
2075#endif 2446#endif
2076 2447
2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2078 szHint.width, szHint.height, image->depth); 2449 szHint.width, szHint.height, image->depth);
2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2081 nx, ny, image->width, image->height); 2452 nx, ny, image->width, image->height);
2082 XFreeGC (display->display, gc); 2453 XFreeGC (disp, gc);
2083 XDestroyImage (image); 2454 XDestroyImage (image);
2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2085 TermWin.pixmap); 2456 XClearWindow (disp, TermWin.parent[0]);
2086 2457
2087 if (!am_transparent || !am_pixmap_trans) 2458 if (!am_transparent || !am_pixmap_trans)
2088 pchanged = 1; 2459 pchanged = 1;
2089 2460
2090 am_transparent = am_pixmap_trans = 1; 2461 am_transparent = am_pixmap_trans = 1;
2091 } 2462 }
2092 } 2463 }
2093 2464
2094 if (!am_pixmap_trans) 2465 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2467 else
2095 { 2468 {
2096 unsigned int n; 2469 unsigned int n;
2097 /* 2470 /*
2098 * InheritPixmap transparency 2471 * InheritPixmap transparency
2099 */ 2472 */
2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2102 { 2474 {
2103 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2104 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (disp, TermWin.parent[i - 1], &root,
2105 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2106 XFree (list); 2478 XFree (list);
2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108 2479
2109 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2110 { 2481 {
2111 if (oldp != None) 2482 if (oldp != None)
2112 pchanged = 1; 2483 pchanged = 1;
… …
2122 2493
2123 if (pchanged) 2494 if (pchanged)
2124 { 2495 {
2125 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2126 { 2497 {
2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2128 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2129 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2130 { 2500 {
2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2132 break; 2502 break;
2133 } 2503 }
2134 } 2504 }
2135 } 2505 }
2136 2506
2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2138 { 2508 {
2139 D_X ((stderr, "InheritPixmap Turning off"));
2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2142 am_transparent = 0; 2511 am_transparent = 0;
2143 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2144 } 2513 }
2145 else 2514 else
2146 { 2515 {
2147#if WAIT_FOR_WM 2516#if WAIT_FOR_WM
2148 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2149 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2150 sleep (1); 2519 sleep (1);
2151#endif 2520#endif
2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2153 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]);
2525 }
2155 2526
2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2157 am_transparent = 1; 2528 am_transparent = 1;
2158 } 2529 }
2159 2530
2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2161 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2540 }
2541
2542 if (am_transparent)
2543 {
2544 want_refresh = want_full_refresh = 1;
2545 if (am_pixmap_trans)
2546 flush ();
2162 } 2547 }
2163 2548
2164 return pchanged; 2549 return pchanged;
2165} 2550}
2166#endif 2551#endif
… …
2185 if (ch == NOCHAR) // TODO: improve 2570 if (ch == NOCHAR) // TODO: improve
2186 break; 2571 break;
2187 2572
2188 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2573 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2189 { 2574 {
2575 if (!seen_input)
2576 {
2577 seen_input = 1;
2578 // many badly-written programs (e.g. jed) contain a race condition:
2579 // they first read the screensize and then install a SIGWINCH handler.
2580 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized.
2585 if (seen_resize)
2586 kill (-cmd_pid, SIGWINCH);
2587 }
2588
2190 /* Read a text string from the input buffer */ 2589 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ]; 2590 unicode_t buf[UBUFSIZ];
2192 bool refreshnow = false; 2591 bool refreshnow = false;
2193 int nlines = 0; 2592 int nlines = 0;
2194 unicode_t *str = buf; 2593 unicode_t *str = buf;
2195 2594
2196 *str++ = ch;
2197
2198 for (;;) 2595 for (;;)
2199 { 2596 {
2200 seq_begin = cmdbuf_ptr;
2201 ch = next_char ();
2202
2203 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break; 2598 break;
2205 2599
2206 *str++ = ch; 2600 *str++ = ch;
2207 2601
2208 if (ch == C0_LF) 2602 if (ch == C0_LF)
2209 { 2603 {
2210 nlines++; 2604 nlines++;
2211 refresh_count++; 2605 refresh_count++;
2212 2606
2213 if (! (Options & Opt_jumpScroll) 2607 if (!(options & Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2215 { 2609 {
2216 refreshnow = true; 2610 refreshnow = true;
2217 flag = true;
2218 ch = NOCHAR; 2611 ch = NOCHAR;
2219 break; 2612 break;
2220 } 2613 }
2221 2614
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2223 if (nlines >= TermWin.nrow - 1) 2616 if (nlines >= TermWin.nrow - 1)
2224 { 2617 {
2225 scr_add_lines (buf, nlines, str - buf); 2618 scr_add_lines (buf, nlines, str - buf);
2226 nlines = 0; 2619 nlines = 0;
2227 str = buf; 2620 str = buf;
… …
2231 if (str >= buf + UBUFSIZ) 2624 if (str >= buf + UBUFSIZ)
2232 { 2625 {
2233 ch = NOCHAR; 2626 ch = NOCHAR;
2234 break; 2627 break;
2235 } 2628 }
2629
2630 seq_begin = cmdbuf_ptr;
2631 ch = next_char ();
2236 } 2632 }
2237 2633
2238 scr_add_lines (buf, nlines, str - buf); 2634 scr_add_lines (buf, nlines, str - buf);
2239 2635
2240 /* 2636 /*
2241 * If there have been a lot of new lines, then update the screen 2637 * If there have been a lot of new lines, then update the screen
2242 * What the heck I'll cheat and only refresh less than every page-full. 2638 * What the heck I'll cheat and only refresh less than every page-full.
2243 * the number of pages between refreshes is refresh_limit, which 2639 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling. 2640 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */ 2641 */
2249 if (refreshnow) 2642 if (refreshnow)
2250 { 2643 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++; 2645 refresh_limit++;
2253 else 2646 else
2647 {
2648 flag = true;
2254 scr_refresh (refresh_type); 2649 scr_refresh (refresh_type);
2650 }
2255 } 2651 }
2256 2652
2257 } 2653 }
2258 else 2654 else
2259 { 2655 {
… …
2273 } 2669 }
2274 2670
2275 return flag; 2671 return flag;
2276} 2672}
2277 2673
2674// read the next octet
2675unicode_t
2676rxvt_term::next_octet ()
2677{
2678 return cmdbuf_ptr < cmdbuf_endp
2679 ? *cmdbuf_ptr++
2680 : NOCHAR;
2681}
2682
2278// read the next character 2683// read the next character
2279unicode_t 2684unicode_t
2280rxvt_term::next_char () 2685rxvt_term::next_char ()
2281{ 2686{
2282 while (cmdbuf_ptr < cmdbuf_endp) 2687 while (cmdbuf_ptr < cmdbuf_endp)
… …
2298 if (len == (size_t)-1) 2703 if (len == (size_t)-1)
2299 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2704 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2300 2705
2301 // assume wchar == unicode 2706 // assume wchar == unicode
2302 cmdbuf_ptr += len; 2707 cmdbuf_ptr += len;
2303 return wc; 2708 return wc & UNICODE_MASK;
2304 } 2709 }
2305 2710
2306 return NOCHAR; 2711 return NOCHAR;
2307} 2712}
2308 2713
… …
2313 */ 2718 */
2314unicode_t 2719unicode_t
2315rxvt_term::cmd_getc () 2720rxvt_term::cmd_getc ()
2316{ 2721{
2317 unicode_t c = next_char (); 2722 unicode_t c = next_char ();
2723
2724 if (c == NOCHAR)
2725 throw out_of_input;
2726
2727 return c;
2728}
2729
2730unicode_t
2731rxvt_term::cmd_get8 ()
2732{
2733 unicode_t c = next_octet ();
2318 2734
2319 if (c == NOCHAR) 2735 if (c == NOCHAR)
2320 throw out_of_input; 2736 throw out_of_input;
2321 2737
2322 return c; 2738 return c;
… …
2423 process_escape_seq (); 2839 process_escape_seq ();
2424 break; 2840 break;
2425 case C0_ENQ: /* terminal Status */ 2841 case C0_ENQ: /* terminal Status */
2426 if (rs[Rs_answerbackstring]) 2842 if (rs[Rs_answerbackstring])
2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2428 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2429 else 2845 else
2430 tt_write ((unsigned char *)VT100_ANS, 2846 tt_write ((unsigned char *)VT100_ANS,
2431 (unsigned int)STRLEN (VT100_ANS)); 2847 (unsigned int)strlen (VT100_ANS));
2432 break; 2848 break;
2433 case C0_BEL: /* bell */ 2849 case C0_BEL: /* bell */
2434 scr_bell (); 2850 scr_bell ();
2435 break; 2851 break;
2436 case C0_BS: /* backspace */ 2852 case C0_BS: /* backspace */
… …
2452 break; 2868 break;
2453 case C0_SI: /* shift in - acs */ 2869 case C0_SI: /* shift in - acs */
2454 scr_charset_choose (0); 2870 scr_charset_choose (0);
2455 break; 2871 break;
2456 2872
2873#ifdef EIGHT_BIT_CONTROLS
2457 // 8-bit controls 2874 // 8-bit controls
2458 case 0x90: /* DCS */ 2875 case 0x90: /* DCS */
2459 process_dcs_seq (); 2876 process_dcs_seq ();
2460 break; 2877 break;
2461 case 0x9b: /* CSI */ 2878 case 0x9b: /* CSI */
2462 process_csi_seq (); 2879 process_csi_seq ();
2463 break; 2880 break;
2464 case 0x9d: /* CSI */ 2881 case 0x9d: /* CSI */
2465 process_osc_seq (); 2882 process_osc_seq ();
2466 break; 2883 break;
2884#endif
2467 } 2885 }
2468} 2886}
2469/*}}} */ 2887/*}}} */
2470 2888
2471 2889
… …
2533void 2951void
2534rxvt_term::process_escape_seq () 2952rxvt_term::process_escape_seq ()
2535{ 2953{
2536 unicode_t ch = cmd_getc (); 2954 unicode_t ch = cmd_getc ();
2537 2955
2538 if (PrivateModes & PrivMode_vt52) 2956 if (priv_modes & PrivMode_vt52)
2539 { 2957 {
2540 process_escape_vt52 (ch); 2958 process_escape_vt52 (ch);
2541 return; 2959 return;
2542 } 2960 }
2543 2961
… …
2558 scr_charset_set (2, (unsigned int)cmd_getc ()); 2976 scr_charset_set (2, (unsigned int)cmd_getc ());
2559 break; 2977 break;
2560 case '+': 2978 case '+':
2561 scr_charset_set (3, (unsigned int)cmd_getc ()); 2979 scr_charset_set (3, (unsigned int)cmd_getc ());
2562 break; 2980 break;
2563#ifndef NO_FRILLS 2981#if ENABLE_FRILLS
2564 case '6': 2982 case '6':
2565 scr_backindex (); 2983 scr_backindex ();
2566 break; 2984 break;
2567#endif 2985#endif
2568 case '7': 2986 case '7':
2569 scr_cursor (SAVE); 2987 scr_cursor (SAVE);
2570 break; 2988 break;
2571 case '8': 2989 case '8':
2572 scr_cursor (RESTORE); 2990 scr_cursor (RESTORE);
2573 break; 2991 break;
2574#ifndef NO_FRILLS 2992#if ENABLE_FRILLS
2575 case '9': 2993 case '9':
2576 scr_forwardindex (); 2994 scr_forwardindex ();
2577 break; 2995 break;
2578#endif 2996#endif
2579 case '=': 2997 case '=':
… …
2878 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2879 break; 3297 break;
2880 3298
2881 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2882 tt_write ((const unsigned char *)VT100_ANS, 3300 tt_write ((const unsigned char *)VT100_ANS,
2883 (unsigned int) (sizeof (VT100_ANS) - 1)); 3301 (unsigned int) (sizeof (VT100_ANS) - 1));
2884 break; 3302 break;
2885 3303
2886 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2887 process_sgr_mode (nargs, arg); 3305 process_sgr_mode (nargs, arg);
2888 break; 3306 break;
… …
2895 break; 3313 break;
2896 case 6: /* CPR requested */ 3314 case 6: /* CPR requested */
2897 scr_report_position (); 3315 scr_report_position ();
2898 break; 3316 break;
2899 case 7: /* unofficial extension */ 3317 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure) 3318 if (options & Opt_insecure)
2901 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3319 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2902 break; 3320 break;
2903 case 8: /* unofficial extension */ 3321 case 8: /* unofficial extension */
2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2905 break; 3323 break;
2906 } 3324 }
… …
2942 break; 3360 break;
2943 3361
2944 case CSI_RM: /* 8.3.107: RESET MODE */ 3362 case CSI_RM: /* 8.3.107: RESET MODE */
2945 if (arg[0] == 4) 3363 if (arg[0] == 4)
2946 scr_insert_mode (0); 3364 scr_insert_mode (0);
3365 else if (arg[0] == 20)
3366 priv_modes &= ~PrivMode_LFNL;
2947 break; 3367 break;
2948 3368
2949 case CSI_SM: /* 8.3.126: SET MODE */ 3369 case CSI_SM: /* 8.3.126: SET MODE */
2950 if (arg[0] == 4) 3370 if (arg[0] == 4)
2951 scr_insert_mode (1); 3371 scr_insert_mode (1);
3372 else if (arg[0] == 20)
3373 priv_modes |= PrivMode_LFNL;
2952 break; 3374 break;
2953 3375
2954 /* 3376 /*
2955 * PRIVATE USE beyond this point. All CSI_7? sequences here 3377 * PRIVATE USE beyond this point. All CSI_7? sequences here
2956 */ 3378 */
… …
2968 break; 3390 break;
2969 case CSI_75: 3391 case CSI_75:
2970 scr_cursor (RESTORE); 3392 scr_cursor (RESTORE);
2971 break; 3393 break;
2972 3394
2973#ifndef NO_FRILLS 3395#if ENABLE_FRILLS
2974 case CSI_74: 3396 case CSI_74:
2975 process_window_ops (arg, nargs); 3397 process_window_ops (arg, nargs);
2976 break; 3398 break;
2977#endif 3399#endif
2978 3400
… …
2985 break; 3407 break;
2986 } 3408 }
2987} 3409}
2988/*}}} */ 3410/*}}} */
2989 3411
2990#ifndef NO_FRILLS 3412#if ENABLE_FRILLS
2991/* ARGSUSED */ 3413/* ARGSUSED */
2992void 3414void
2993rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3415rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2994{ 3416{
2995 int x, y; 3417 int x, y;
2996 XWindowAttributes wattr; 3418 XWindowAttributes wattr;
2997 Window wdummy; 3419 Window wdummy;
3420 dDisp;
2998 3421
2999 if (nargs == 0) 3422 if (nargs == 0)
3000 return; 3423 return;
3001 3424
3002 switch (args[0]) 3425 switch (args[0])
3003 { 3426 {
3004 /* 3427 /*
3005 * commands 3428 * commands
3006 */ 3429 */
3007 case 1: /* deiconify window */ 3430 case 1: /* deiconify window */
3008 XMapWindow (display->display, TermWin.parent[0]); 3431 XMapWindow (disp, TermWin.parent[0]);
3009 break; 3432 break;
3010 case 2: /* iconify window */ 3433 case 2: /* iconify window */
3011 XIconifyWindow (display->display, TermWin.parent[0], 3434 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3012 DefaultScreen (display->display));
3013 break; 3435 break;
3014 case 3: /* set position (pixels) */ 3436 case 3: /* set position (pixels) */
3015 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3016 break; 3438 break;
3017 case 4: /* set size (pixels) */ 3439 case 4: /* set size (pixels) */
3018 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3019 break; 3441 break;
3020 case 5: /* raise window */ 3442 case 5: /* raise window */
3021 XRaiseWindow (display->display, TermWin.parent[0]); 3443 XRaiseWindow (disp, TermWin.parent[0]);
3022 break; 3444 break;
3023 case 6: /* lower window */ 3445 case 6: /* lower window */
3024 XLowerWindow (display->display, TermWin.parent[0]); 3446 XLowerWindow (disp, TermWin.parent[0]);
3025 break; 3447 break;
3026 case 7: /* refresh window */ 3448 case 7: /* refresh window */
3027 scr_touch (true); 3449 scr_touch (true);
3028 break; 3450 break;
3029 case 8: /* set size (chars) */ 3451 case 8: /* set size (chars) */
… …
3041 3463
3042 /* 3464 /*
3043 * reports - some output format copied from XTerm 3465 * reports - some output format copied from XTerm
3044 */ 3466 */
3045 case 11: /* report window state */ 3467 case 11: /* report window state */
3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3048 break; 3470 break;
3049 case 13: /* report window position */ 3471 case 13: /* report window position */
3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3052 -wattr.border_width, -wattr.border_width, 3474 -wattr.border_width, -wattr.border_width,
3053 &x, &y, &wdummy); 3475 &x, &y, &wdummy);
3054 tt_printf ("\033[3;%d;%dt", x, y); 3476 tt_printf ("\033[3;%d;%dt", x, y);
3055 break; 3477 break;
3056 case 14: /* report window size (pixels) */ 3478 case 14: /* report window size (pixels) */
3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3059 break; 3481 break;
3060 case 18: /* report text area size (chars) */ 3482 case 18: /* report text area size (chars) */
3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3062 break; 3484 break;
3063 case 19: /* report window size (chars) */ 3485 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3065 break; 3487 break;
3066 case 20: /* report icon label */ 3488 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 { 3489 {
3069 char *s; 3490 char *s;
3070 XGetIconName (display->display, TermWin.parent[0], &s); 3491 XGetIconName (disp, TermWin.parent[0], &s);
3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s);
3072 } 3494 }
3073 break; 3495 break;
3074 case 21: /* report window title */ 3496 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 { 3497 {
3077 char *s; 3498 char *s;
3078 XFetchName (display->display, TermWin.parent[0], &s); 3499 XFetchName (disp, TermWin.parent[0], &s);
3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s);
3080 } 3502 }
3081 break; 3503 break;
3082 } 3504 }
3083} 3505}
3084#endif 3506#endif
3085 3507
… …
3089 * ends_how is terminator used. returned input must be free()'d 3511 * ends_how is terminator used. returned input must be free()'d
3090 */ 3512 */
3091unsigned char * 3513unsigned char *
3092rxvt_term::get_to_st (unicode_t &ends_how) 3514rxvt_term::get_to_st (unicode_t &ends_how)
3093{ 3515{
3094 int seen_esc = 0; /* seen escape? */ 3516 unicode_t ch;
3517 bool seen_esc = false;
3095 unsigned int n = 0; 3518 unsigned int n = 0;
3096 unsigned char *s;
3097 unicode_t ch;
3098 unsigned char string[STRING_MAX]; 3519 wchar_t string[STRING_MAX];
3099 3520
3100 while ((ch = cmd_getc ())) 3521 while ((ch = cmd_getc ()) != NOCHAR)
3101 { 3522 {
3102 if (ch == C0_BEL || ch == CHAR_ST)
3103 break;
3104
3105 if (seen_esc) 3523 if (seen_esc)
3524 {
3106 if (ch == 0x5c) /* 7bit ST */ 3525 if (ch == 0x5c) /* 7bit ST */
3107 break; 3526 break;
3108 else 3527 else
3109 return NULL; 3528 return NULL;
3110 3529 }
3111 if (ch == C0_ESC) 3530 else if (ch == C0_ESC)
3112 { 3531 {
3113 seen_esc = 1; 3532 seen_esc = true;
3114 continue; 3533 continue;
3115 } 3534 }
3535 else if (ch == C0_BEL || ch == CHAR_ST)
3536 break;
3116 else if (ch == C0_HT) 3537 else if (ch < 0x20)
3117 ch = ' '; /* translate '\t' to space */
3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3119 return NULL; /* other control character - exit */ 3538 return NULL; /* other control character - exit */
3539
3540 seen_esc = false;
3120 3541
3121 if (n >= sizeof (string) - 1) 3542 if (n >= sizeof (string) - 1)
3122 // stop at some sane length 3543 // stop at some sane length
3123 return NULL; 3544 return NULL;
3124 3545
3546 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 ();
3548 else
3125 string[n++] = ch; 3549 string[n++] = ch;
3126 seen_esc = 0;
3127 } 3550 }
3128 3551
3129 string[n++] = '\0'; 3552 string[n++] = '\0';
3130 3553
3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3132 return NULL;
3133
3134 ends_how = (ch == 0x5c ? C0_ESC : ch); 3554 ends_how = (ch == 0x5c ? C0_ESC : ch);
3135 STRNCPY (s, string, n); 3555
3136 return s; 3556 return (unsigned char *)rxvt_wcstombs (string);
3137} 3557}
3138 3558
3139/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
3140/* 3560/*
3141 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3561 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3185void 3605void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3606rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3187{ 3607{
3188 if (str[0] == '?' && !str[1]) 3608 if (str[0] == '?' && !str[1])
3189 { 3609 {
3190 if (Options & Opt_insecure)
3191 {
3192 unsigned short r, g, b; 3610 unsigned short r, g, b;
3193 PixColors[color].get (display, r, g, b); 3611 pix_colors_focused[color].get (display, r, g, b);
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3612 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3195 }
3196 } 3613 }
3197 else 3614 else
3198 set_window_color (color, str); 3615 set_window_color (color, str);
3199} 3616}
3200 3617
… …
3228{ 3645{
3229 int changed = 0; 3646 int changed = 0;
3230 int color; 3647 int color;
3231 char *buf, *name; 3648 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1]; 3649 bool query = str[0] == '?' && !str[1];
3650 int saveop = op;
3651 dDisp;
3233 3652
3234 assert (str != NULL); 3653 assert (str != NULL);
3235 switch (op) 3654 switch (op)
3236 { 3655 {
3237 case XTerm_name: 3656 case XTerm_name:
… …
3244 set_title (str); 3663 set_title (str);
3245 break; 3664 break;
3246 case XTerm_property: 3665 case XTerm_property:
3247 if (str[0] == '?') 3666 if (str[0] == '?')
3248 { 3667 {
3249 Atom prop = XInternAtom (display->display, str + 1, True); 3668 Atom prop = display->atom (str + 1);
3250 Atom actual_type; 3669 Atom actual_type;
3251 int actual_format; 3670 int actual_format;
3252 unsigned long nitems; 3671 unsigned long nitems;
3253 unsigned long bytes_after; 3672 unsigned long bytes_after;
3254 unsigned char *value = 0; 3673 unsigned char *value = 0;
3255 const char *str = ""; 3674 const char *str = "";
3256 3675
3257 if (prop 3676 if (prop
3258 && XGetWindowProperty (display->display, TermWin.parent[0], 3677 && XGetWindowProperty (disp, TermWin.parent[0],
3259 prop, 0, 1<<16, 0, AnyPropertyType, 3678 prop, 0, 1<<16, 0, AnyPropertyType,
3260 &actual_type, &actual_format, 3679 &actual_type, &actual_format,
3261 &nitems, &bytes_after, &value) == Success 3680 &nitems, &bytes_after, &value) == Success
3262 && actual_type != None 3681 && actual_type != None
3263 && actual_format == 8) 3682 && actual_format == 8)
… …
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3691 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273 3692
3274 if (eq) 3693 if (eq)
3275 { 3694 {
3276 *eq = 0; 3695 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0], 3696 set_utf8_property (display->atom (str), eq + 1);
3278 display->atom (str), XA_STRING, 8,
3279 PropModeReplace, (unsigned char *)eq + 1,
3280 strlen (eq + 1));
3281 } 3697 }
3282 else 3698 else
3283 XDeleteProperty (display->display, TermWin.parent[0], 3699 XDeleteProperty (disp, TermWin.parent[0],
3284 display->atom (str)); 3700 display->atom (str));
3285 } 3701 }
3286 break; 3702 break;
3287 3703
3288 case XTerm_Color: 3704 case XTerm_Color:
3289 for (buf = (char *)str; buf && *buf;) 3705 for (buf = (char *)str; buf && *buf;)
3290 { 3706 {
3291 if ((name = STRCHR (buf, ';')) == NULL) 3707 if ((name = strchr (buf, ';')) == NULL)
3292 break; 3708 break;
3293 3709
3294 *name++ = '\0'; 3710 *name++ = '\0';
3295 color = atoi (buf); 3711 color = atoi (buf);
3296 3712
3297 if (color < 0 || color >= TOTAL_COLORS) 3713 if (color < 0 || color >= TOTAL_COLORS)
3298 break; 3714 break;
3299 3715
3300 if ((buf = STRCHR (name, ';')) != NULL) 3716 if ((buf = strchr (name, ';')) != NULL)
3301 *buf++ = '\0'; 3717 *buf++ = '\0';
3302 3718
3303 if (name[0] == '?' && !name[1]) 3719 if (name[0] == '?' && !name[1])
3304 { 3720 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b; 3721 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b); 3722 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3309 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3723 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 } 3724 }
3312 else 3725 else
3313 set_window_color (color + minCOLOR, name); 3726 set_window_color (color + minCOLOR, name);
3314 } 3727 }
3315 break; 3728 break;
… …
3332 break; 3745 break;
3333#ifndef NO_BOLD_UNDERLINE_REVERSE 3746#ifndef NO_BOLD_UNDERLINE_REVERSE
3334 case XTerm_Color_BD: 3747 case XTerm_Color_BD:
3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3336 break; 3749 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3337 case XTerm_Color_UL: 3753 case XTerm_Color_UL:
3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3339 break; 3755 break;
3340 case XTerm_Color_RV: 3756 case XTerm_Color_RV:
3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758 break;
3759#endif
3760#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3763 check_our_parents ();
3764 if (am_transparent)
3765 want_full_refresh = want_refresh = 1;
3342 break; 3766 break;
3343#endif 3767#endif
3344 3768
3345 case XTerm_Pixmap: 3769 case XTerm_Pixmap:
3346 if (*str != ';') 3770 if (*str != ';')
… …
3349 scale_pixmap (""); /* reset to default scaling */ 3773 scale_pixmap (""); /* reset to default scaling */
3350 set_bgPixmap (str); /* change pixmap */ 3774 set_bgPixmap (str); /* change pixmap */
3351#endif 3775#endif
3352 scr_touch (true); 3776 scr_touch (true);
3353 } 3777 }
3354 while ((str = STRCHR (str, ';')) != NULL) 3778 while ((str = strchr (str, ';')) != NULL)
3355 { 3779 {
3356 str++; 3780 str++;
3357#if XPM_BACKGROUND 3781#if XPM_BACKGROUND
3358 changed += scale_pixmap (str); 3782 changed += scale_pixmap (str);
3359#endif 3783#endif
3360
3361 } 3784 }
3785
3362 if (changed) 3786 if (changed)
3363 { 3787 {
3364#ifdef XPM_BACKGROUND 3788#ifdef XPM_BACKGROUND
3365 resize_pixmap (); 3789 resize_pixmap ();
3366#endif 3790#endif
… …
3378 case XTerm_logfile: 3802 case XTerm_logfile:
3379 // TODO, when secure mode? 3803 // TODO, when secure mode?
3380 break; 3804 break;
3381 3805
3382 case XTerm_font: 3806 case XTerm_font:
3807 op = URxvt_font;
3808 case URxvt_font:
3809#if ENABLE_STYLES
3810 case URxvt_boldFont:
3811 case URxvt_italicFont:
3812 case URxvt_boldItalicFont:
3813#endif
3383 if (query) 3814 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3818 resp);
3819 else
3384 { 3820 {
3385 if (Options & Opt_insecure) 3821 const char *&res = rs[Rs_font + (op - URxvt_font)];
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3822
3387 TermWin.fontset->fontdesc 3823 res = strdup (str);
3388 ? TermWin.fontset->fontdesc 3824 allocated.push_back ((void *)res);
3389 : "", 3825 set_fonts ();
3390 resp);
3391 } 3826 }
3392 else
3393 change_font (str);
3394 break; 3827 break;
3395 3828
3396#ifndef NO_FRILLS 3829#if ENABLE_FRILLS
3397 case XTerm_locale: 3830 case XTerm_locale:
3398 if (query) 3831 if (query)
3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3402 }
3403 else 3833 else
3404 { 3834 {
3405 set_locale (str); 3835 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8);
3406# ifdef USE_XIM 3837# ifdef USE_XIM
3407 im_cb (); 3838 im_cb ();
3408# endif 3839# endif
3409 } 3840 }
3410 break; 3841 break;
3411
3412 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3414 {
3415 int fid = TermWin.fontset->find_font (atoi (str));
3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp);
3418 }
3419 break;
3420#endif 3842#endif
3421 3843
3422#ifdef MENUBAR 3844#ifdef MENUBAR
3423 case XTerm_Menu: 3845 case XTerm_Menu:
3424 if (Options & Opt_insecure) 3846 if (options & Opt_insecure)
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3426 break; 3848 break;
3427#endif 3849#endif
3428#if 0 3850#if 0
3429 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
… …
3456{ 3878{
3457 int state; 3879 int state;
3458 3880
3459 if (mode == 's') 3881 if (mode == 's')
3460 { 3882 {
3461 SavedModes |= (PrivateModes & bit); 3883 SavedModes |= (priv_modes & bit);
3462 return -1; 3884 return -1;
3463 } 3885 }
3464 else 3886 else
3465 { 3887 {
3466 if (mode == 'r') 3888 if (mode == 'r')
3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3889 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3468 else 3890 else
3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3891 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3470 PrivMode (state, bit); 3892 PrivMode (state, bit);
3471 } 3893 }
3472 3894
3473 return state; 3895 return state;
3474} 3896}
… …
3492 { 3, PrivMode_132 }, 3914 { 3, PrivMode_132 },
3493 { 4, PrivMode_smoothScroll }, 3915 { 4, PrivMode_smoothScroll },
3494 { 5, PrivMode_rVideo }, 3916 { 5, PrivMode_rVideo },
3495 { 6, PrivMode_relOrigin }, 3917 { 6, PrivMode_relOrigin },
3496 { 7, PrivMode_Autowrap }, 3918 { 7, PrivMode_Autowrap },
3919 // 8, bi-directional support mode
3497 { 9, PrivMode_MouseX10 }, 3920 { 9, PrivMode_MouseX10 },
3498#ifdef menuBar_esc 3921#ifdef menuBar_esc
3499 { menuBar_esc, PrivMode_menuBar }, 3922 { menuBar_esc, PrivMode_menuBar },
3500#endif 3923#endif
3924 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor },
3501#ifdef scrollBar_esc 3926#ifdef scrollBar_esc
3502 { scrollBar_esc, PrivMode_scrollBar }, 3927 { scrollBar_esc, PrivMode_scrollBar },
3503#endif 3928#endif
3504 // 18, 19 printing-related
3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3507 { 35, PrivMode_ShiftKeys }, // rxvt extension 3929 { 35, PrivMode_ShiftKeys }, // rxvt extension
3508 { 40, PrivMode_132OK }, 3930 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI 3931 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI 3932 // 45 margin bell NYI
3511 // 46 start logging 3933 // 46 start logging
… …
3552 3974
3553 /* extra handling for values with state unkept */ 3975 /* extra handling for values with state unkept */
3554 switch (arg[i]) 3976 switch (arg[i])
3555 { 3977 {
3556 case 1048: /* alternative cursor save */ 3978 case 1048: /* alternative cursor save */
3979 case 1049:
3557 if (Options & Opt_secondaryScreen) 3980 if (options & Opt_secondaryScreen)
3558 if (mode == 0) 3981 if (mode == 0)
3559 scr_cursor (RESTORE); 3982 scr_cursor (RESTORE);
3560 else if (mode == 1) 3983 else if (mode == 1)
3561 scr_cursor (SAVE); 3984 scr_cursor (SAVE);
3562 break; 3985 break;
… …
3573 * within VT52 mode 3996 * within VT52 mode
3574 */ 3997 */
3575 PrivMode (1, PrivMode_vt52); 3998 PrivMode (1, PrivMode_vt52);
3576 break; 3999 break;
3577 case 3: /* 80/132 */ 4000 case 3: /* 80/132 */
3578 if (PrivateModes & PrivMode_132OK) 4001 if (priv_modes & PrivMode_132OK)
3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3580 break; 4003 break;
3581 case 4: /* smooth scrolling */ 4004 case 4: /* smooth scrolling */
3582 if (state) 4005 if (state)
3583 Options &= ~Opt_jumpScroll; 4006 options &= ~Opt_jumpScroll;
3584 else 4007 else
3585 Options |= Opt_jumpScroll; 4008 options |= Opt_jumpScroll;
3586 break; 4009 break;
3587 case 5: /* reverse video */ 4010 case 5: /* reverse video */
3588 scr_rvideo_mode (state); 4011 scr_rvideo_mode (state);
3589 break; 4012 break;
3590 case 6: /* relative/absolute origins */ 4013 case 6: /* relative/absolute origins */
… …
3594 scr_autowrap (state); 4017 scr_autowrap (state);
3595 break; 4018 break;
3596 /* case 8: - auto repeat, can't do on a per window basis */ 4019 /* case 8: - auto repeat, can't do on a per window basis */
3597 case 9: /* X10 mouse reporting */ 4020 case 9: /* X10 mouse reporting */
3598 if (state) /* orthogonal */ 4021 if (state) /* orthogonal */
3599 PrivateModes &= ~PrivMode_MouseX11; 4022 priv_modes &= ~PrivMode_MouseX11;
3600 break; 4023 break;
3601#ifdef menuBar_esc 4024#ifdef menuBar_esc
3602 case menuBar_esc: 4025 case menuBar_esc:
3603#ifdef MENUBAR 4026#ifdef MENUBAR
3604 map_menuBar (state); 4027 map_menuBar (state);
… …
3624 break; 4047 break;
3625 /* case 66: - application key pad */ 4048 /* case 66: - application key pad */
3626 /* case 67: - backspace key */ 4049 /* case 67: - backspace key */
3627 case 1000: /* X11 mouse reporting */ 4050 case 1000: /* X11 mouse reporting */
3628 if (state) /* orthogonal */ 4051 if (state) /* orthogonal */
3629 PrivateModes &= ~PrivMode_MouseX10; 4052 priv_modes &= ~PrivMode_MouseX10;
3630 break; 4053 break;
3631#if 0 4054#if 0
3632 case 1001: 4055 case 1001:
3633 break; /* X11 mouse highlighting */ 4056 break; /* X11 mouse highlighting */
3634#endif 4057#endif
3635 case 1010: /* scroll to bottom on TTY output inhibit */ 4058 case 1010: /* scroll to bottom on TTY output inhibit */
3636 if (state) 4059 if (state)
3637 Options &= ~Opt_scrollTtyOutput; 4060 options &= ~Opt_scrollTtyOutput;
3638 else 4061 else
3639 Options |= Opt_scrollTtyOutput; 4062 options |= Opt_scrollTtyOutput;
3640 break; 4063 break;
3641 case 1011: /* scroll to bottom on key press */ 4064 case 1011: /* scroll to bottom on key press */
3642 if (state) 4065 if (state)
3643 Options |= Opt_scrollTtyKeypress; 4066 options |= Opt_scrollTtyKeypress;
3644 else 4067 else
3645 Options &= ~Opt_scrollTtyKeypress; 4068 options &= ~Opt_scrollTtyKeypress;
3646 break; 4069 break;
3647 case 1047: /* secondary screen w/ clearing last */ 4070 case 1047: /* secondary screen w/ clearing last */
3648 if (Options & Opt_secondaryScreen) 4071 if (options & Opt_secondaryScreen)
3649 if (current_screen != PRIMARY) 4072 if (current_screen != PRIMARY)
3650 scr_erase_screen (2); 4073 scr_erase_screen (2);
3651 scr_change_screen (state); 4074 scr_change_screen (state);
3652 break; 4075 break;
3653 case 1049: /* secondary screen w/ clearing first */ 4076 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state); 4077 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen) 4078 if (options & Opt_secondaryScreen)
3656 if (current_screen != PRIMARY) 4079 if (current_screen != PRIMARY)
3657 scr_erase_screen (2); 4080 scr_erase_screen (2);
3658 break; 4081 break;
3659 default: 4082 default:
3660 break; 4083 break;
… …
3686 rendset = 0, rendstyle = ~RS_None; 4109 rendset = 0, rendstyle = ~RS_None;
3687 break; 4110 break;
3688 case 1: 4111 case 1:
3689 rendset = 1, rendstyle = RS_Bold; 4112 rendset = 1, rendstyle = RS_Bold;
3690 break; 4113 break;
4114 //case 2: // low intensity
4115 case 3:
4116 rendset = 1, rendstyle = RS_Italic;
4117 break;
3691 case 4: 4118 case 4:
3692 rendset = 1, rendstyle = RS_Uline; 4119 rendset = 1, rendstyle = RS_Uline;
3693 break; 4120 break;
3694 case 5: 4121 case 5: // slowly blinking
4122 case 6: // rapidly blinking
3695 rendset = 1, rendstyle = RS_Blink; 4123 rendset = 1, rendstyle = RS_Blink;
3696 break; 4124 break;
3697 //case 6: // scoansi light background 4125 //case 6: // scoansi light background
3698 case 7: 4126 case 7:
3699 rendset = 1, rendstyle = RS_RVid; 4127 rendset = 1, rendstyle = RS_RVid;
3700 break; 4128 break;
3701 case 8: 4129 case 8:
3702 // invisible. NYI 4130 // invisible. NYI
3703 break; 4131 break;
4132 //case 9: // crossed out
3704 //case 10: // scoansi acs off 4133 //case 10: // scoansi acs off, primary font
3705 //case 11: // scoansi acs on 4134 //case 11: // scoansi acs on, first alt font
3706 //case 12: // scoansi acs on, |0x80 4135 //case 12: // scoansi acs on, |0x80, second alt font
3707 case 21: // disable bold, blink and invis (some terminals use this) 4136 //...
4137 //case 19: // ninth alt font
4138 //case 20: // gothic
4139 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4140 rendset = 0, rendstyle = RS_Bold;
3709 break; 4141 break;
3710 case 22: 4142 case 22: // normal intensity
3711 rendset = 0, rendstyle = RS_Bold; 4143 rendset = 0, rendstyle = RS_Bold;
4144 break;
4145 case 23: // disable italic
4146 rendset = 0, rendstyle = RS_Italic;
3712 break; 4147 break;
3713 case 24: 4148 case 24:
3714 rendset = 0, rendstyle = RS_Uline; 4149 rendset = 0, rendstyle = RS_Uline;
3715 break; 4150 break;
3716 case 25: 4151 case 25:
3717 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3718 break; 4153 break;
4154 case 26: // variable spacing (iso 8613)
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
3719 case 27: 4157 case 27:
3720 rendset = 0, rendstyle = RS_RVid; 4158 rendset = 0, rendstyle = RS_RVid;
3721 break; 4159 break;
3722 case 28:
3723 // visible. NYI 4160 //case 28: // visible. NYI
3724 break; 4161 //case 29: // not crossed-out
3725 } 4162 }
3726 4163
3727 if (rendset != -1) 4164 if (rendset != -1)
3728 { 4165 {
3729 scr_rendition (rendset, rendstyle); 4166 scr_rendition (rendset, rendstyle);
… …
3740 case 35: 4177 case 35:
3741 case 36: 4178 case 36:
3742 case 37: 4179 case 37:
3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4180 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3744 break; 4181 break;
3745#ifdef TTY_256COLOR 4182 case 38: // set fg color, ISO 8613-6
3746 case 38:
3747 if (nargs > i + 2 && arg[i + 1] == 5) 4183 if (nargs > i + 2 && arg[i + 1] == 5)
3748 { 4184 {
3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4185 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3750 i += 2; 4186 i += 2;
3751 } 4187 }
3752 break; 4188 break;
3753#endif
3754 case 39: /* default fg */ 4189 case 39: /* default fg */
3755 scr_color (Color_fg, Color_fg); 4190 scr_color (Color_fg, Color_fg);
3756 break; 4191 break;
3757 4192
3758 case 40: 4193 case 40:
… …
3763 case 45: 4198 case 45:
3764 case 46: 4199 case 46:
3765 case 47: 4200 case 47:
3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4201 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3767 break; 4202 break;
3768#ifdef TTY_256COLOR 4203 case 48: // set bg color, ISO 8613-6
3769 case 48:
3770 if (nargs > i + 2 && arg[i + 1] == 5) 4204 if (nargs > i + 2 && arg[i + 1] == 5)
3771 { 4205 {
3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4206 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3773 i += 2; 4207 i += 2;
3774 } 4208 }
3775 break; 4209 break;
3776#endif
3777 case 49: /* default bg */ 4210 case 49: /* default bg */
3778 scr_color (Color_bg, Color_bg); 4211 scr_color (Color_bg, Color_bg);
3779 break; 4212 break;
4213
4214 //case 50: // not variable spacing
3780 4215
3781#ifndef NO_BRIGHTCOLOR 4216#ifndef NO_BRIGHTCOLOR
3782 case 90: 4217 case 90:
3783 case 91: /* set bright fg color */ 4218 case 91: /* set bright fg color */
3784 case 92: 4219 case 92:
3785 case 93: 4220 case 93:
3786 case 94: 4221 case 94:
3787 case 95: 4222 case 95:
3788 case 96: 4223 case 96:
3789 case 97: 4224 case 97:
3790 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4225 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3791 Color_fg);
3792 break; 4226 break;
3793 case 100: 4227 case 100:
3794 case 101: /* set bright bg color */ 4228 case 101: /* set bright bg color */
3795 case 102: 4229 case 102:
3796 case 103: 4230 case 103:
3797 case 104: 4231 case 104:
3798 case 105: 4232 case 105:
3799 case 106: 4233 case 106:
3800 case 107: 4234 case 107:
3801 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3802 Color_bg);
3803 break; 4236 break;
3804#endif 4237#endif
3805 4238
3806 } 4239 }
3807 } 4240 }
… …
3814{ 4247{
3815 unicode_t ch, cmd = cmd_getc (); 4248 unicode_t ch, cmd = cmd_getc ();
3816 4249
3817 if (cmd == 'Q') 4250 if (cmd == 'Q')
3818 { /* query graphics */ 4251 { /* query graphics */
3819 tt_printf ("\033G0\n"); /* no graphics */ 4252 tt_printf ("\033G0\012"); /* no graphics */
3820 return; 4253 return;
3821 } 4254 }
3822 /* swallow other graphics sequences until terminating ':' */ 4255 /* swallow other graphics sequences until terminating ':' */
3823 do 4256 do
3824 ch = cmd_getc (); 4257 ch = cmd_getc ();
… …
3839 unsigned char buf[256]; 4272 unsigned char buf[256];
3840 4273
3841 va_start (arg_ptr, fmt); 4274 va_start (arg_ptr, fmt);
3842 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3843 va_end (arg_ptr); 4276 va_end (arg_ptr);
3844 tt_write (buf, STRLEN (buf)); 4277 tt_write (buf, strlen (buf));
3845} 4278}
3846 4279
3847/* ---------------------------------------------------------------------- */ 4280/* ---------------------------------------------------------------------- */
3848/* Write data to the pty as typed by the user, pasted with the mouse, 4281/* Write data to the pty as typed by the user, pasted with the mouse,
3849 * or generated by us in response to a query ESC sequence. 4282 * or generated by us in response to a query ESC sequence.
3850 */ 4283 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285
3851void 4286void
3852rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4287rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3853{ 4288{
3854 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4289 if (v_buflen == 0)
4290 {
4291 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3855 4292
3856 if (len) 4293 if ((unsigned int)written == len)
4294 return;
4295
4296 data += written;
4297 len -= written;
3857 { 4298 }
4299
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len;
4304
4305 pty_ev.set (EVENT_READ | EVENT_WRITE);
4306}
4307
4308void rxvt_term::pty_write ()
4309{
4310 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4311
4312 if (written > 0)
4313 {
4314 v_buflen -= written;
4315
3858 if (v_buflen == 0) 4316 if (v_buflen == 0)
3859 { 4317 {
3860 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3861
3862 if ((unsigned int)written == len)
3863 return;
3864
3865 data += written;
3866 len -= written;
3867 }
3868
3869
3870 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3871
3872 memcpy (v_buffer + v_buflen, data, len);
3873 v_buflen += len;
3874 }
3875
3876 for (;;)
3877 {
3878 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3879
3880 if (written > 0)
3881 {
3882 v_buflen -= written;
3883
3884 if (v_buflen == 0)
3885 {
3886 free (v_buffer); 4318 free (v_buffer);
3887 v_buffer = 0; 4319 v_buffer = 0;
3888 v_buflen = 0; 4320 v_buflen = 0;
3889 4321
3890 pty_ev.set (EVENT_READ); 4322 pty_ev.set (EVENT_READ);
3891 return;
3892 }
3893
3894 memmove (v_buffer, v_buffer + written, v_buflen);
3895 }
3896 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3897 // original code just ignores this...
3898 destroy ();
3899 else
3900 {
3901 pty_ev.set (EVENT_READ | EVENT_WRITE);
3902 return; 4323 return;
3903 } 4324 }
4325
4326 memmove (v_buffer, v_buffer + written, v_buflen);
3904 } 4327 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this...
4330 destroy ();
3905} 4331}
3906 4332
3907/*----------------------- end-of-file (C source) -----------------------*/ 4333/*----------------------- end-of-file (C source) -----------------------*/
3908 4334

Diff Legend

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