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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 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#include <cwchar>
54#include <csignal>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
56 57
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 59
59// exception thrown when the command parser runs out of input data 60// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
61 258
62/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
63void 260void
64rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
65{ 262{
… …
151 { 348 {
152 if (TermWin.saveLines) 349 if (TermWin.saveLines)
153 { 350 {
154#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 352 if (!ctrl && !meta)
156 {
157#else 353#else
158 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
159 { 356 {
160#endif
161 int lnsppg; 357 int lnsppg;
162 358
163#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 361#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 411 {
216 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
218 } 414 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 416 {
221 switch (keysym) 417 switch (keysym)
222 { 418 {
223 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
226 return; 422 return;
423#if TODO
227 /* rxvt extras */ 424 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 426 change_font (FONT_UP);
230 return; 427 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 429 change_font (FONT_DN);
233 return; 430 return;
431#endif
234 } 432 }
235 } 433 }
236 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
237#ifdef PRINTPIPE 482#ifdef PRINTPIPE
238 if (keysym == XK_Print) 483 if (keysym == XK_Print)
239 { 484 {
240 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
241 return; 486 return;
… …
243#endif 488#endif
244 489
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
246 { 491 {
247#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 494 {
250 unsigned int l; 495 unsigned int l;
251 const unsigned char *kbuf0; 496 const unsigned char *kbuf0;
252 497
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 498 kbuf0 = (Keysym_map[keysym & 0xFF]);
… …
273 newlen = 1; 518 newlen = 1;
274 switch (keysym) 519 switch (keysym)
275 { 520 {
276#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 522 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
279 { 524 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
283 } 528 }
284 else 529 else
285 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
286 break; 531 break;
287#endif 532#endif
288#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
289 case XK_Delete: 534 case XK_Delete:
290 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
291 break; 536 break;
292#endif 537#endif
293 case XK_Tab: 538 case XK_Tab:
294 if (shft) 539 if (shft)
295 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
296 else 541 else
297 { 542 {
298#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 544 if (ctrl)
300 meta = 1; 545 meta = 1;
… …
310#ifdef XK_KP_Left 555#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 561 {
317 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 564 break;
320 } 565 }
321 else 566 else
322 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
325#endif 570#endif
326 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 577 /* do Shift first */
333 if (shft) 578 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 580 else if (ctrl)
336 { 581 {
337 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 584 }
340 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
342 break; 587 break;
343 588
344#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
346 case XK_KP_Prior: 591 case XK_KP_Prior:
347 /* allow shift to override */ 592 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 594 {
350 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
351 break; 596 break;
352 } 597 }
353 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
354# endif 599# endif
355 case XK_Prior: 600 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
357 break; 602 break;
358# ifdef XK_KP_Next 603# ifdef XK_KP_Next
359 case XK_KP_Next: 604 case XK_KP_Next:
360 /* allow shift to override */ 605 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 607 {
363 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
364 break; 609 break;
365 } 610 }
366 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
367# endif 612# endif
368 case XK_Next: 613 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
370 break; 615 break;
371#endif 616#endif
372 case XK_KP_Enter: 617 case XK_KP_Enter:
373 /* allow shift to override */ 618 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 620 {
376 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
377 } 633 }
378 else 634 else
379 { 635 {
380 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
382 } 638 }
383 break; 639 break;
384 640
385#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
386 case XK_KP_Begin: 642 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
388 break; 644 break;
389 645
390 case XK_KP_Insert: 646 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
392 break; 648 break;
393 649
394 case XK_KP_Delete: 650 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
396 break; 652 break;
397#endif 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
438 case XK_Insert: 694 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
440 break; 696 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 698 case DXK_Remove:
443 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
444#endif 700#endif
445 case XK_Execute: 701 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
447 break; 703 break;
448 case XK_Select: 704 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
450 break; 706 break;
451#ifdef XK_KP_End 707#ifdef XK_KP_End
452 case XK_KP_End: 708 case XK_KP_End:
453 /* allow shift to override */ 709 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 711 {
456 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
457 break; 713 break;
458 } 714 }
459 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
460#endif 716#endif
461 case XK_End: 717 case XK_End:
462 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
463 break; 719 break;
464#ifdef XK_KP_Home 720#ifdef XK_KP_Home
465 case XK_KP_Home: 721 case XK_KP_Home:
466 /* allow shift to override */ 722 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 724 {
469 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
470 break; 726 break;
471 } 727 }
472 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
473#endif 729#endif
474 case XK_Home: 730 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
476 break; 732 break;
477 733
478#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 736
… …
529 case XK_F35: /* "\033[49~" */ 785 case XK_F35: /* "\033[49~" */
530 FKEY (31, XK_F17); 786 FKEY (31, XK_F17);
531 break; 787 break;
532#undef FKEY 788#undef FKEY
533 default: 789 default:
534 newlen = 0; 790 if (len == 0
535 break; 791 && (keysym & 0xfff0) != 0xff70
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
536 } 795 }
796
537 if (newlen) 797 if (newlen)
538 len = STRLEN (kbuf); 798 len = strlen (kbuf);
539 } 799 }
540 800
541 /* 801 /*
542 * Pass meta for all function keys, if 'meta' option set 802 * Pass meta for all function keys, if 'meta' option set
543 */ 803 */
… …
550 else if (ctrl && keysym == XK_minus) 810 else if (ctrl && keysym == XK_minus)
551 { 811 {
552 len = 1; 812 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 813 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 814 }
815 else if (keysym == XK_ISO_Left_Tab)
816 {
817 strcpy (kbuf, "\033[Z");
818 len = 3;
819 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
555 else 827 else
556 { 828 {
557#ifdef META8_OPTION 829#ifdef META8_OPTION
558 /* set 8-bit on */ 830 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 831 if (meta && (meta_char == 0x80))
… …
571 } 843 }
572 844
573 if (len <= 0) 845 if (len <= 0)
574 return; /* not mapped */ 846 return; /* not mapped */
575 847
576 if (Options & Opt_scrollTtyKeypress) 848 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 849 if (TermWin.view_start)
578 { 850 {
579 TermWin.view_start = 0; 851 TermWin.view_start = 0;
580 want_refresh = 1; 852 want_refresh = 1;
581 } 853 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 902 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 904
633 if (n > 0 && s < count) 905 if (n > 0 && s < count)
634 { 906 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 907 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 908 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 909 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 910 cmdbuf_endp -= n;
639 s += n; 911 s += n;
640 } 912 }
… …
655#endif /* MENUBAR_MAX */ 927#endif /* MENUBAR_MAX */
656 928
657void 929void
658rxvt_term::flush () 930rxvt_term::flush ()
659{ 931{
932 flush_ev.stop ();
933
660#ifdef TRANSPARENT 934#ifdef TRANSPARENT
661 if (want_full_refresh) 935 if (want_full_refresh)
662 { 936 {
663 want_full_refresh = 0; 937 want_full_refresh = 0;
664 scr_clear (); 938 scr_clear ();
… …
674 IMSendSpot (); 948 IMSendSpot ();
675#endif 949#endif
676 } 950 }
677 951
678 display->flush (); 952 display->flush ();
679
680 flush_ev.stop ();
681} 953}
682 954
683void 955void
684rxvt_term::check_cb (check_watcher &w) 956rxvt_term::check_cb (check_watcher &w)
685{ 957{
… …
783 1055
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1056 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1057 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1058 cmdbuf_endp = cmdbuf_ptr + n;
787 1059
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
789 1061
790 if (n > 0) 1062 if (n > 0)
791 { 1063 {
792 cmdbuf_endp += n; 1064 cmdbuf_endp += n;
793 return true; 1065 return true;
… …
802rxvt_term::pty_cb (io_watcher &w, short revents) 1074rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1075{
804 SET_R (this); 1076 SET_R (this);
805 SET_LOCALE (locale); 1077 SET_LOCALE (locale);
806 1078
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1079 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1080 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1081 while (pty_fill ())
812 if (cmd_parse ()) 1082 if (cmd_parse ())
813 break; 1083 break;
1084
1085 if (revents & EVENT_WRITE)
1086 pty_write ();
814} 1087}
815 1088
816void 1089void
817rxvt_term::pointer_unblank () 1090rxvt_term::pointer_unblank ()
818{ 1091{
… …
820 recolour_cursor (); 1093 recolour_cursor ();
821 1094
822#ifdef POINTER_BLANK 1095#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1096 hidden_pointer = 0;
824 1097
825 if (Options & Opt_pointerBlank) 1098 if (options & Opt_pointerBlank)
826 pointer_ev.start (NOW + pointerBlankDelay); 1099 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1100#endif
828} 1101}
829 1102
830#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
831void 1104void
832rxvt_term::pointer_blank () 1105rxvt_term::pointer_blank ()
833{ 1106{
834 if (! (Options & Opt_pointerBlank)) 1107 if (! (options & Opt_pointerBlank))
835 return; 1108 return;
836 1109
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1110 XDefineCursor (display->display, TermWin.vt, blank_cursor);
838 XFlush (display->display); 1111 XFlush (display->display);
839 1112
… …
859 x = ev.x; 1132 x = ev.x;
860 y = ev.y; 1133 y = ev.y;
861 pixel_position (&x, &y); 1134 pixel_position (&x, &y);
862 1135
863 if (MEvent.button == AnyButton) 1136 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1137 button_number = 3;
866 }
867 else 1138 else
868 { 1139 {
869 button_number = MEvent.button - Button1; 1140 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1141 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1142 if (button_number >= 3)
872 button_number += (64 - 3); 1143 button_number += (64 - 3);
873 } 1144 }
874 1145
875 if (PrivateModes & PrivMode_MouseX10) 1146 if (priv_modes & PrivMode_MouseX10)
876 { 1147 {
877 /* 1148 /*
878 * do not report ButtonRelease 1149 * do not report ButtonRelease
879 * no state info allowed 1150 * no state info allowed
880 */ 1151 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1166 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1167 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1168#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1169 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1170#endif
900
901 } 1171 }
902 1172
903#ifdef DEBUG_MOUSEREPORT 1173#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1174 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1175 if (key_state & 16)
906 fputc ('C', stderr); 1176 fputc ('C', stderr);
907 if (key_state & 4) 1177 if (key_state & 4)
908 fputc ('S', stderr); 1178 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1182 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1183 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1184 button_number,
915 x + 1, 1185 x + 1,
916 y + 1); 1186 y + 1);
917#else 1187#endif
1188
918 tt_printf ("\033[M%c%c%c", 1189 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1190 (32 + button_number + key_state),
920 (32 + x + 1), 1191 (32 + x + 1),
921 (32 + y + 1)); 1192 (32 + y + 1));
922#endif
923} 1193}
924 1194
925#ifdef USING_W11LIB 1195#ifdef USING_W11LIB
926void 1196void
927rxvt_W11_process_x_event (XEvent *ev) 1197rxvt_W11_process_x_event (XEvent *ev)
… …
938{ 1208{
939 SET_R (this); 1209 SET_R (this);
940 SET_LOCALE (locale); 1210 SET_LOCALE (locale);
941 1211
942#if defined(CURSOR_BLINK) 1212#if defined(CURSOR_BLINK)
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
944 { 1214 {
945 if (hidden_cursor) 1215 if (hidden_cursor)
946 { 1216 {
947 hidden_cursor = 0; 1217 hidden_cursor = 0;
948 want_refresh = 1; 1218 want_refresh = 1;
… …
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
952 } 1222 }
953#endif 1223#endif
954 1224
955#if defined(POINTER_BLANK) 1225#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 { 1227 {
958 if (ev.type == MotionNotify 1228 if (ev.type == MotionNotify
959 || ev.type == ButtonPress 1229 || ev.type == ButtonPress
960 || ev.type == ButtonRelease) 1230 || ev.type == ButtonRelease)
961 if (hidden_pointer) 1231 if (hidden_pointer)
… …
964 if (ev.type == KeyPress && hidden_pointer == 0) 1234 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank (); 1235 pointer_blank ();
966 } 1236 }
967#endif 1237#endif
968 1238
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return;
972#endif
973
974 Window unused_root, unused_child; 1239 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1240 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1241 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1025#endif
1026 1242
1027 switch (ev.type) 1243 switch (ev.type)
1028 { 1244 {
1029 case KeyPress: 1245 case KeyPress:
1246#if ISO_14755
1247 if (!(iso14755buf & ISO_14755_52))
1248#endif
1030 lookup_key (ev.xkey); 1249 lookup_key (ev.xkey);
1250
1251 break;
1252
1253 case KeyRelease:
1254 {
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1256 KeySym ks;
1257
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif
1260
1261#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support
1263 if (iso14755buf)
1264 if (iso14755buf & ISO_14755_52)
1265 {
1266# if ENABLE_OVERLAY
1267 scr_overlay_off ();
1268# endif
1269# if ISO_14755
1270 // iso14755 part 5.2 handling: release time
1271 // first: controls
1272 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f)))
1275 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1277 commit_iso14755 ();
1278 return; // case-break;
1279 }
1280
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks)
1283 {
1284 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 scr_bell ();
1290# endif
1291 iso14755buf = 0;
1031 break; 1292 break;
1293 }
1294 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299 if (iso14755buf & ISO_14755_51)
1300 commit_iso14755 ();
1301#if ISO_14755
1302 else if (iso14755buf & ISO_14755_STARTED)
1303 {
1304 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1305
1306 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1307 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1308 }
1309# endif
1310 else
1311 iso14755buf = 0;
1312 }
1313#endif
1032 1314
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1316 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1317 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1318 else if (ks == XK_Control_L || ks == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1319 mouse_slip_wheel_speed = 0;
1045 } 1320#endif
1046 break; 1321 break;
1047 } 1322 }
1048#endif
1049 1323
1050 case ButtonPress: 1324 case ButtonPress:
1051 button_press (ev.xbutton); 1325 button_press (ev.xbutton);
1052 break; 1326 break;
1053 1327
… …
1077 0L, 1000000L, 1351 0L, 1000000L,
1078 False, AnyPropertyType, 1352 False, AnyPropertyType,
1079 &ActualType, &ActualFormat, 1353 &ActualType, &ActualFormat,
1080 &Size, &RemainingBytes, 1354 &Size, &RemainingBytes,
1081 &data); 1355 &data);
1082 XChangeProperty (display->display, display->root, 1356 set_string_property (XA_CUT_BUFFER0, data);
1083 XA_CUT_BUFFER0, XA_STRING,
1084 8, PropModeReplace,
1085 data, STRLEN (data));
1086 XFree (data); 1357 XFree (data);
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1358 selection_paste (display->root, XA_CUT_BUFFER0, true);
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1089 } 1360 }
1090#endif /* OFFIX_DND */ 1361#endif /* OFFIX_DND */
1091 break; 1362 break;
1092 1363
… …
1124 { 1395 {
1125 TermWin.focus = 1; 1396 TermWin.focus = 1;
1126 want_refresh = 1; 1397 want_refresh = 1;
1127#ifdef USE_XIM 1398#ifdef USE_XIM
1128 if (Input_Context != NULL) 1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1129 XSetICFocus (Input_Context); 1402 XSetICFocus (Input_Context);
1403 }
1130#endif 1404#endif
1131#ifdef CURSOR_BLINK 1405#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink) 1406 if (options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif 1408#endif
1135#ifdef OFF_FOCUS_FADING 1409#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade]) 1410 if (rs[Rs_fade])
1137 { 1411 {
1138 PixColors = PixColorsFocused; 1412 pix_colors = pix_colors_focused;
1139 set_colorfgbg ();
1140 scr_clear (); 1413 scr_recolour ();
1141 scr_touch (true);
1142 } 1414 }
1143#endif 1415#endif
1144 1416
1145 } 1417 }
1146 break; 1418 break;
… …
1148 case FocusOut: 1420 case FocusOut:
1149 if (TermWin.focus) 1421 if (TermWin.focus)
1150 { 1422 {
1151 TermWin.focus = 0; 1423 TermWin.focus = 0;
1152 want_refresh = 1; 1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1153#ifdef USE_XIM 1432#ifdef USE_XIM
1154 if (Input_Context != NULL) 1433 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context); 1434 XUnsetICFocus (Input_Context);
1156#endif 1435#endif
1157#ifdef CURSOR_BLINK 1436#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink) 1437 if (options & Opt_cursorBlink)
1159 cursor_blink_ev.stop (); 1438 cursor_blink_ev.stop ();
1160 hidden_cursor = 0; 1439 hidden_cursor = 0;
1161#endif 1440#endif
1162#ifdef OFF_FOCUS_FADING 1441#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade]) 1442 if (rs[Rs_fade])
1164 { 1443 {
1165 PixColors = PixColorsUnFocused; 1444 pix_colors = pix_colors_unfocused;
1166 set_colorfgbg ();
1167 scr_clear (); 1445 scr_recolour ();
1168 scr_touch (true);
1169 } 1446 }
1170#endif 1447#endif
1171
1172 } 1448 }
1173 break; 1449 break;
1174 1450
1175 case ConfigureNotify: 1451 case ConfigureNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1452 if (ev.xconfigure.window == TermWin.parent[0])
… …
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 } 1461 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187 1463
1188 if (szHint.width != width || szHint.height != height) 1464 if (szHint.width != width || szHint.height != height)
1465 {
1466 seen_resize = 1;
1189 resize_all_windows (width, height, 1); 1467 resize_all_windows (width, height, 1);
1468 }
1190 1469
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent) 1471 if (options & Opt_transparent)
1193 {
1194 check_our_parents (); 1472 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif 1473#endif
1199 } 1474 }
1475 break;
1476
1477 case PropertyNotify:
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481
1200 break; 1482 break;
1201 1483
1202 case SelectionClear: 1484 case SelectionClear:
1203 selection_clear (); 1485 selection_clear ();
1204 break; 1486 break;
1205 1487
1206 case SelectionNotify: 1488 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1489 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1490 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1491 break;
1211 1492
1212 case SelectionRequest: 1493 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1494 selection_send (ev.xselectionrequest);
1214 break; 1495 break;
… …
1286 { 1567 {
1287 menubar_control (ev.xbutton); 1568 menubar_control (ev.xbutton);
1288 break; 1569 break;
1289 } 1570 }
1290#endif 1571#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1292 break; 1573 break;
1293 1574
1294 if (ev.xany.window == TermWin.vt) 1575 if (ev.xany.window == TermWin.vt)
1295 { 1576 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1577 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1578 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1299 ; 1580 ;
1300 1581
1301 XQueryPointer (display->display, TermWin.vt, 1582 XQueryPointer (display->display, TermWin.vt,
1302 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1585 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1586 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1588 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1589 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1590 {
1310#endif 1591#endif
1592#if ISO_14755
1593 // 5.4
1594 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1595 {
1596 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1597 break;
1598 }
1599#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1600 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1601 ev.xbutton.state & Button3Mask ? 2 : 0);
1602
1313#ifdef SELECTION_SCROLLING 1603#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1604 if (ev.xbutton.y < TermWin.int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1316 { 1606 {
1317 int dist; 1607 int dist;
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1614
1325 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1327 */ 1617 */
1328 selection_save_x=ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1619 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1621
1333 /* calc number of lines to scroll */ 1622 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1623 if (ev.xbutton.y < TermWin.int_bwidth)
1335 { 1624 {
1336 scroll_selection_dir = UP; 1625 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1626 dist = TermWin.int_bwidth - ev.xbutton.y;
1338 } 1627 }
1339 else 1628 else
1340 { 1629 {
1341 scroll_selection_dir = DN; 1630 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y -
1343 (TermWin.int_bwidth + TermWin.height); 1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1344 } 1632 }
1633
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1634 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1635 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1;
1347 MIN_IT (scroll_selection_lines, 1637 MIN_IT (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1638 SELECTION_SCROLL_MAX_LINES);
1349 } 1639 }
1350 else 1640 else
1351 { 1641 {
1352 /* we are within the text window, so we 1642 /* we are within the text window, so we
1353 * shouldn't be scrolling 1643 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1645 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1646 sel_scroll_ev.stop();
1357 } 1647 }
1358#endif 1648#endif
1359#ifdef MOUSE_THRESHOLD 1649#ifdef MOUSE_THRESHOLD
1360
1361 } 1650 }
1362#endif 1651#endif
1363
1364 } 1652 }
1365 } 1653 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1655 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1369 MotionNotify, &ev)) ; 1657 MotionNotify, &ev))
1658 ;
1659
1370 XQueryPointer (display->display, scrollBar.win, 1660 XQueryPointer (display->display, scrollBar.win,
1371 &unused_root, &unused_child, 1661 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1662 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1663 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1664 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1666 scrollbar_size ());
1377 scr_refresh (refresh_type); 1667 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1668 refresh_limit = 0;
… …
1380 } 1670 }
1381 break; 1671 break;
1382 } 1672 }
1383} 1673}
1384 1674
1675#if TRANSPARENT
1385void 1676void
1386rxvt_term::rootwin_cb (XEvent &ev) 1677rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1678{
1388 SET_R (this); 1679 SET_R (this);
1389 SET_LOCALE (locale); 1680 SET_LOCALE (locale);
1390 1681
1391 switch (ev.type) 1682 switch (ev.type)
1392 { 1683 {
1393 case PropertyNotify: 1684 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1685 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1686 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on. 1687 * use the property to determine the pixmap. We use it later on.
1406 */ 1688 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1689 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1691 return;
1412 }
1413 1692
1414 /* FALLTHROUGH */ 1693 /* FALLTHROUGH */
1415 case ReparentNotify: 1694 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1696 want_refresh = want_full_refresh = 1;
1418 break; 1697 break;
1419#endif
1420 } 1698 }
1421} 1699}
1700#endif
1422 1701
1423void 1702void
1424rxvt_term::button_press (XButtonEvent &ev) 1703rxvt_term::button_press (XButtonEvent &ev)
1425{ 1704{
1426 int reportmode = 0, clickintime; 1705 int reportmode = 0, clickintime;
1427 1706
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1429 if (!bypass_keystate) 1708 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1709 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710
1431 /* 1711 /*
1432 * VT window processing of button press 1712 * VT window processing of button press
1433 */ 1713 */
1434 if (ev.window == TermWin.vt) 1714 if (ev.window == TermWin.vt)
1435 { 1715 {
1716#if ISO_14755
1717 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 {
1720 iso14755_54 (ev.x, ev.y);
1721 return;
1722 }
1723#endif
1724
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1725 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1726
1437 if (reportmode) 1727 if (reportmode)
1438 { 1728 {
1439 /* mouse report from vt window */ 1729 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1730 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1731 MEvent.state = ev.state;
… …
1470 } 1760 }
1471 else 1761 else
1472 { 1762 {
1473 if (ev.button != MEvent.button) 1763 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1764 MEvent.clicks = 0;
1765
1475 switch (ev.button) 1766 switch (ev.button)
1476 { 1767 {
1477 case Button1: 1768 case Button1:
1769 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */
1771#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask);
1773#else
1774 selection.rect = false;
1775#endif
1776
1478 /* allow shift+left click to extend selection */ 1777 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1480 { 1779 {
1481 if (MEvent.button == Button1 && clickintime) 1780 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1781 selection_rotate (ev.x, ev.y);
1483 else 1782 else
1484 selection_extend (ev.x, ev.y, 1); 1783 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1798 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1799 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1800 selection_rotate (ev.x, ev.y);
1502 else 1801 else
1503 selection_extend (ev.x, ev.y, 1); 1802 selection_extend (ev.x, ev.y, 1);
1803
1504 MEvent.button = Button3; 1804 MEvent.button = Button3;
1505 break; 1805 break;
1506 } 1806 }
1507 } 1807 }
1808
1508 MEvent.time = ev.time; 1809 MEvent.time = ev.time;
1509 return; 1810 return;
1510 } 1811 }
1511 1812
1512 /* 1813 /*
… …
1665{ 1966{
1666 int reportmode = 0; 1967 int reportmode = 0;
1667 1968
1668 csrO = 0; /* reset csr Offset */ 1969 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 1970 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1971 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 1972
1672 if (scrollbar_isUpDn ()) 1973 if (scrollbar_isUpDn ())
1673 { 1974 {
1674 scrollBar.setIdle (); 1975 scrollBar.setIdle ();
1675 scrollbar_show (0); 1976 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH; 1978 refresh_type &= ~SMOOTH_REFRESH;
1678#endif 1979#endif
1679
1680 } 1980 }
1981
1681#ifdef SELECTION_SCROLLING 1982#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 1983 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 1984 sel_scroll_ev.stop();
1684#endif 1985#endif
1986
1685 if (ev.window == TermWin.vt) 1987 if (ev.window == TermWin.vt)
1686 { 1988 {
1989#if ISO_14755
1990 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return;
1993#endif
1687 if (reportmode) 1994 if (reportmode)
1688 { 1995 {
1689 /* mouse report from vt window */ 1996 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 1997 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 1998 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2012 MEvent.button = AnyButton;
1706 mouse_report (ev); 2013 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2014#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2015 return;
1709 } 2016 }
2017
1710 /* 2018 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2019 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2020 * when overriding mouse reporting
1713 */ 2021 */
1714 if (PrivateModes & PrivMode_mouse_report 2022 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2023 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2024 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2025 selection_extend (ev.x, ev.y, 0);
1718 2026
1719 switch (ev.button) 2027 switch (ev.button)
… …
1734 2042
1735 v = ev.button == Button4 ? UP : DN; 2043 v = ev.button == Button4 ? UP : DN;
1736 2044
1737 if (ev.state & ShiftMask) 2045 if (ev.state & ShiftMask)
1738 i = 1; 2046 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2047 else if (options & Opt_mouseWheelScrollPage)
1740 i = TermWin.nrow - 1; 2048 i = TermWin.nrow - 1;
1741 else 2049 else
1742 i = 5; 2050 i = 5;
1743 2051
1744# ifdef MOUSE_SLIP_WHEELING 2052# ifdef MOUSE_SLIP_WHEELING
… …
2029 Pixmap rootpixmap = None; 2337 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2338 XWindowAttributes wattr, wrootattr;
2031 2339
2032 pchanged = 0; 2340 pchanged = 0;
2033 2341
2034 if (!(Options & Opt_transparent)) 2342 if (!(options & Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
2036 2344
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2345 XGetWindowAttributes (display->display, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2346 rootdepth = wrootattr.depth;
2039 2347
… …
2042 if (rootdepth != wattr.depth) 2350 if (rootdepth != wattr.depth)
2043 { 2351 {
2044 if (am_transparent) 2352 if (am_transparent)
2045 { 2353 {
2046 pchanged = 1; 2354 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2356 am_transparent = am_pixmap_trans = 0;
2049 } 2357 }
2050 2358
2051 return pchanged; /* Don't try any more */ 2359 return pchanged; /* Don't try any more */
2052 } 2360 }
… …
2057 /* 2365 /*
2058 * Make the frame window set by the window manager have 2366 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2367 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that. 2368 * windows for each client, so we have to take care about that.
2061 */ 2369 */
2062 i = (xa[XA_XROOTPMAPID] 2370 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2373 &nitems, &bytes_after, &prop) == Success);
2066 2374
2067 if (!i || prop == NULL) 2375 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2376 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2379 &nitems, &bytes_after, &prop) == Success);
2072 2380
2073 if (!i || prop == NULL 2381 if (!i || prop == NULL
2074#if TINTING 2382#if TINTING
… …
2115 sy = 0; 2423 sy = 0;
2116 } 2424 }
2117 2425
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428
2429 XSync (display->display, False);
2120 allowedxerror = -1; 2430 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2432
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2434 /* XXX: may need a delay here? */
… …
2147 if (ISSET_PIXCOLOR (Color_tint)) 2457 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2458 {
2149 unsigned short rm, gm, bm; 2459 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2461
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2153 2463
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2464 ShadeXImage (display, image, shade, rm, gm, bm);
2155 } 2465 }
2156#endif 2466#endif
2157 2467
… …
2170 2480
2171 am_transparent = am_pixmap_trans = 1; 2481 am_transparent = am_pixmap_trans = 1;
2172 } 2482 }
2173 } 2483 }
2174 2484
2175 if (!am_pixmap_trans) 2485 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2487 else
2176 { 2488 {
2177 unsigned int n; 2489 unsigned int n;
2178 /* 2490 /*
2179 * InheritPixmap transparency 2491 * InheritPixmap transparency
2180 */ 2492 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2183 { 2494 {
2184 oldp = TermWin.parent[i]; 2495 oldp = TermWin.parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2496 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n); 2497 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2498 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2499
2190 if (TermWin.parent[i] == display->root) 2500 if (TermWin.parent[i] == display->root)
2191 { 2501 {
2192 if (oldp != None) 2502 if (oldp != None)
2193 pchanged = 1; 2503 pchanged = 1;
… …
2204 if (pchanged) 2514 if (pchanged)
2205 { 2515 {
2206 for (; n < (unsigned int)i; n++) 2516 for (; n < (unsigned int)i; n++)
2207 { 2517 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2520 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2213 break; 2522 break;
2214 } 2523 }
2215 } 2524 }
2216 } 2525 }
2217 2526
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 { 2528 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2531 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2532 /* XXX: also turn off Opt_transparent? */
2225 } 2533 }
2226 else 2534 else
2227 { 2535 {
2228#if WAIT_FOR_WM 2536#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing 2537 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */ 2538 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1); 2539 sleep (1);
2232#endif 2540#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2541 for (n = 0; n < (unsigned int)i; n++)
2235 { 2542 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2544 XClearWindow (display->display, TermWin.parent[n]);
2238 } 2545 }
… …
2243 2550
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2552 TermWin.parent[i] = None;
2246 } 2553 }
2247 2554
2248 // this is experimental
2249 if (scrollBar.win) 2555 if (scrollBar.win)
2250 { 2556 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2558 scrollBar.setIdle ();
2254 scrollbar_show (0); 2559 scrollbar_show (0);
2560 }
2561
2562 if (am_transparent)
2563 {
2564 want_refresh = want_full_refresh = 1;
2565 if (am_pixmap_trans)
2566 flush ();
2255 } 2567 }
2256 2568
2257 return pchanged; 2569 return pchanged;
2258} 2570}
2259#endif 2571#endif
… …
2278 if (ch == NOCHAR) // TODO: improve 2590 if (ch == NOCHAR) // TODO: improve
2279 break; 2591 break;
2280 2592
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2594 {
2595 if (!seen_input)
2596 {
2597 seen_input = 1;
2598 // many badly-written programs (e.g. jed) contain a race condition:
2599 // they first read the screensize and then install a SIGWINCH handler.
2600 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized.
2605 if (seen_resize)
2606 kill (-cmd_pid, SIGWINCH);
2607 }
2608
2283 /* Read a text string from the input buffer */ 2609 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2610 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2611 bool refreshnow = false;
2286 int nlines = 0; 2612 int nlines = 0;
2287 unicode_t *str = buf; 2613 unicode_t *str = buf;
… …
2296 if (ch == C0_LF) 2622 if (ch == C0_LF)
2297 { 2623 {
2298 nlines++; 2624 nlines++;
2299 refresh_count++; 2625 refresh_count++;
2300 2626
2301 if (!(Options & Opt_jumpScroll) 2627 if (!(options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2629 {
2304 refreshnow = true; 2630 refreshnow = true;
2305 ch = NOCHAR; 2631 ch = NOCHAR;
2306 break; 2632 break;
… …
2333 * the number of pages between refreshes is refresh_limit, which 2659 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2660 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2661 */
2336 if (refreshnow) 2662 if (refreshnow)
2337 { 2663 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2665 refresh_limit++;
2340 else 2666 else
2341 { 2667 {
2342 flag = true; 2668 flag = true;
2343 scr_refresh (refresh_type); 2669 scr_refresh (refresh_type);
… …
2397 if (len == (size_t)-1) 2723 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2725
2400 // assume wchar == unicode 2726 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2727 cmdbuf_ptr += len;
2402 return wc; 2728 return wc & UNICODE_MASK;
2403 } 2729 }
2404 2730
2405 return NOCHAR; 2731 return NOCHAR;
2406} 2732}
2407 2733
… …
2533 process_escape_seq (); 2859 process_escape_seq ();
2534 break; 2860 break;
2535 case C0_ENQ: /* terminal Status */ 2861 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2862 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2539 else 2865 else
2540 tt_write ((unsigned char *)VT100_ANS, 2866 tt_write ((unsigned char *)VT100_ANS,
2541 (unsigned int)STRLEN (VT100_ANS)); 2867 (unsigned int)strlen (VT100_ANS));
2542 break; 2868 break;
2543 case C0_BEL: /* bell */ 2869 case C0_BEL: /* bell */
2544 scr_bell (); 2870 scr_bell ();
2545 break; 2871 break;
2546 case C0_BS: /* backspace */ 2872 case C0_BS: /* backspace */
… …
2645void 2971void
2646rxvt_term::process_escape_seq () 2972rxvt_term::process_escape_seq ()
2647{ 2973{
2648 unicode_t ch = cmd_getc (); 2974 unicode_t ch = cmd_getc ();
2649 2975
2650 if (PrivateModes & PrivMode_vt52) 2976 if (priv_modes & PrivMode_vt52)
2651 { 2977 {
2652 process_escape_vt52 (ch); 2978 process_escape_vt52 (ch);
2653 return; 2979 return;
2654 } 2980 }
2655 2981
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 2996 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 2997 break;
2672 case '+': 2998 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 2999 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3000 break;
2675#ifndef NO_FRILLS 3001#if ENABLE_FRILLS
2676 case '6': 3002 case '6':
2677 scr_backindex (); 3003 scr_backindex ();
2678 break; 3004 break;
2679#endif 3005#endif
2680 case '7': 3006 case '7':
2681 scr_cursor (SAVE); 3007 scr_cursor (SAVE);
2682 break; 3008 break;
2683 case '8': 3009 case '8':
2684 scr_cursor (RESTORE); 3010 scr_cursor (RESTORE);
2685 break; 3011 break;
2686#ifndef NO_FRILLS 3012#if ENABLE_FRILLS
2687 case '9': 3013 case '9':
2688 scr_forwardindex (); 3014 scr_forwardindex ();
2689 break; 3015 break;
2690#endif 3016#endif
2691 case '=': 3017 case '=':
… …
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2991 break; 3317 break;
2992 3318
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3320 tt_write ((const unsigned char *)VT100_ANS,
2995 (unsigned int) (sizeof (VT100_ANS) - 1)); 3321 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3322 break;
2997 3323
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3325 process_sgr_mode (nargs, arg);
3000 break; 3326 break;
… …
3007 break; 3333 break;
3008 case 6: /* CPR requested */ 3334 case 6: /* CPR requested */
3009 scr_report_position (); 3335 scr_report_position ();
3010 break; 3336 break;
3011 case 7: /* unofficial extension */ 3337 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3338 if (options & Opt_insecure)
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3339 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3340 break;
3015 case 8: /* unofficial extension */ 3341 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3343 break;
3018 } 3344 }
… …
3054 break; 3380 break;
3055 3381
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3382 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3383 if (arg[0] == 4)
3058 scr_insert_mode (0); 3384 scr_insert_mode (0);
3385 else if (arg[0] == 20)
3386 priv_modes &= ~PrivMode_LFNL;
3059 break; 3387 break;
3060 3388
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3389 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3390 if (arg[0] == 4)
3063 scr_insert_mode (1); 3391 scr_insert_mode (1);
3392 else if (arg[0] == 20)
3393 priv_modes |= PrivMode_LFNL;
3064 break; 3394 break;
3065 3395
3066 /* 3396 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3397 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3398 */
… …
3080 break; 3410 break;
3081 case CSI_75: 3411 case CSI_75:
3082 scr_cursor (RESTORE); 3412 scr_cursor (RESTORE);
3083 break; 3413 break;
3084 3414
3085#ifndef NO_FRILLS 3415#if ENABLE_FRILLS
3086 case CSI_74: 3416 case CSI_74:
3087 process_window_ops (arg, nargs); 3417 process_window_ops (arg, nargs);
3088 break; 3418 break;
3089#endif 3419#endif
3090 3420
… …
3097 break; 3427 break;
3098 } 3428 }
3099} 3429}
3100/*}}} */ 3430/*}}} */
3101 3431
3102#ifndef NO_FRILLS 3432#if ENABLE_FRILLS
3103/* ARGSUSED */ 3433/* ARGSUSED */
3104void 3434void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3435rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3436{
3107 int x, y; 3437 int x, y;
… …
3174 break; 3504 break;
3175 case 19: /* report window size (chars) */ 3505 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break; 3507 break;
3178 case 20: /* report icon label */ 3508 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3509 {
3181 char *s; 3510 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3511 XGetIconName (display->display, TermWin.parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s);
3184 } 3514 }
3185 break; 3515 break;
3186 case 21: /* report window title */ 3516 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3517 {
3189 char *s; 3518 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3519 XFetchName (display->display, TermWin.parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s);
3192 } 3522 }
3193 break; 3523 break;
3194 } 3524 }
3195} 3525}
3196#endif 3526#endif
3197 3527
… …
3201 * ends_how is terminator used. returned input must be free()'d 3531 * ends_how is terminator used. returned input must be free()'d
3202 */ 3532 */
3203unsigned char * 3533unsigned char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3534rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3535{
3206 unicode_t prev = 0, ch; 3536 unicode_t ch;
3537 bool seen_esc = false;
3207 unsigned int n = 0; 3538 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3539 wchar_t string[STRING_MAX];
3210 3540
3211 while ((ch = cmd_getc ()) != NOCHAR) 3541 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3542 {
3213 if (prev == C0_ESC) 3543 if (seen_esc)
3214 { 3544 {
3215 if (ch == 0x5c) /* 7bit ST */ 3545 if (ch == 0x5c) /* 7bit ST */
3216 break; 3546 break;
3217 else 3547 else
3218 return NULL; 3548 return NULL;
3219 } 3549 }
3550 else if (ch == C0_ESC)
3551 {
3552 seen_esc = true;
3553 continue;
3554 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3555 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3556 break;
3222 else if (ch < 0x20) 3557 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3558 return NULL; /* other control character - exit */
3559
3560 seen_esc = false;
3224 3561
3225 if (n >= sizeof (string) - 1) 3562 if (n >= sizeof (string) - 1)
3226 // stop at some sane length 3563 // stop at some sane length
3227 return NULL; 3564 return NULL;
3228 3565
3229 if (ch == C0_SYN) 3566 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3567 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3568 else
3235 string[n++] = prev = ch; 3569 string[n++] = ch;
3236 } 3570 }
3237 3571
3238 string[n++] = '\0'; 3572 string[n++] = '\0';
3239 3573
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3574 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3575
3245 return s; 3576 return (unsigned char *)rxvt_wcstombs (string);
3246} 3577}
3247 3578
3248/*----------------------------------------------------------------------*/ 3579/*----------------------------------------------------------------------*/
3249/* 3580/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3294void 3625void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{ 3627{
3297 if (str[0] == '?' && !str[1]) 3628 if (str[0] == '?' && !str[1])
3298 { 3629 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b; 3630 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b); 3631 pix_colors_focused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 } 3633 }
3306 else 3634 else
3307 set_window_color (color, str); 3635 set_window_color (color, str);
3308} 3636}
3309 3637
… …
3337{ 3665{
3338 int changed = 0; 3666 int changed = 0;
3339 int color; 3667 int color;
3340 char *buf, *name; 3668 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3669 bool query = str[0] == '?' && !str[1];
3670 int saveop = op;
3342 3671
3343 assert (str != NULL); 3672 assert (str != NULL);
3344 switch (op) 3673 switch (op)
3345 { 3674 {
3346 case XTerm_name: 3675 case XTerm_name:
… …
3353 set_title (str); 3682 set_title (str);
3354 break; 3683 break;
3355 case XTerm_property: 3684 case XTerm_property:
3356 if (str[0] == '?') 3685 if (str[0] == '?')
3357 { 3686 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3687 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3688 Atom actual_type;
3360 int actual_format; 3689 int actual_format;
3361 unsigned long nitems; 3690 unsigned long nitems;
3362 unsigned long bytes_after; 3691 unsigned long bytes_after;
3363 unsigned char *value = 0; 3692 unsigned char *value = 0;
… …
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3710 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3711
3383 if (eq) 3712 if (eq)
3384 { 3713 {
3385 *eq = 0; 3714 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3715 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3716 }
3391 else 3717 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3718 XDeleteProperty (display->display, TermWin.parent[0],
3393 display->atom (str)); 3719 display->atom (str));
3394 } 3720 }
3395 break; 3721 break;
3396 3722
3397 case XTerm_Color: 3723 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3724 for (buf = (char *)str; buf && *buf;)
3399 { 3725 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3726 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3727 break;
3402 3728
3403 *name++ = '\0'; 3729 *name++ = '\0';
3404 color = atoi (buf); 3730 color = atoi (buf);
3405 3731
3406 if (color < 0 || color >= TOTAL_COLORS) 3732 if (color < 0 || color >= TOTAL_COLORS)
3407 break; 3733 break;
3408 3734
3409 if ((buf = STRCHR (name, ';')) != NULL) 3735 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3736 *buf++ = '\0';
3411 3737
3412 if (name[0] == '?' && !name[1]) 3738 if (name[0] == '?' && !name[1])
3413 { 3739 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b; 3740 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 } 3743 }
3421 else 3744 else
3422 set_window_color (color + minCOLOR, name); 3745 set_window_color (color + minCOLOR, name);
3423 } 3746 }
3424 break; 3747 break;
… …
3441 break; 3764 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3765#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD: 3766 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break; 3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3446 case XTerm_Color_UL: 3772 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break; 3774 break;
3449 case XTerm_Color_RV: 3775 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break;
3778#endif
3779#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3782 check_our_parents ();
3783 if (am_transparent)
3784 want_full_refresh = want_refresh = 1;
3451 break; 3785 break;
3452#endif 3786#endif
3453 3787
3454 case XTerm_Pixmap: 3788 case XTerm_Pixmap:
3455 if (*str != ';') 3789 if (*str != ';')
… …
3458 scale_pixmap (""); /* reset to default scaling */ 3792 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3793 set_bgPixmap (str); /* change pixmap */
3460#endif 3794#endif
3461 scr_touch (true); 3795 scr_touch (true);
3462 } 3796 }
3463 while ((str = STRCHR (str, ';')) != NULL) 3797 while ((str = strchr (str, ';')) != NULL)
3464 { 3798 {
3465 str++; 3799 str++;
3466#if XPM_BACKGROUND 3800#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3801 changed += scale_pixmap (str);
3468#endif 3802#endif
… …
3487 case XTerm_logfile: 3821 case XTerm_logfile:
3488 // TODO, when secure mode? 3822 // TODO, when secure mode?
3489 break; 3823 break;
3490 3824
3491 case XTerm_font: 3825 case XTerm_font:
3826 op = URxvt_font;
3827 case URxvt_font:
3828#if ENABLE_STYLES
3829 case URxvt_boldFont:
3830 case URxvt_italicFont:
3831 case URxvt_boldItalicFont:
3832#endif
3492 if (query) 3833 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3837 resp);
3838 else
3493 { 3839 {
3494 if (Options & Opt_insecure) 3840 const char *&res = rs[Rs_font + (op - URxvt_font)];
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3841
3496 TermWin.fontset->fontdesc 3842 res = strdup (str);
3497 ? TermWin.fontset->fontdesc 3843 allocated.push_back ((void *)res);
3498 : "", 3844 set_fonts ();
3499 resp);
3500 } 3845 }
3501 else
3502 change_font (str);
3503 break; 3846 break;
3504 3847
3505#ifndef NO_FRILLS 3848#if ENABLE_FRILLS
3506 case XTerm_locale: 3849 case XTerm_locale:
3507 if (query) 3850 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3511 }
3512 else 3852 else
3513 { 3853 {
3514 set_locale (str); 3854 set_locale (str);
3515# ifdef USE_XIM 3855# ifdef USE_XIM
3516 im_cb (); 3856 im_cb ();
3517# endif 3857# endif
3518 } 3858 }
3519 break; 3859 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif 3860#endif
3530 3861
3531#ifdef MENUBAR 3862#ifdef MENUBAR
3532 case XTerm_Menu: 3863 case XTerm_Menu:
3533 if (Options & Opt_insecure) 3864 if (options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break; 3866 break;
3536#endif 3867#endif
3537#if 0 3868#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3869 case XTerm_dumpscreen: /* no error notices */
… …
3565{ 3896{
3566 int state; 3897 int state;
3567 3898
3568 if (mode == 's') 3899 if (mode == 's')
3569 { 3900 {
3570 SavedModes |= (PrivateModes & bit); 3901 SavedModes |= (priv_modes & bit);
3571 return -1; 3902 return -1;
3572 } 3903 }
3573 else 3904 else
3574 { 3905 {
3575 if (mode == 'r') 3906 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3907 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3908 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3909 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3910 PrivMode (state, bit);
3580 } 3911 }
3581 3912
3582 return state; 3913 return state;
3583} 3914}
… …
3601 { 3, PrivMode_132 }, 3932 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3933 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3934 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3935 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3936 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3938 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3939#ifdef menuBar_esc
3608 { menuBar_esc, PrivMode_menuBar }, 3940 { menuBar_esc, PrivMode_menuBar },
3609#endif 3941#endif
3942 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor },
3610#ifdef scrollBar_esc 3944#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3945 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3946#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3947 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3948 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3949 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3950 // 45 margin bell NYI
3620 // 46 start logging 3951 // 46 start logging
… …
3661 3992
3662 /* extra handling for values with state unkept */ 3993 /* extra handling for values with state unkept */
3663 switch (arg[i]) 3994 switch (arg[i])
3664 { 3995 {
3665 case 1048: /* alternative cursor save */ 3996 case 1048: /* alternative cursor save */
3997 case 1049:
3666 if (Options & Opt_secondaryScreen) 3998 if (options & Opt_secondaryScreen)
3667 if (mode == 0) 3999 if (mode == 0)
3668 scr_cursor (RESTORE); 4000 scr_cursor (RESTORE);
3669 else if (mode == 1) 4001 else if (mode == 1)
3670 scr_cursor (SAVE); 4002 scr_cursor (SAVE);
3671 break; 4003 break;
… …
3682 * within VT52 mode 4014 * within VT52 mode
3683 */ 4015 */
3684 PrivMode (1, PrivMode_vt52); 4016 PrivMode (1, PrivMode_vt52);
3685 break; 4017 break;
3686 case 3: /* 80/132 */ 4018 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4019 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3689 break; 4021 break;
3690 case 4: /* smooth scrolling */ 4022 case 4: /* smooth scrolling */
3691 if (state) 4023 if (state)
3692 Options &= ~Opt_jumpScroll; 4024 options &= ~Opt_jumpScroll;
3693 else 4025 else
3694 Options |= Opt_jumpScroll; 4026 options |= Opt_jumpScroll;
3695 break; 4027 break;
3696 case 5: /* reverse video */ 4028 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4029 scr_rvideo_mode (state);
3698 break; 4030 break;
3699 case 6: /* relative/absolute origins */ 4031 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4035 scr_autowrap (state);
3704 break; 4036 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4037 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4038 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4039 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4040 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4041 break;
3710#ifdef menuBar_esc 4042#ifdef menuBar_esc
3711 case menuBar_esc: 4043 case menuBar_esc:
3712#ifdef MENUBAR 4044#ifdef MENUBAR
3713 map_menuBar (state); 4045 map_menuBar (state);
… …
3733 break; 4065 break;
3734 /* case 66: - application key pad */ 4066 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4067 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4068 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4069 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4070 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4071 break;
3740#if 0 4072#if 0
3741 case 1001: 4073 case 1001:
3742 break; /* X11 mouse highlighting */ 4074 break; /* X11 mouse highlighting */
3743#endif 4075#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4076 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state) 4077 if (state)
3746 Options &= ~Opt_scrollTtyOutput; 4078 options &= ~Opt_scrollTtyOutput;
3747 else 4079 else
3748 Options |= Opt_scrollTtyOutput; 4080 options |= Opt_scrollTtyOutput;
3749 break; 4081 break;
3750 case 1011: /* scroll to bottom on key press */ 4082 case 1011: /* scroll to bottom on key press */
3751 if (state) 4083 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4084 options |= Opt_scrollTtyKeypress;
3753 else 4085 else
3754 Options &= ~Opt_scrollTtyKeypress; 4086 options &= ~Opt_scrollTtyKeypress;
3755 break; 4087 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4088 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4089 if (options & Opt_secondaryScreen)
3758 if (current_screen != PRIMARY) 4090 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4091 scr_erase_screen (2);
3760 scr_change_screen (state); 4092 scr_change_screen (state);
3761 break; 4093 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4094 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4095 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4096 if (options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY) 4097 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4098 scr_erase_screen (2);
3767 break; 4099 break;
3768 default: 4100 default:
3769 break; 4101 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4127 rendset = 0, rendstyle = ~RS_None;
3796 break; 4128 break;
3797 case 1: 4129 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4130 rendset = 1, rendstyle = RS_Bold;
3799 break; 4131 break;
3800 //case 2: // faint or second colour 4132 //case 2: // low intensity
4133 case 3:
4134 rendset = 1, rendstyle = RS_Italic;
4135 break;
3801 case 4: 4136 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4137 rendset = 1, rendstyle = RS_Uline;
3803 break; 4138 break;
3804 case 5: // slowly blinking 4139 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4140 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4152 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4153 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4154 //...
3820 //case 19: // ninth alt font 4155 //case 19: // ninth alt font
3821 //case 20: // gothic 4156 //case 20: // gothic
3822 case 21: // disable bold, faint 4157 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4158 rendset = 0, rendstyle = RS_Bold;
3824 break; 4159 break;
3825 case 22: 4160 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4161 rendset = 0, rendstyle = RS_Bold;
3827 break; 4162 break;
3828 //case 23: disable italic 4163 case 23: // disable italic
4164 rendset = 0, rendstyle = RS_Italic;
4165 break;
3829 case 24: 4166 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4167 rendset = 0, rendstyle = RS_Uline;
3831 break; 4168 break;
3832 case 25: 4169 case 25:
4170 rendset = 0, rendstyle = RS_Blink;
4171 break;
4172 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4173 rendset = 0, rendstyle = RS_Blink;
3834 break; 4174 break;
3835 case 27: 4175 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4176 rendset = 0, rendstyle = RS_RVid;
3837 break; 4177 break;
… …
3855 case 35: 4195 case 35:
3856 case 36: 4196 case 36:
3857 case 37: 4197 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4199 break;
3860#ifdef TTY_256COLOR 4200 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4202 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4204 i += 2;
3866 } 4205 }
3867 break; 4206 break;
3868#endif
3869 case 39: /* default fg */ 4207 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4208 scr_color (Color_fg, Color_fg);
3871 break; 4209 break;
3872 4210
3873 case 40: 4211 case 40:
… …
3878 case 45: 4216 case 45:
3879 case 46: 4217 case 46:
3880 case 47: 4218 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4219 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4220 break;
3883#ifdef TTY_256COLOR 4221 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4222 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4223 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4224 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4225 i += 2;
3889 } 4226 }
3890 break; 4227 break;
3891#endif
3892 case 49: /* default bg */ 4228 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4229 scr_color (Color_bg, Color_bg);
3894 break; 4230 break;
4231
4232 //case 50: // not variable spacing
3895 4233
3896#ifndef NO_BRIGHTCOLOR 4234#ifndef NO_BRIGHTCOLOR
3897 case 90: 4235 case 90:
3898 case 91: /* set bright fg color */ 4236 case 91: /* set bright fg color */
3899 case 92: 4237 case 92:
3900 case 93: 4238 case 93:
3901 case 94: 4239 case 94:
3902 case 95: 4240 case 95:
3903 case 96: 4241 case 96:
3904 case 97: 4242 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4243 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4244 break;
3908 case 100: 4245 case 100:
3909 case 101: /* set bright bg color */ 4246 case 101: /* set bright bg color */
3910 case 102: 4247 case 102:
3911 case 103: 4248 case 103:
3912 case 104: 4249 case 104:
3913 case 105: 4250 case 105:
3914 case 106: 4251 case 106:
3915 case 107: 4252 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4254 break;
3919#endif 4255#endif
3920 4256
3921 } 4257 }
3922 } 4258 }
… …
3929{ 4265{
3930 unicode_t ch, cmd = cmd_getc (); 4266 unicode_t ch, cmd = cmd_getc ();
3931 4267
3932 if (cmd == 'Q') 4268 if (cmd == 'Q')
3933 { /* query graphics */ 4269 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4270 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4271 return;
3936 } 4272 }
3937 /* swallow other graphics sequences until terminating ':' */ 4273 /* swallow other graphics sequences until terminating ':' */
3938 do 4274 do
3939 ch = cmd_getc (); 4275 ch = cmd_getc ();
… …
3954 unsigned char buf[256]; 4290 unsigned char buf[256];
3955 4291
3956 va_start (arg_ptr, fmt); 4292 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4294 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4295 tt_write (buf, strlen (buf));
3960} 4296}
3961 4297
3962/* ---------------------------------------------------------------------- */ 4298/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4299/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 4300 * or generated by us in response to a query ESC sequence.
3965 */ 4301 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303
3966void 4304void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4305rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3968{ 4306{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4307 if (v_buflen == 0)
4308 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3970 4310
3971 if (len) 4311 if ((unsigned int)written == len)
4312 return;
4313
4314 data += written;
4315 len -= written;
3972 { 4316 }
4317
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4319
4320 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len;
4322
4323 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324}
4325
4326void rxvt_term::pty_write ()
4327{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329
4330 if (written > 0)
4331 {
4332 v_buflen -= written;
4333
3973 if (v_buflen == 0) 4334 if (v_buflen == 0)
3974 { 4335 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 4336 free (v_buffer);
4002 v_buffer = 0; 4337 v_buffer = 0;
4003 v_buflen = 0; 4338 v_buflen = 0;
4004 4339
4005 pty_ev.set (EVENT_READ); 4340 pty_ev.set (EVENT_READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 4341 return;
4018 } 4342 }
4343
4344 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4345 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this...
4348 destroy ();
4020} 4349}
4021 4350
4022/*----------------------- end-of-file (C source) -----------------------*/ 4351/*----------------------- end-of-file (C source) -----------------------*/
4023 4352

Diff Legend

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