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.291 by root, Sun Jan 29 20:51:27 2006 UTC vs.
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC

… …
227# if !UNICODE3 227# if !UNICODE3
228 if (ch >= 0x10000) 228 if (ch >= 0x10000)
229 ch = 0xfffd; 229 ch = 0xfffd;
230# endif 230# endif
231 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
233 } 235 }
234 236
237// {
238// char buf[4+4+3+1];
239// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
240// scr_overlay_set (0, 0, buf);
241// }
235 scr_overlay_set (0, len , attr); 242 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 243 scr_overlay_set (0, len + 1, fname);
237 244
238 free (fname); 245 free (fname);
239 246
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3091 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3092 break;
3086 case '+': 3093 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3094 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3095 break;
3089#if ENABLE_FRILLS 3096#if !ENABLE_MINIMAL
3090 case '6': 3097 case '6':
3091 scr_backindex (); 3098 scr_backindex ();
3092 break; 3099 break;
3093#endif 3100#endif
3094 case '7': 3101 case '7':
3095 scr_cursor (SAVE); 3102 scr_cursor (SAVE);
3096 break; 3103 break;
3097 case '8': 3104 case '8':
3098 scr_cursor (RESTORE); 3105 scr_cursor (RESTORE);
3099 break; 3106 break;
3100#if ENABLE_FRILLS 3107#if !ENABLE_MINIMAL
3101 case '9': 3108 case '9':
3102 scr_forwardindex (); 3109 scr_forwardindex ();
3103 break; 3110 break;
3104#endif 3111#endif
3105 case '=': 3112 case '=':
… …
3498 break; 3505 break;
3499 case CSI_75: 3506 case CSI_75:
3500 scr_cursor (RESTORE); 3507 scr_cursor (RESTORE);
3501 break; 3508 break;
3502 3509
3503#if ENABLE_FRILLS 3510#if !ENABLE_MINIMAL
3504 case CSI_74: 3511 case CSI_74:
3505 process_window_ops (arg, nargs); 3512 process_window_ops (arg, nargs);
3506 break; 3513 break;
3507#endif 3514#endif
3508 3515
… …
3515 break; 3522 break;
3516 } 3523 }
3517} 3524}
3518/*}}} */ 3525/*}}} */
3519 3526
3520#if ENABLE_FRILLS 3527#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3528/* ARGSUSED */
3522void 3529void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3531{
3525 int x, y; 3532 int x, y;
… …
3719 rxvt_rgba c; 3726 rxvt_rgba c;
3720 pix_colors_focused[color].get (this, c); 3727 pix_colors_focused[color].get (this, c);
3721 3728
3722#if XFT 3729#if XFT
3723 if (c.a != rxvt_rgba::MAX_CC) 3730 if (c.a != rxvt_rgba::MAX_CC)
3724 tt_printf ("\033]%d;#%04x%04x%04x%04x%c", report, c.a, c.r, c.g, c.b, resp); 3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3725 else 3732 else
3726#endif 3733#endif
3727 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3728 } 3735 }
3729 else 3736 else
… …
3937 op, 3944 op,
3938 rs[Rs_name], VERSION[0], VERSION[2], 3945 rs[Rs_name], VERSION[0], VERSION[2],
3939 resp); 3946 resp);
3940 break; 3947 break;
3941 3948
3942#if ENABLE_FRILLS 3949#if !ENABLE_MINIMAL
3943 case URxvt_locale: 3950 case URxvt_locale:
3944 if (query) 3951 if (query)
3945 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3946 else 3953 else
3947 { 3954 {
… …
4311 scr_color (Color_bg, Color_bg); 4318 scr_color (Color_bg, Color_bg);
4312 break; 4319 break;
4313 4320
4314 //case 50: // not variable spacing 4321 //case 50: // not variable spacing
4315 4322
4316#if ENABLE_FRILLS 4323#if !ENABLE_MINIMAL
4317 case 90: 4324 case 90:
4318 case 91: /* set bright fg color */ 4325 case 91: /* set bright fg color */
4319 case 92: 4326 case 92:
4320 case 93: 4327 case 93:
4321 case 94: 4328 case 94:

Diff Legend

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