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.430 by root, Wed Nov 12 02:37:58 2008 UTC vs.
Revision 1.437 by sf-exg, Fri Jan 29 17:27:36 2010 UTC

… …
579 } 579 }
580 } 580 }
581 581
582#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 583 // ISO 14755 support
584 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 585 {
586 int hv; 586 int hv;
587 587
588 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 619 scr_overlay_off ();
620# endif 620# endif
621 iso14755buf = 0; 621 iso14755buf = 0;
622 } 622 }
623 } 623 }
624 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
627 { 628 {
628 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 630# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1463
1463 break; 1464 break;
1464 1465
1465 case SelectionClear: 1466 case SelectionClear:
1466 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1468 break;
1468 1469
1469 case SelectionNotify: 1470 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
2336 break; 2337 break;
2337 } 2338 }
2338 2339
2339 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2340 { 2341 {
2341 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2342 mbstate.reset (); // reset now undefined conversion state
2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2343 } 2344 }
2344 2345
2345 // assume wchar == unicode 2346 // assume wchar == unicode
2346 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
… …
3285 3286
3286/* 3287/*
3287 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3288 */ 3289 */
3289void 3290void
3290rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3291{ 3292{
3292 int color; 3293 int color;
3293 char *buf, *name; 3294 char *buf, *name;
3294 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3295 int saveop = op; 3296 int saveop = op;
… …
3336 3337
3337 XFree (value); 3338 XFree (value);
3338 } 3339 }
3339 else 3340 else
3340 { 3341 {
3341 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3342 3343
3343 if (eq) 3344 if (eq)
3344 { 3345 {
3345 *eq = 0; 3346 *eq = 0;
3346 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
… …
3429 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3430 if (!strcmp (str, "?")) 3431 if (!strcmp (str, "?"))
3431 { 3432 {
3432 char str[256]; 3433 char str[256];
3433 3434
3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3435 sprintf (str, "[%dx%d+%d+%d]",
3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3437 process_xterm_seq (XTerm_title, str, CHAR_ST); 3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3438 } 3439 }
3439 else 3440 else

Diff Legend

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