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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.453 by sf-exg, Wed Aug 18 17:45:42 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)[fs->find_font_idx (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
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
415 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426 426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
… …
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 650 unsigned int newlen = 1;
651 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
652 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
653 { 658 {
654#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace: 660 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
657 { 662 {
… …
766 771
767 default: 772 default:
768 { 773 {
769 int param = map_function_key (keysym); 774 int param = map_function_key (keysym);
770 if (param > 0) 775 if (param > 0)
776 {
771 sprintf (kbuf,"\033[%d~", param); 777 int n = sprintf (kbuf,"\033[%d~", param);
778 /*
779 * pass Shift/Control indicators for function keys ending with `~'
780 *
781 * eg,
782 * Prior = "ESC[5~"
783 * Shift+Prior = "ESC[5$"
784 * Ctrl+Prior = "ESC[5^"
785 * Ctrl+Shift+Prior = "ESC[5@"
786 */
787 kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788 }
772 else 789 else
773 newlen = 0; 790 newlen = 0;
774 } 791 }
775 break; 792 break;
776 } 793 }
… …
827 view_start = 0; 844 view_start = 0;
828 want_refresh = 1; 845 want_refresh = 1;
829 } 846 }
830 847
831 /* 848 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */ 850 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844 851
845 /* escape prefix */ 852 /* escape prefix */
846 if (meta 853 if (meta
847#ifdef META8_OPTION 854#ifdef META8_OPTION
848 && meta_char == C0_ESC 855 && meta_char == C0_ESC
… …
1027 } 1034 }
1028 1035
1029 display->flush (); 1036 display->flush ();
1030} 1037}
1031 1038
1032/* checks wether a refresh is requested and starts the refresh timer */ 1039/* checks whether a refresh is requested and starts the refresh timer */
1033void 1040void
1034rxvt_term::refresh_check () 1041rxvt_term::refresh_check ()
1035{ 1042{
1036 if (want_refresh && !flush_ev.is_active ()) 1043 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1044 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1131 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1132 // that giving a process calling sched_yield () less cpu time than 1139 // that giving a process calling sched_yield () less cpu time than
1133 // ones with high nice levels is a useful thing to do. It surely is is 1140 // ones with high nice levels is a useful thing to do. It surely is is
1134 // allowed by the sus... as is returning ENOSYS. 1141 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only 1142 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool, 1143 // known workaround against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best. 1144 // we just nanosleep a bit and hope for the best.
1138 1145
1139 struct timespec ts = { 0, 1000 }; 1146 struct timespec ts = { 0, 1000 };
1140 nanosleep (&ts, 0); 1147 nanosleep (&ts, 0);
1141 1148
… …
1478 selection_send (ev.xselectionrequest); 1485 selection_send (ev.xselectionrequest);
1479 break; 1486 break;
1480 1487
1481 case MapNotify: 1488 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP 1489#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a 1490 /* This is needed specifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first 1491 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1492 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does 1493 * care of multiplicity of ConfigureNotify events arriving while WM does
1487 * reparenting. 1494 * reparenting.
1488 * We should not render background immidiately, as there could be several 1495 * We should not render background immediately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1496 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short 1497 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive. 1498 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all 1499 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results. 1500 * of ConfigureNotifys for the best results.
… …
1864 /* save the xbutton state (for ButtonRelease) */ 1871 /* save the xbutton state (for ButtonRelease) */
1865 MEvent.state = ev.state; 1872 MEvent.state = ev.state;
1866#ifdef MOUSE_REPORT_DOUBLECLICK 1873#ifdef MOUSE_REPORT_DOUBLECLICK
1867 if (ev.button == MEvent.button && clickintime) 1874 if (ev.button == MEvent.button && clickintime)
1868 { 1875 {
1869 /* same button, within alloted time */ 1876 /* same button, within allowed time */
1870 MEvent.clicks++; 1877 MEvent.clicks++;
1871 1878
1872 if (MEvent.clicks > 1) 1879 if (MEvent.clicks > 1)
1873 { 1880 {
1874 /* only report double clicks */ 1881 /* only report double clicks */
… …
2145 selection_make (ev.time); 2152 selection_make (ev.time);
2146 break; 2153 break;
2147 2154
2148 case Button2: 2155 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2156 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2157 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2158 break;
2152 2159
2153#ifdef MOUSE_WHEEL 2160#ifdef MOUSE_WHEEL
2154 case Button4: 2161 case Button4:
2155 case Button5: 2162 case Button5:
… …
3226 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3233 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3227 */ 3234 */
3228void 3235void
3229rxvt_term::process_dcs_seq () 3236rxvt_term::process_dcs_seq ()
3230{ 3237{
3231 char *s;
3232 unicode_t eh;
3233
3234 /* 3238 /*
3235 * Not handled yet 3239 * Not handled yet
3236 */ 3240 */
3241
3242 unicode_t eh;
3237 s = get_to_st (eh); 3243 char *s = get_to_st (eh);
3238 if (s) 3244 if (s)
3239 free (s); 3245 free (s);
3240 3246
3241 return; 3247 return;
3242} 3248}
… …
3246 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3247 */ 3253 */
3248void 3254void
3249rxvt_term::process_osc_seq () 3255rxvt_term::process_osc_seq ()
3250{ 3256{
3251 unicode_t ch, eh;
3252 int arg; 3257 int arg;
3253 3258
3254 ch = cmd_getc (); 3259 unicode_t ch = cmd_getc ();
3255 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3260 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3256 arg = arg * 10 + (ch - '0'); 3261 arg = arg * 10 + (ch - '0');
3257 3262
3258 if (ch == ';') 3263 if (ch == ';')
3259 { 3264 {
3265 unicode_t eh;
3260 char *s = get_to_st (eh); 3266 char *s = get_to_st (eh);
3261 3267
3262 if (s) 3268 if (s)
3263 { 3269 {
3264 process_xterm_seq (arg, s, eh); 3270 process_xterm_seq (arg, s, eh);
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3396 break;
3391 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3399 break;
3400#ifdef OPTION_HC
3401 case XTerm_Color_HC:
3402 process_color_seq (op, Color_HC, str, resp);
3403 break;
3404 case XTerm_Color_HTC:
3405 process_color_seq (op, Color_HTC, str, resp);
3406 break;
3407#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3409 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3410 process_color_seq (op, Color_BD, str, resp);
3401 break; 3411 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3412 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3413 process_color_seq (op, Color_UL, str, resp);
3405 break; 3414 break;
3406 case URxvt_Color_IT: 3415 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3416 process_color_seq (op, Color_IT, str, resp);
… …
3574 { 3583 {
3575 if (mode == 'r') 3584 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3586 else
3578 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3587 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588
3579 set_privmode (bit, state); 3589 set_privmode (bit, state);
3580 } 3590 }
3581 3591
3582 return state; 3592 return state;
3583} 3593}

Diff Legend

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