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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.194 by root, Mon Feb 14 10:44:50 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 {
… …
675 IMSendSpot (); 921 IMSendSpot ();
676#endif 922#endif
677 } 923 }
678 924
679 display->flush (); 925 display->flush ();
680
681 flush_ev.stop ();
682} 926}
683 927
684void 928void
685rxvt_term::check_cb (check_watcher &w) 929rxvt_term::check_cb (check_watcher &w)
686{ 930{
687 SET_R (this); 931 SET_R (this);
688 SET_LOCALE (locale); 932 SET_LOCALE (locale);
689 933
690 display->flush (); 934 display->flush ();
691 935
692 if (!flush_ev.active) 936 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 937 flush_ev.start (NOW + 0.01);
694} 938}
695 939
696void 940void
697rxvt_term::flush_cb (time_watcher &w) 941rxvt_term::flush_cb (time_watcher &w)
… …
762{ 1006{
763 if (mouse_slip_wheel_speed == 0 1007 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1009 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1010 {
1011 if (TermWin.view_start == TermWin.nscrolled ||
1012 TermWin.view_start == 0)
1013 mouse_slip_wheel_speed = 0;
1014
767 refresh_type |= SMOOTH_REFRESH; 1015 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1016 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1018 }
771} 1019}
… …
784 1032
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1033 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1034 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1035 cmdbuf_endp = cmdbuf_ptr + n;
788 1036
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1038
791 if (n > 0) 1039 if (n > 0)
792 { 1040 {
793 cmdbuf_endp += n; 1041 cmdbuf_endp += n;
794 return true; 1042 return true;
… …
803rxvt_term::pty_cb (io_watcher &w, short revents) 1051rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1052{
805 SET_R (this); 1053 SET_R (this);
806 SET_LOCALE (locale); 1054 SET_LOCALE (locale);
807 1055
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1056 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1057 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1058 while (pty_fill ())
813 if (cmd_parse ()) 1059 if (cmd_parse ())
814 break; 1060 break;
1061
1062 if (revents & EVENT_WRITE)
1063 pty_write ();
815} 1064}
816 1065
817void 1066void
818rxvt_term::pointer_unblank () 1067rxvt_term::pointer_unblank ()
819{ 1068{
… …
821 recolour_cursor (); 1070 recolour_cursor ();
822 1071
823#ifdef POINTER_BLANK 1072#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1073 hidden_pointer = 0;
825 1074
826 if (Options & Opt_pointerBlank) 1075 if (options & Opt_pointerBlank)
827 pointer_ev.start (NOW + pointerBlankDelay); 1076 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1077#endif
829} 1078}
830 1079
831#ifdef POINTER_BLANK 1080#ifdef POINTER_BLANK
832void 1081void
833rxvt_term::pointer_blank () 1082rxvt_term::pointer_blank ()
834{ 1083{
835 if (! (Options & Opt_pointerBlank)) 1084 if (! (options & Opt_pointerBlank))
836 return; 1085 return;
837 1086
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
839 XFlush (display->display); 1088 XFlush (display->display);
840 1089
841 hidden_pointer = 1; 1090 hidden_pointer = 1;
842} 1091}
843 1092
… …
860 x = ev.x; 1109 x = ev.x;
861 y = ev.y; 1110 y = ev.y;
862 pixel_position (&x, &y); 1111 pixel_position (&x, &y);
863 1112
864 if (MEvent.button == AnyButton) 1113 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1114 button_number = 3;
867 }
868 else 1115 else
869 { 1116 {
870 button_number = MEvent.button - Button1; 1117 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1118 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1119 if (button_number >= 3)
873 button_number += (64 - 3); 1120 button_number += (64 - 3);
874 } 1121 }
875 1122
876 if (PrivateModes & PrivMode_MouseX10) 1123 if (priv_modes & PrivMode_MouseX10)
877 { 1124 {
878 /* 1125 /*
879 * do not report ButtonRelease 1126 * do not report ButtonRelease
880 * no state info allowed 1127 * no state info allowed
881 */ 1128 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1143 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1144 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1145#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1146 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1147#endif
901
902 } 1148 }
903 1149
904#ifdef DEBUG_MOUSEREPORT 1150#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1151 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1152 if (key_state & 16)
907 fputc ('C', stderr); 1153 fputc ('C', stderr);
908 if (key_state & 4) 1154 if (key_state & 4)
909 fputc ('S', stderr); 1155 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1159 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1160 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1161 button_number,
916 x + 1, 1162 x + 1,
917 y + 1); 1163 y + 1);
918#else 1164#endif
1165
919 tt_printf ("\033[M%c%c%c", 1166 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1167 (32 + button_number + key_state),
921 (32 + x + 1), 1168 (32 + x + 1),
922 (32 + y + 1)); 1169 (32 + y + 1));
923#endif
924} 1170}
925 1171
926#ifdef USING_W11LIB 1172#ifdef USING_W11LIB
927void 1173void
928rxvt_W11_process_x_event (XEvent *ev) 1174rxvt_W11_process_x_event (XEvent *ev)
… …
935 1181
936/*{{{ process an X event */ 1182/*{{{ process an X event */
937void 1183void
938rxvt_term::x_cb (XEvent &ev) 1184rxvt_term::x_cb (XEvent &ev)
939{ 1185{
1186 dDisp;
1187
940 SET_R (this); 1188 SET_R (this);
941 SET_LOCALE (locale); 1189 SET_LOCALE (locale);
942 1190
943#if defined(CURSOR_BLINK) 1191#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
945 { 1193 {
946 if (hidden_cursor) 1194 if (hidden_cursor)
947 { 1195 {
948 hidden_cursor = 0; 1196 hidden_cursor = 0;
949 want_refresh = 1; 1197 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1201 }
954#endif 1202#endif
955 1203
956#if defined(POINTER_BLANK) 1204#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1206 {
959 if (ev.type == MotionNotify 1207 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1208 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1209 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1210 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1213 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1214 pointer_blank ();
967 } 1215 }
968#endif 1216#endif
969 1217
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1218 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1219 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1220 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1026#endif
1027 1221
1028 switch (ev.type) 1222 switch (ev.type)
1029 { 1223 {
1030 case KeyPress: 1224 case KeyPress:
1225#if ISO_14755
1226 if (!(iso14755buf & ISO_14755_52))
1227#endif
1031 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;
1032 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
1033 1293
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1295 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1296 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R) 1297 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1298 mouse_slip_wheel_speed = 0;
1046 } 1299#endif
1047 break; 1300 break;
1048 } 1301 }
1049#endif
1050 1302
1051 case ButtonPress: 1303 case ButtonPress:
1052 button_press (ev.xbutton); 1304 button_press (ev.xbutton);
1053 break; 1305 break;
1054 1306
… …
1071 Atom ActualType; 1323 Atom ActualType;
1072 int ActualFormat; 1324 int ActualFormat;
1073 unsigned char *data; 1325 unsigned char *data;
1074 unsigned long Size, RemainingBytes; 1326 unsigned long Size, RemainingBytes;
1075 1327
1076 XGetWindowProperty (display->display, display->root, 1328 XGetWindowProperty (disp, display->root,
1077 xa[XA_DNDSELECTION], 1329 xa[XA_DNDSELECTION],
1078 0L, 1000000L, 1330 0L, 1000000L,
1079 False, AnyPropertyType, 1331 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1332 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1333 &Size, &RemainingBytes,
1082 &data); 1334 &data);
1083 XChangeProperty (display->display, display->root, 1335 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1336 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1337 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1090 } 1339 }
1091#endif /* OFFIX_DND */ 1340#endif /* OFFIX_DND */
1092 break; 1341 break;
1093 1342
1094 case MappingNotify: 1343 case MappingNotify:
… …
1125 { 1374 {
1126 TermWin.focus = 1; 1375 TermWin.focus = 1;
1127 want_refresh = 1; 1376 want_refresh = 1;
1128#ifdef USE_XIM 1377#ifdef USE_XIM
1129 if (Input_Context != NULL) 1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1130 XSetICFocus (Input_Context); 1381 XSetICFocus (Input_Context);
1382 }
1131#endif 1383#endif
1132#ifdef CURSOR_BLINK 1384#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink) 1385 if (options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif 1387#endif
1136#ifdef OFF_FOCUS_FADING 1388#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade]) 1389 if (rs[Rs_fade])
1138 { 1390 {
1139 PixColors = PixColorsFocused; 1391 pix_colors = pix_colors_focused;
1140 set_colorfgbg ();
1141 scr_clear (); 1392 scr_recolour ();
1142 scr_touch (true);
1143 } 1393 }
1144#endif 1394#endif
1145 1395
1146 } 1396 }
1147 break; 1397 break;
… …
1149 case FocusOut: 1399 case FocusOut:
1150 if (TermWin.focus) 1400 if (TermWin.focus)
1151 { 1401 {
1152 TermWin.focus = 0; 1402 TermWin.focus = 0;
1153 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
1154#ifdef USE_XIM 1411#ifdef USE_XIM
1155 if (Input_Context != NULL) 1412 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context); 1413 XUnsetICFocus (Input_Context);
1157#endif 1414#endif
1158#ifdef CURSOR_BLINK 1415#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink) 1416 if (options & Opt_cursorBlink)
1160 cursor_blink_ev.stop (); 1417 cursor_blink_ev.stop ();
1161 hidden_cursor = 0; 1418 hidden_cursor = 0;
1162#endif 1419#endif
1163#ifdef OFF_FOCUS_FADING 1420#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade]) 1421 if (rs[Rs_fade])
1165 { 1422 {
1166 PixColors = PixColorsUnFocused; 1423 pix_colors = pix_colors_unfocused;
1167 set_colorfgbg ();
1168 scr_clear (); 1424 scr_recolour ();
1169 scr_touch (true);
1170 } 1425 }
1171#endif 1426#endif
1172
1173 } 1427 }
1174 break; 1428 break;
1175 1429
1176 case ConfigureNotify: 1430 case ConfigureNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1431 if (ev.xconfigure.window == TermWin.parent[0])
… …
1182 { /* Wrap lots of configures into one */ 1436 { /* Wrap lots of configures into one */
1183 width = ev.xconfigure.width; 1437 width = ev.xconfigure.width;
1184 height = ev.xconfigure.height; 1438 height = ev.xconfigure.height;
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 } 1440 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1188 1442
1189 if (szHint.width != width || szHint.height != height) 1443 if (szHint.width != width || szHint.height != height)
1444 {
1445 seen_resize = 1;
1190 resize_all_windows (width, height, 1); 1446 resize_all_windows (width, height, 1);
1447 }
1191 1448
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent) 1450 if (options & Opt_transparent)
1194 {
1195 check_our_parents (); 1451 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif 1452#endif
1200 } 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
1201 break; 1461 break;
1202 1462
1203 case SelectionClear: 1463 case SelectionClear:
1204 selection_clear (); 1464 selection_clear ();
1205 break; 1465 break;
1206 1466
1207 case SelectionNotify: 1467 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1468 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1470 break;
1212 1471
1213 case SelectionRequest: 1472 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1215 break; 1474 break;
… …
1239 if (ev.xany.window == TermWin.vt) 1498 if (ev.xany.window == TermWin.vt)
1240 { 1499 {
1241 do 1500 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1501 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1502 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1245 1504
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1506
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1251 1510
1252 scr_refresh (refresh_type); 1511 scr_refresh (refresh_type);
1253 } 1512 }
1254 else 1513 else
1255 { 1514 {
1256 XEvent unused_event; 1515 XEvent unused_event;
1257 1516
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1517 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1259 ; 1518 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1519 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1520 ;
1262 1521
1263 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1264 { 1523 {
1265 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
… …
1270 menubar_expose (); 1529 menubar_expose ();
1271#endif 1530#endif
1272 1531
1273#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1533 if (am_transparent && ev.xany.window == TermWin.parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1534 XClearWindow (disp, ev.xany.window);
1276#endif 1535#endif
1277 } 1536 }
1278 break; 1537 break;
1279 1538
1280 case MotionNotify: 1539 case MotionNotify:
… …
1287 { 1546 {
1288 menubar_control (ev.xbutton); 1547 menubar_control (ev.xbutton);
1289 break; 1548 break;
1290 } 1549 }
1291#endif 1550#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1552 break;
1294 1553
1295 if (ev.xany.window == TermWin.vt) 1554 if (ev.xany.window == TermWin.vt)
1296 { 1555 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1556 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1557 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1300 ; 1559 ;
1301 1560
1302 XQueryPointer (display->display, TermWin.vt, 1561 XQueryPointer (disp, TermWin.vt,
1303 &unused_root, &unused_child, 1562 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1563 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1564 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1565 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1566#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1567 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1568 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1569 {
1311#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
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1579 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1580 ev.xbutton.state & Button3Mask ? 2 : 0);
1581
1314#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1317 { 1585 {
1318 int dist; 1586 int dist;
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1593
1326 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1328 */ 1596 */
1329 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1600
1334 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y < TermWin.int_bwidth)
1336 { 1603 {
1337 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1339 } 1606 }
1340 else 1607 else
1341 { 1608 {
1342 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y -
1344 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1345 } 1611 }
1612
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1348 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1350 } 1618 }
1351 else 1619 else
1352 { 1620 {
1353 /* we are within the text window, so we 1621 /* we are within the text window, so we
1354 * shouldn't be scrolling 1622 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1624 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1358 } 1626 }
1359#endif 1627#endif
1360#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1361
1362 } 1629 }
1363#endif 1630#endif
1364
1365 } 1631 }
1366 } 1632 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1634 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1370 MotionNotify, &ev)) ; 1636 MotionNotify, &ev))
1637 ;
1638
1371 XQueryPointer (display->display, scrollBar.win, 1639 XQueryPointer (disp, scrollBar.win,
1372 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1642 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1643 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1645 scrollbar_size ());
1378 scr_refresh (refresh_type); 1646 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1647 refresh_limit = 0;
… …
1381 } 1649 }
1382 break; 1650 break;
1383 } 1651 }
1384} 1652}
1385 1653
1654#if TRANSPARENT
1386void 1655void
1387rxvt_term::rootwin_cb (XEvent &ev) 1656rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1657{
1389 SET_R (this); 1658 SET_R (this);
1390 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1391 1660
1392 switch (ev.type) 1661 switch (ev.type)
1393 { 1662 {
1394 case PropertyNotify: 1663 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1664 /*
1405 * 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,
1406 * 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.
1407 */ 1667 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1668 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1412 return; 1670 return;
1413 }
1414 1671
1415 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1416 case ReparentNotify: 1673 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1419 break; 1676 break;
1420#endif
1421 } 1677 }
1422} 1678}
1679#endif
1423 1680
1424void 1681void
1425rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1426{ 1683{
1427 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1428 1685
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate) 1687 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1432 /* 1690 /*
1433 * VT window processing of button press 1691 * VT window processing of button press
1434 */ 1692 */
1435 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1436 { 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
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1705
1438 if (reportmode) 1706 if (reportmode)
1439 { 1707 {
1440 /* mouse report from vt window */ 1708 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1709 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1710 MEvent.state = ev.state;
… …
1471 } 1739 }
1472 else 1740 else
1473 { 1741 {
1474 if (ev.button != MEvent.button) 1742 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1743 MEvent.clicks = 0;
1744
1476 switch (ev.button) 1745 switch (ev.button)
1477 { 1746 {
1478 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
1479 /* allow shift+left click to extend selection */ 1756 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1758 {
1482 if (MEvent.button == Button1 && clickintime) 1759 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1760 selection_rotate (ev.x, ev.y);
1484 else 1761 else
1485 selection_extend (ev.x, ev.y, 1); 1762 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1777 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1778 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1779 selection_rotate (ev.x, ev.y);
1503 else 1780 else
1504 selection_extend (ev.x, ev.y, 1); 1781 selection_extend (ev.x, ev.y, 1);
1782
1505 MEvent.button = Button3; 1783 MEvent.button = Button3;
1506 break; 1784 break;
1507 } 1785 }
1508 } 1786 }
1787
1509 MEvent.time = ev.time; 1788 MEvent.time = ev.time;
1510 return; 1789 return;
1511 } 1790 }
1512 1791
1513 /* 1792 /*
… …
1605 break; 1884 break;
1606 case R_SB_ALIGN_BOTTOM: 1885 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1886 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1887 break;
1609 } 1888 }
1889
1610 if (scrollBar.style == R_SB_XTERM 1890 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1891 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1892 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1893 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1894
1615 scrollBar.setMotion (); 1895 scrollBar.setMotion ();
1616 break; 1896 break;
1617 1897
1618 case Button1: 1898 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1899 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1643 scr_page ((ev.button == Button1 ? DN : UP), 1923 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 1924 (TermWin.nrow
1645 * scrollbar_position (ev.y) 1925 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 1926 / scrollbar_size ()));
1647 } 1927 }
1928
1648 break; 1929 break;
1649 } 1930 }
1650 } 1931 }
1651 return; 1932 return;
1652 } 1933 }
… …
1664{ 1945{
1665 int reportmode = 0; 1946 int reportmode = 0;
1666 1947
1667 csrO = 0; /* reset csr Offset */ 1948 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 1949 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1950 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 1951
1671 if (scrollbar_isUpDn ()) 1952 if (scrollbar_isUpDn ())
1672 { 1953 {
1673 scrollBar.setIdle (); 1954 scrollBar.setIdle ();
1674 scrollbar_show (0); 1955 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 1957 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 1958#endif
1678
1679 } 1959 }
1960
1680#ifdef SELECTION_SCROLLING 1961#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 1962 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 1963 sel_scroll_ev.stop();
1683#endif 1964#endif
1965
1684 if (ev.window == TermWin.vt) 1966 if (ev.window == TermWin.vt)
1685 { 1967 {
1968#if ISO_14755
1969 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return;
1972#endif
1686 if (reportmode) 1973 if (reportmode)
1687 { 1974 {
1688 /* mouse report from vt window */ 1975 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 1976 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 1977 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 1991 MEvent.button = AnyButton;
1705 mouse_report (ev); 1992 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 1993#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 1994 return;
1708 } 1995 }
1996
1709 /* 1997 /*
1710 * dumb hack to compensate for the failure of click-and-drag 1998 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 1999 * when overriding mouse reporting
1712 */ 2000 */
1713 if (PrivateModes & PrivMode_mouse_report 2001 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2002 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2003 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2004 selection_extend (ev.x, ev.y, 0);
1717 2005
1718 switch (ev.button) 2006 switch (ev.button)
… …
1733 2021
1734 v = ev.button == Button4 ? UP : DN; 2022 v = ev.button == Button4 ? UP : DN;
1735 2023
1736 if (ev.state & ShiftMask) 2024 if (ev.state & ShiftMask)
1737 i = 1; 2025 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2026 else if (options & Opt_mouseWheelScrollPage)
1739 i = TermWin.nrow - 1; 2027 i = TermWin.nrow - 1;
1740 else 2028 else
1741 i = 5; 2029 i = 5;
1742 2030
1743# ifdef MOUSE_SLIP_WHEELING 2031# ifdef MOUSE_SLIP_WHEELING
… …
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2082 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2083 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2084 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2085 int i;
1798 2086
1799 Visual* visual = display->visual; 2087 Visual *visual = display->visual;
1800 2088
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2089 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2090
1803 /* for convenience */ 2091 /* for convenience */
1804 mask_r = visual->red_mask; 2092 mask_r = visual->red_mask;
… …
2025 Atom atype; 2313 Atom atype;
2026 unsigned char *prop = NULL; 2314 unsigned char *prop = NULL;
2027 Window root, oldp, *list; 2315 Window root, oldp, *list;
2028 Pixmap rootpixmap = None; 2316 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2317 XWindowAttributes wattr, wrootattr;
2318 dDisp;
2030 2319
2031 pchanged = 0; 2320 pchanged = 0;
2032 2321
2033 if (!(Options & Opt_transparent)) 2322 if (!(options & Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2323 return pchanged; /* Don't try any more */
2035 2324
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2325 XGetWindowAttributes (disp, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2326 rootdepth = wrootattr.depth;
2038 2327
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2040 2329
2041 if (rootdepth != wattr.depth) 2330 if (rootdepth != wattr.depth)
2042 { 2331 {
2043 if (am_transparent) 2332 if (am_transparent)
2044 { 2333 {
2045 pchanged = 1; 2334 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2336 am_transparent = am_pixmap_trans = 0;
2048 } 2337 }
2049 2338
2050 return pchanged; /* Don't try any more */ 2339 return pchanged; /* Don't try any more */
2051 } 2340 }
2052 2341
2053 /* 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. */
2054 XSync (display->display, False); 2343 XSync (disp, False);
2055 2344
2056 /* 2345 /*
2057 * Make the frame window set by the window manager have 2346 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2347 * the root background. Some window managers put multiple nested frame
2059 * 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.
2060 */ 2349 */
2061 i = (xa[XA_XROOTPMAPID] 2350 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2351 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2352 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2353 &nitems, &bytes_after, &prop) == Success);
2065 2354
2066 if (!i || prop == NULL) 2355 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2356 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2357 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2359 &nitems, &bytes_after, &prop) == Success);
2071 2360
2072 if (!i || prop == NULL 2361 if (!i || prop == NULL
2073#if TINTING 2362#if TINTING
… …
2092 Window cr; 2381 Window cr;
2093 XImage *image; 2382 XImage *image;
2094 GC gc; 2383 GC gc;
2095 XGCValues gcvalue; 2384 XGCValues gcvalue;
2096 2385
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2387 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2388 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2389 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2390 nx = ny = 0;
2102 2391
… …
2114 sy = 0; 2403 sy = 0;
2115 } 2404 }
2116 2405
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2408
2409 XSync (disp, False);
2119 allowedxerror = -1; 2410 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2412
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2413 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2414 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2415 allowedxerror = 0;
2125 2416
… …
2128 if (am_transparent && am_pixmap_trans) 2419 if (am_transparent && am_pixmap_trans)
2129 { 2420 {
2130 pchanged = 1; 2421 pchanged = 1;
2131 if (TermWin.pixmap != None) 2422 if (TermWin.pixmap != None)
2132 { 2423 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2424 XFreePixmap (disp, TermWin.pixmap);
2134 TermWin.pixmap = None; 2425 TermWin.pixmap = None;
2135 } 2426 }
2136 } 2427 }
2137 2428
2138 am_pixmap_trans = 0; 2429 am_pixmap_trans = 0;
2139 } 2430 }
2140 else 2431 else
2141 { 2432 {
2142 if (TermWin.pixmap != None) 2433 if (TermWin.pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2434 XFreePixmap (disp, TermWin.pixmap);
2144 2435
2145#if TINTING 2436#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2437 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2438 {
2148 unsigned short rm, gm, bm; 2439 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2440 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2441
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2442 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2443
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2444 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2445 }
2155#endif 2446#endif
2156 2447
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2158 szHint.width, szHint.height, image->depth); 2449 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2452 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2453 XFreeGC (disp, gc);
2163 XDestroyImage (image); 2454 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2456 XClearWindow (disp, TermWin.parent[0]);
2166 2457
2167 if (!am_transparent || !am_pixmap_trans) 2458 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2459 pchanged = 1;
2169 2460
2170 am_transparent = am_pixmap_trans = 1; 2461 am_transparent = am_pixmap_trans = 1;
2171 } 2462 }
2172 } 2463 }
2173 2464
2174 if (!am_pixmap_trans) 2465 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2467 else
2175 { 2468 {
2176 unsigned int n; 2469 unsigned int n;
2177 /* 2470 /*
2178 * InheritPixmap transparency 2471 * InheritPixmap transparency
2179 */ 2472 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 { 2474 {
2183 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (disp, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2478 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2479
2189 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2190 { 2481 {
2191 if (oldp != None) 2482 if (oldp != None)
2192 pchanged = 1; 2483 pchanged = 1;
… …
2202 2493
2203 if (pchanged) 2494 if (pchanged)
2204 { 2495 {
2205 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2206 { 2497 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2500 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break; 2502 break;
2213 } 2503 }
2214 } 2504 }
2215 } 2505 }
2216 2506
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 { 2508 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2511 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2224 } 2513 }
2225 else 2514 else
2226 { 2515 {
2227#if WAIT_FOR_WM 2516#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2519 sleep (1);
2231#endif 2520#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2234 { 2522 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2524 XClearWindow (disp, TermWin.parent[n]);
2237 } 2525 }
2238 2526
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2240 am_transparent = 1; 2528 am_transparent = 1;
2241 } 2529 }
2242 2530
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2245 } 2533 }
2246 2534
2247 // this is experimental
2248 if (scrollBar.win) 2535 if (scrollBar.win)
2249 { 2536 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2538 scrollBar.setIdle ();
2253 scrollbar_show (0); 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 ();
2254 } 2547 }
2255 2548
2256 return pchanged; 2549 return pchanged;
2257} 2550}
2258#endif 2551#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2570 if (ch == NOCHAR) // TODO: improve
2278 break; 2571 break;
2279 2572
2280 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)
2281 { 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
2282 /* Read a text string from the input buffer */ 2589 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2590 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2591 bool refreshnow = false;
2285 int nlines = 0; 2592 int nlines = 0;
2286 unicode_t *str = buf; 2593 unicode_t *str = buf;
2287 2594
2288 *str++ = ch;
2289
2290 for (;;) 2595 for (;;)
2291 { 2596 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2598 break;
2297 2599
2298 *str++ = ch; 2600 *str++ = ch;
2299 2601
2300 if (ch == C0_LF) 2602 if (ch == C0_LF)
2301 { 2603 {
2302 nlines++; 2604 nlines++;
2303 refresh_count++; 2605 refresh_count++;
2304 2606
2305 if (! (Options & Opt_jumpScroll) 2607 if (!(options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 { 2609 {
2308 refreshnow = true; 2610 refreshnow = true;
2309 ch = NOCHAR; 2611 ch = NOCHAR;
2310 break; 2612 break;
2311 } 2613 }
2312 2614
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2616 if (nlines >= TermWin.nrow - 1)
2315 { 2617 {
2316 scr_add_lines (buf, nlines, str - buf); 2618 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2619 nlines = 0;
2318 str = buf; 2620 str = buf;
… …
2322 if (str >= buf + UBUFSIZ) 2624 if (str >= buf + UBUFSIZ)
2323 { 2625 {
2324 ch = NOCHAR; 2626 ch = NOCHAR;
2325 break; 2627 break;
2326 } 2628 }
2629
2630 seq_begin = cmdbuf_ptr;
2631 ch = next_char ();
2327 } 2632 }
2328 2633
2329 scr_add_lines (buf, nlines, str - buf); 2634 scr_add_lines (buf, nlines, str - buf);
2330 2635
2331 /* 2636 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2639 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2640 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2641 */
2337 if (refreshnow) 2642 if (refreshnow)
2338 { 2643 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2645 refresh_limit++;
2341 else 2646 else
2342 { 2647 {
2343 flag = true; 2648 flag = true;
2344 scr_refresh (refresh_type); 2649 scr_refresh (refresh_type);
… …
2398 if (len == (size_t)-1) 2703 if (len == (size_t)-1)
2399 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
2400 2705
2401 // assume wchar == unicode 2706 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2707 cmdbuf_ptr += len;
2403 return wc; 2708 return wc & UNICODE_MASK;
2404 } 2709 }
2405 2710
2406 return NOCHAR; 2711 return NOCHAR;
2407} 2712}
2408 2713
… …
2534 process_escape_seq (); 2839 process_escape_seq ();
2535 break; 2840 break;
2536 case C0_ENQ: /* terminal Status */ 2841 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2842 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2845 else
2541 tt_write ((unsigned char *)VT100_ANS, 2846 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2847 (unsigned int)strlen (VT100_ANS));
2543 break; 2848 break;
2544 case C0_BEL: /* bell */ 2849 case C0_BEL: /* bell */
2545 scr_bell (); 2850 scr_bell ();
2546 break; 2851 break;
2547 case C0_BS: /* backspace */ 2852 case C0_BS: /* backspace */
… …
2646void 2951void
2647rxvt_term::process_escape_seq () 2952rxvt_term::process_escape_seq ()
2648{ 2953{
2649 unicode_t ch = cmd_getc (); 2954 unicode_t ch = cmd_getc ();
2650 2955
2651 if (PrivateModes & PrivMode_vt52) 2956 if (priv_modes & PrivMode_vt52)
2652 { 2957 {
2653 process_escape_vt52 (ch); 2958 process_escape_vt52 (ch);
2654 return; 2959 return;
2655 } 2960 }
2656 2961
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 2976 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 2977 break;
2673 case '+': 2978 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 2979 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 2980 break;
2676#ifndef NO_FRILLS 2981#if ENABLE_FRILLS
2677 case '6': 2982 case '6':
2678 scr_backindex (); 2983 scr_backindex ();
2679 break; 2984 break;
2680#endif 2985#endif
2681 case '7': 2986 case '7':
2682 scr_cursor (SAVE); 2987 scr_cursor (SAVE);
2683 break; 2988 break;
2684 case '8': 2989 case '8':
2685 scr_cursor (RESTORE); 2990 scr_cursor (RESTORE);
2686 break; 2991 break;
2687#ifndef NO_FRILLS 2992#if ENABLE_FRILLS
2688 case '9': 2993 case '9':
2689 scr_forwardindex (); 2994 scr_forwardindex ();
2690 break; 2995 break;
2691#endif 2996#endif
2692 case '=': 2997 case '=':
… …
2871 { 3176 {
2872 switch (priv) 3177 switch (priv)
2873 { 3178 {
2874 case '>': 3179 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 3180 if (ch == CSI_DA) /* secondary device attributes */
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3181 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2877 break; 3182 break;
2878 case '?': 3183 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3184 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3185 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3186 break;
… …
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2992 break; 3297 break;
2993 3298
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3300 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3301 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3302 break;
2998 3303
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3305 process_sgr_mode (nargs, arg);
3001 break; 3306 break;
… …
3008 break; 3313 break;
3009 case 6: /* CPR requested */ 3314 case 6: /* CPR requested */
3010 scr_report_position (); 3315 scr_report_position ();
3011 break; 3316 break;
3012 case 7: /* unofficial extension */ 3317 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3318 if (options & Opt_insecure)
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3319 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3320 break;
3016 case 8: /* unofficial extension */ 3321 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3323 break;
3019 } 3324 }
… …
3055 break; 3360 break;
3056 3361
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3362 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3363 if (arg[0] == 4)
3059 scr_insert_mode (0); 3364 scr_insert_mode (0);
3365 else if (arg[0] == 20)
3366 priv_modes &= ~PrivMode_LFNL;
3060 break; 3367 break;
3061 3368
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3369 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3370 if (arg[0] == 4)
3064 scr_insert_mode (1); 3371 scr_insert_mode (1);
3372 else if (arg[0] == 20)
3373 priv_modes |= PrivMode_LFNL;
3065 break; 3374 break;
3066 3375
3067 /* 3376 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3377 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3378 */
… …
3081 break; 3390 break;
3082 case CSI_75: 3391 case CSI_75:
3083 scr_cursor (RESTORE); 3392 scr_cursor (RESTORE);
3084 break; 3393 break;
3085 3394
3086#ifndef NO_FRILLS 3395#if ENABLE_FRILLS
3087 case CSI_74: 3396 case CSI_74:
3088 process_window_ops (arg, nargs); 3397 process_window_ops (arg, nargs);
3089 break; 3398 break;
3090#endif 3399#endif
3091 3400
… …
3098 break; 3407 break;
3099 } 3408 }
3100} 3409}
3101/*}}} */ 3410/*}}} */
3102 3411
3103#ifndef NO_FRILLS 3412#if ENABLE_FRILLS
3104/* ARGSUSED */ 3413/* ARGSUSED */
3105void 3414void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3415rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3416{
3108 int x, y; 3417 int x, y;
3109 XWindowAttributes wattr; 3418 XWindowAttributes wattr;
3110 Window wdummy; 3419 Window wdummy;
3420 dDisp;
3111 3421
3112 if (nargs == 0) 3422 if (nargs == 0)
3113 return; 3423 return;
3114 3424
3115 switch (args[0]) 3425 switch (args[0])
3116 { 3426 {
3117 /* 3427 /*
3118 * commands 3428 * commands
3119 */ 3429 */
3120 case 1: /* deiconify window */ 3430 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3431 XMapWindow (disp, TermWin.parent[0]);
3122 break; 3432 break;
3123 case 2: /* iconify window */ 3433 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3434 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3435 break;
3127 case 3: /* set position (pixels) */ 3436 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3129 break; 3438 break;
3130 case 4: /* set size (pixels) */ 3439 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3441 break;
3133 case 5: /* raise window */ 3442 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3443 XRaiseWindow (disp, TermWin.parent[0]);
3135 break; 3444 break;
3136 case 6: /* lower window */ 3445 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3446 XLowerWindow (disp, TermWin.parent[0]);
3138 break; 3447 break;
3139 case 7: /* refresh window */ 3448 case 7: /* refresh window */
3140 scr_touch (true); 3449 scr_touch (true);
3141 break; 3450 break;
3142 case 8: /* set size (chars) */ 3451 case 8: /* set size (chars) */
… …
3154 3463
3155 /* 3464 /*
3156 * reports - some output format copied from XTerm 3465 * reports - some output format copied from XTerm
3157 */ 3466 */
3158 case 11: /* report window state */ 3467 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3470 break;
3162 case 13: /* report window position */ 3471 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3474 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3475 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3476 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3477 break;
3169 case 14: /* report window size (pixels) */ 3478 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3481 break;
3173 case 18: /* report text area size (chars) */ 3482 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3175 break; 3484 break;
3176 case 19: /* report window size (chars) */ 3485 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3178 break; 3487 break;
3179 case 20: /* report icon label */ 3488 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3489 {
3182 char *s; 3490 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3491 XGetIconName (disp, TermWin.parent[0], &s);
3184 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);
3185 } 3494 }
3186 break; 3495 break;
3187 case 21: /* report window title */ 3496 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3497 {
3190 char *s; 3498 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3499 XFetchName (disp, TermWin.parent[0], &s);
3192 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);
3193 } 3502 }
3194 break; 3503 break;
3195 } 3504 }
3196} 3505}
3197#endif 3506#endif
3198 3507
… …
3202 * ends_how is terminator used. returned input must be free()'d 3511 * ends_how is terminator used. returned input must be free()'d
3203 */ 3512 */
3204unsigned char * 3513unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3514rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3515{
3207 unicode_t prev = 0, ch; 3516 unicode_t ch;
3517 bool seen_esc = false;
3208 unsigned int n = 0; 3518 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3519 wchar_t string[STRING_MAX];
3211 3520
3212 while ((ch = cmd_getc ()) != NOCHAR) 3521 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3522 {
3214 if (prev == C0_ESC) 3523 if (seen_esc)
3215 { 3524 {
3216 if (ch == 0x5c) /* 7bit ST */ 3525 if (ch == 0x5c) /* 7bit ST */
3217 break; 3526 break;
3218 else 3527 else
3219 return NULL; 3528 return NULL;
3220 } 3529 }
3530 else if (ch == C0_ESC)
3531 {
3532 seen_esc = true;
3533 continue;
3534 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3535 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3536 break;
3223 else if (ch < 0x20) 3537 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3538 return NULL; /* other control character - exit */
3539
3540 seen_esc = false;
3225 3541
3226 if (n >= sizeof (string) - 1) 3542 if (n >= sizeof (string) - 1)
3227 // stop at some sane length 3543 // stop at some sane length
3228 return NULL; 3544 return NULL;
3229 3545
3230 if (ch == C0_SYN) 3546 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3547 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3548 else
3236 string[n++] = prev = ch; 3549 string[n++] = ch;
3237 } 3550 }
3238 3551
3239 string[n++] = '\0'; 3552 string[n++] = '\0';
3240 3553
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3554 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3555
3246 return s; 3556 return (unsigned char *)rxvt_wcstombs (string);
3247} 3557}
3248 3558
3249/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
3250/* 3560/*
3251 * 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)'
… …
3295void 3605void
3296rxvt_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)
3297{ 3607{
3298 if (str[0] == '?' && !str[1]) 3608 if (str[0] == '?' && !str[1])
3299 { 3609 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3610 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3611 pix_colors_focused[color].get (display, r, g, b);
3304 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);
3305 }
3306 } 3613 }
3307 else 3614 else
3308 set_window_color (color, str); 3615 set_window_color (color, str);
3309} 3616}
3310 3617
… …
3338{ 3645{
3339 int changed = 0; 3646 int changed = 0;
3340 int color; 3647 int color;
3341 char *buf, *name; 3648 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3649 bool query = str[0] == '?' && !str[1];
3650 int saveop = op;
3651 dDisp;
3343 3652
3344 assert (str != NULL); 3653 assert (str != NULL);
3345 switch (op) 3654 switch (op)
3346 { 3655 {
3347 case XTerm_name: 3656 case XTerm_name:
… …
3354 set_title (str); 3663 set_title (str);
3355 break; 3664 break;
3356 case XTerm_property: 3665 case XTerm_property:
3357 if (str[0] == '?') 3666 if (str[0] == '?')
3358 { 3667 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3668 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3669 Atom actual_type;
3361 int actual_format; 3670 int actual_format;
3362 unsigned long nitems; 3671 unsigned long nitems;
3363 unsigned long bytes_after; 3672 unsigned long bytes_after;
3364 unsigned char *value = 0; 3673 unsigned char *value = 0;
3365 const char *str = ""; 3674 const char *str = "";
3366 3675
3367 if (prop 3676 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3677 && XGetWindowProperty (disp, TermWin.parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3678 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3679 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3680 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3681 && actual_type != None
3373 && actual_format == 8) 3682 && actual_format == 8)
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3691 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3692
3384 if (eq) 3693 if (eq)
3385 { 3694 {
3386 *eq = 0; 3695 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3696 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3697 }
3392 else 3698 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3699 XDeleteProperty (disp, TermWin.parent[0],
3394 display->atom (str)); 3700 display->atom (str));
3395 } 3701 }
3396 break; 3702 break;
3397 3703
3398 case XTerm_Color: 3704 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3705 for (buf = (char *)str; buf && *buf;)
3400 { 3706 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3707 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3708 break;
3403 3709
3404 *name++ = '\0'; 3710 *name++ = '\0';
3405 color = atoi (buf); 3711 color = atoi (buf);
3406 3712
3407 if (color < 0 || color >= TOTAL_COLORS) 3713 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3714 break;
3409 3715
3410 if ((buf = STRCHR (name, ';')) != NULL) 3716 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3717 *buf++ = '\0';
3412 3718
3413 if (name[0] == '?' && !name[1]) 3719 if (name[0] == '?' && !name[1])
3414 { 3720 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3721 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3722 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3723 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3724 }
3422 else 3725 else
3423 set_window_color (color + minCOLOR, name); 3726 set_window_color (color + minCOLOR, name);
3424 } 3727 }
3425 break; 3728 break;
… …
3442 break; 3745 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE 3746#ifndef NO_BOLD_UNDERLINE_REVERSE
3444 case XTerm_Color_BD: 3747 case XTerm_Color_BD:
3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3446 break; 3749 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3447 case XTerm_Color_UL: 3753 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3755 break;
3450 case XTerm_Color_RV: 3756 case XTerm_Color_RV:
3451 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;
3452 break; 3766 break;
3453#endif 3767#endif
3454 3768
3455 case XTerm_Pixmap: 3769 case XTerm_Pixmap:
3456 if (*str != ';') 3770 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3773 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3774 set_bgPixmap (str); /* change pixmap */
3461#endif 3775#endif
3462 scr_touch (true); 3776 scr_touch (true);
3463 } 3777 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3778 while ((str = strchr (str, ';')) != NULL)
3465 { 3779 {
3466 str++; 3780 str++;
3467#if XPM_BACKGROUND 3781#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3782 changed += scale_pixmap (str);
3469#endif 3783#endif
3470
3471 } 3784 }
3785
3472 if (changed) 3786 if (changed)
3473 { 3787 {
3474#ifdef XPM_BACKGROUND 3788#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3789 resize_pixmap ();
3476#endif 3790#endif
… …
3488 case XTerm_logfile: 3802 case XTerm_logfile:
3489 // TODO, when secure mode? 3803 // TODO, when secure mode?
3490 break; 3804 break;
3491 3805
3492 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
3493 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
3494 { 3820 {
3495 if (Options & Opt_insecure) 3821 const char *&res = rs[Rs_font + (op - URxvt_font)];
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3822
3497 TermWin.fontset->fontdesc 3823 res = strdup (str);
3498 ? TermWin.fontset->fontdesc 3824 allocated.push_back ((void *)res);
3499 : "", 3825 set_fonts ();
3500 resp);
3501 } 3826 }
3502 else
3503 change_font (str);
3504 break; 3827 break;
3505 3828
3506#ifndef NO_FRILLS 3829#if ENABLE_FRILLS
3507 case XTerm_locale: 3830 case XTerm_locale:
3508 if (query) 3831 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3512 }
3513 else 3833 else
3514 { 3834 {
3515 set_locale (str); 3835 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8);
3516# ifdef USE_XIM 3837# ifdef USE_XIM
3517 im_cb (); 3838 im_cb ();
3518# endif 3839# endif
3519 } 3840 }
3520 break; 3841 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif 3842#endif
3531 3843
3532#ifdef MENUBAR 3844#ifdef MENUBAR
3533 case XTerm_Menu: 3845 case XTerm_Menu:
3534 if (Options & Opt_insecure) 3846 if (options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3848 break;
3537#endif 3849#endif
3538#if 0 3850#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
… …
3566{ 3878{
3567 int state; 3879 int state;
3568 3880
3569 if (mode == 's') 3881 if (mode == 's')
3570 { 3882 {
3571 SavedModes |= (PrivateModes & bit); 3883 SavedModes |= (priv_modes & bit);
3572 return -1; 3884 return -1;
3573 } 3885 }
3574 else 3886 else
3575 { 3887 {
3576 if (mode == 'r') 3888 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3889 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3890 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3891 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3892 PrivMode (state, bit);
3581 } 3893 }
3582 3894
3583 return state; 3895 return state;
3584} 3896}
… …
3602 { 3, PrivMode_132 }, 3914 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 3915 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 3916 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 3917 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 3918 { 7, PrivMode_Autowrap },
3919 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 3920 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3921#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 3922 { menuBar_esc, PrivMode_menuBar },
3610#endif 3923#endif
3924 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 3926#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3927 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3928#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3929 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 3930 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3931 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3932 // 45 margin bell NYI
3621 // 46 start logging 3933 // 46 start logging
… …
3662 3974
3663 /* extra handling for values with state unkept */ 3975 /* extra handling for values with state unkept */
3664 switch (arg[i]) 3976 switch (arg[i])
3665 { 3977 {
3666 case 1048: /* alternative cursor save */ 3978 case 1048: /* alternative cursor save */
3979 case 1049:
3667 if (Options & Opt_secondaryScreen) 3980 if (options & Opt_secondaryScreen)
3668 if (mode == 0) 3981 if (mode == 0)
3669 scr_cursor (RESTORE); 3982 scr_cursor (RESTORE);
3670 else if (mode == 1) 3983 else if (mode == 1)
3671 scr_cursor (SAVE); 3984 scr_cursor (SAVE);
3672 break; 3985 break;
… …
3683 * within VT52 mode 3996 * within VT52 mode
3684 */ 3997 */
3685 PrivMode (1, PrivMode_vt52); 3998 PrivMode (1, PrivMode_vt52);
3686 break; 3999 break;
3687 case 3: /* 80/132 */ 4000 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4001 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3690 break; 4003 break;
3691 case 4: /* smooth scrolling */ 4004 case 4: /* smooth scrolling */
3692 if (state) 4005 if (state)
3693 Options &= ~Opt_jumpScroll; 4006 options &= ~Opt_jumpScroll;
3694 else 4007 else
3695 Options |= Opt_jumpScroll; 4008 options |= Opt_jumpScroll;
3696 break; 4009 break;
3697 case 5: /* reverse video */ 4010 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4011 scr_rvideo_mode (state);
3699 break; 4012 break;
3700 case 6: /* relative/absolute origins */ 4013 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4017 scr_autowrap (state);
3705 break; 4018 break;
3706 /* 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 */
3707 case 9: /* X10 mouse reporting */ 4020 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4021 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4022 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4023 break;
3711#ifdef menuBar_esc 4024#ifdef menuBar_esc
3712 case menuBar_esc: 4025 case menuBar_esc:
3713#ifdef MENUBAR 4026#ifdef MENUBAR
3714 map_menuBar (state); 4027 map_menuBar (state);
… …
3734 break; 4047 break;
3735 /* case 66: - application key pad */ 4048 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4049 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4050 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4051 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4052 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4053 break;
3741#if 0 4054#if 0
3742 case 1001: 4055 case 1001:
3743 break; /* X11 mouse highlighting */ 4056 break; /* X11 mouse highlighting */
3744#endif 4057#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4058 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4059 if (state)
3747 Options &= ~Opt_scrollTtyOutput; 4060 options &= ~Opt_scrollTtyOutput;
3748 else 4061 else
3749 Options |= Opt_scrollTtyOutput; 4062 options |= Opt_scrollTtyOutput;
3750 break; 4063 break;
3751 case 1011: /* scroll to bottom on key press */ 4064 case 1011: /* scroll to bottom on key press */
3752 if (state) 4065 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4066 options |= Opt_scrollTtyKeypress;
3754 else 4067 else
3755 Options &= ~Opt_scrollTtyKeypress; 4068 options &= ~Opt_scrollTtyKeypress;
3756 break; 4069 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4070 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4071 if (options & Opt_secondaryScreen)
3759 if (current_screen != PRIMARY) 4072 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4073 scr_erase_screen (2);
3761 scr_change_screen (state); 4074 scr_change_screen (state);
3762 break; 4075 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4076 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4077 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4078 if (options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY) 4079 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4080 scr_erase_screen (2);
3768 break; 4081 break;
3769 default: 4082 default:
3770 break; 4083 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4109 rendset = 0, rendstyle = ~RS_None;
3797 break; 4110 break;
3798 case 1: 4111 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4112 rendset = 1, rendstyle = RS_Bold;
3800 break; 4113 break;
3801 //case 2: // faint or second colour 4114 //case 2: // low intensity
4115 case 3:
4116 rendset = 1, rendstyle = RS_Italic;
4117 break;
3802 case 4: 4118 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4119 rendset = 1, rendstyle = RS_Uline;
3804 break; 4120 break;
3805 case 5: // slowly blinking 4121 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4122 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4134 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4135 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4136 //...
3821 //case 19: // ninth alt font 4137 //case 19: // ninth alt font
3822 //case 20: // gothic 4138 //case 20: // gothic
3823 case 21: // disable bold, faint 4139 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4140 rendset = 0, rendstyle = RS_Bold;
3825 break; 4141 break;
3826 case 22: 4142 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4143 rendset = 0, rendstyle = RS_Bold;
3828 break; 4144 break;
3829 //case 23: disable italic 4145 case 23: // disable italic
4146 rendset = 0, rendstyle = RS_Italic;
4147 break;
3830 case 24: 4148 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4149 rendset = 0, rendstyle = RS_Uline;
3832 break; 4150 break;
3833 case 25: 4151 case 25:
4152 rendset = 0, rendstyle = RS_Blink;
4153 break;
4154 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4155 rendset = 0, rendstyle = RS_Blink;
3835 break; 4156 break;
3836 case 27: 4157 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4158 rendset = 0, rendstyle = RS_RVid;
3838 break; 4159 break;
… …
3856 case 35: 4177 case 35:
3857 case 36: 4178 case 36:
3858 case 37: 4179 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4180 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4181 break;
3861#ifdef TTY_256COLOR 4182 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4183 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4184 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4185 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4186 i += 2;
3867 } 4187 }
3868 break; 4188 break;
3869#endif
3870 case 39: /* default fg */ 4189 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4190 scr_color (Color_fg, Color_fg);
3872 break; 4191 break;
3873 4192
3874 case 40: 4193 case 40:
… …
3879 case 45: 4198 case 45:
3880 case 46: 4199 case 46:
3881 case 47: 4200 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4201 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4202 break;
3884#ifdef TTY_256COLOR 4203 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4204 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4205 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4206 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4207 i += 2;
3890 } 4208 }
3891 break; 4209 break;
3892#endif
3893 case 49: /* default bg */ 4210 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4211 scr_color (Color_bg, Color_bg);
3895 break; 4212 break;
4213
4214 //case 50: // not variable spacing
3896 4215
3897#ifndef NO_BRIGHTCOLOR 4216#ifndef NO_BRIGHTCOLOR
3898 case 90: 4217 case 90:
3899 case 91: /* set bright fg color */ 4218 case 91: /* set bright fg color */
3900 case 92: 4219 case 92:
3901 case 93: 4220 case 93:
3902 case 94: 4221 case 94:
3903 case 95: 4222 case 95:
3904 case 96: 4223 case 96:
3905 case 97: 4224 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4225 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4226 break;
3909 case 100: 4227 case 100:
3910 case 101: /* set bright bg color */ 4228 case 101: /* set bright bg color */
3911 case 102: 4229 case 102:
3912 case 103: 4230 case 103:
3913 case 104: 4231 case 104:
3914 case 105: 4232 case 105:
3915 case 106: 4233 case 106:
3916 case 107: 4234 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4236 break;
3920#endif 4237#endif
3921 4238
3922 } 4239 }
3923 } 4240 }
… …
3930{ 4247{
3931 unicode_t ch, cmd = cmd_getc (); 4248 unicode_t ch, cmd = cmd_getc ();
3932 4249
3933 if (cmd == 'Q') 4250 if (cmd == 'Q')
3934 { /* query graphics */ 4251 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4252 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4253 return;
3937 } 4254 }
3938 /* swallow other graphics sequences until terminating ':' */ 4255 /* swallow other graphics sequences until terminating ':' */
3939 do 4256 do
3940 ch = cmd_getc (); 4257 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4272 unsigned char buf[256];
3956 4273
3957 va_start (arg_ptr, fmt); 4274 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4276 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4277 tt_write (buf, strlen (buf));
3961} 4278}
3962 4279
3963/* ---------------------------------------------------------------------- */ 4280/* ---------------------------------------------------------------------- */
3964/* 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,
3965 * or generated by us in response to a query ESC sequence. 4282 * or generated by us in response to a query ESC sequence.
3966 */ 4283 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285
3967void 4286void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4287rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4288{
3970 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));
3971 4292
3972 if (len) 4293 if ((unsigned int)written == len)
4294 return;
4295
4296 data += written;
4297 len -= written;
3973 { 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
3974 if (v_buflen == 0) 4316 if (v_buflen == 0)
3975 { 4317 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4318 free (v_buffer);
4003 v_buffer = 0; 4319 v_buffer = 0;
4004 v_buflen = 0; 4320 v_buflen = 0;
4005 4321
4006 pty_ev.set (EVENT_READ); 4322 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4323 return;
4019 } 4324 }
4325
4326 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4327 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this...
4330 destroy ();
4021} 4331}
4022 4332
4023/*----------------------- end-of-file (C source) -----------------------*/ 4333/*----------------------- end-of-file (C source) -----------------------*/
4024 4334

Diff Legend

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