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.426 by root, Wed Nov 5 13:49:36 2008 UTC vs.
Revision 1.440 by root, Tue Mar 30 23:00:35 2010 UTC

… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = fs->get (chr[i]);
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
505#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 513#else
508 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
509#endif 515#endif
516 max_it (lnsppg, 1);
517
510 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
511 { 519 {
512 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
513 return; 521 return;
514 } 522 }
… …
579 } 587 }
580 } 588 }
581 589
582#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 591 // ISO 14755 support
584 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 593 {
586 int hv; 594 int hv;
587 595
588 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 627 scr_overlay_off ();
620# endif 628# endif
621 iso14755buf = 0; 629 iso14755buf = 0;
622 } 630 }
623 } 631 }
632 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
627 { 636 {
628 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 638# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1471
1463 break; 1472 break;
1464 1473
1465 case SelectionClear: 1474 case SelectionClear:
1466 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1476 break;
1468 1477
1469 case SelectionNotify: 1478 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1684#endif 1693#endif
1685 1694
1686 refresh_check (); 1695 refresh_check ();
1687} 1696}
1688 1697
1698#if ENABLE_FRILLS
1689void 1699void
1690rxvt_term::set_urgency (bool enable) 1700rxvt_term::set_urgency (bool enable)
1691{ 1701{
1692 if (enable == urgency_hint) 1702 if (enable == urgency_hint)
1693 return; 1703 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1708 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1709 urgency_hint = enable;
1700 } 1710 }
1701} 1711}
1712#endif
1702 1713
1703void 1714void
1704rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1705{ 1716{
1706 if (!focus) 1717 if (!focus)
… …
2334 break; 2345 break;
2335 } 2346 }
2336 2347
2337 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2338 { 2349 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2350 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2352 }
2342 2353
2343 // assume wchar == unicode 2354 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
… …
3283 3294
3284/* 3295/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3297 */
3287void 3298void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3300{
3290 int color; 3301 int color;
3291 char *buf, *name; 3302 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3304 int saveop = op;
… …
3334 3345
3335 XFree (value); 3346 XFree (value);
3336 } 3347 }
3337 else 3348 else
3338 { 3349 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3340 3351
3341 if (eq) 3352 if (eq)
3342 { 3353 {
3343 *eq = 0; 3354 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3400 break; 3411 break;
3401 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3403 break; 3414 break;
3404#endif 3415#endif
3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3405#if ENABLE_TRANSPARENCY 3419#if ENABLE_TRANSPARENCY
3406 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3408 { 3422 {
3409 bool changed = false; 3423 bool changed = false;
… …
3424 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3439 if (!strcmp (str, "?"))
3426 { 3440 {
3427 char str[256]; 3441 char str[256];
3428 3442
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3447 }
3434 else 3448 else
… …
3657 3671
3658 scr_touch (true); 3672 scr_touch (true);
3659 break; 3673 break;
3660#endif 3674#endif
3661 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3662 case 1049:
3663 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3664 if (mode == 0) 3677 if (mode == 0)
3665 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3666 else if (mode == 1) 3679 else if (mode == 1)
3667 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
… …
3743 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3744 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3745 break; 3758 break;
3746 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3747 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3748 if (current_screen != PRIMARY) 3761 if (!state)
3749 scr_erase_screen (2); 3762 scr_erase_screen (2);
3750 3763
3751 scr_change_screen (state); 3764 scr_change_screen (state);
3752 break; 3765 break;
3753 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
3754 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3755 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3756 if (current_screen != PRIMARY) 3774 if (state)
3757 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3758 break; 3778 break;
3759 default: 3779 default:
3760 break; 3780 break;
3761 } 3781 }
3762 } 3782 }

Diff Legend

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