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

Diff Legend

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