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.438 by root, Thu Feb 4 21:55:12 2010 UTC

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

Diff Legend

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