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.431 by root, Tue Feb 24 11:51:51 2009 UTC vs.
Revision 1.441 by root, Tue Mar 30 23:54:29 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 (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);
… …
3285 3294
3286/* 3295/*
3287 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3288 */ 3297 */
3289void 3298void
3290rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3291{ 3300{
3292 int color; 3301 int color;
3293 char *buf, *name; 3302 char *buf, *name;
3294 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3295 int saveop = op; 3304 int saveop = op;
… …
3336 3345
3337 XFree (value); 3346 XFree (value);
3338 } 3347 }
3339 else 3348 else
3340 { 3349 {
3341 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3342 3351
3343 if (eq) 3352 if (eq)
3344 { 3353 {
3345 *eq = 0; 3354 *eq = 0;
3346 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3429 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3430 if (!strcmp (str, "?")) 3439 if (!strcmp (str, "?"))
3431 { 3440 {
3432 char str[256]; 3441 char str[256];
3433 3442
3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3437 process_xterm_seq (XTerm_title, str, CHAR_ST); 3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3438 } 3447 }
3439 else 3448 else

Diff Legend

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