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.516 by root, Tue Jun 5 14:46:54 2012 UTC vs.
Revision 1.524 by root, Tue Aug 14 20:32:48 2012 UTC

… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void ecb_cold 163void ecb_cold
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, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
… …
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1468 ;
1465 1469
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467 1471
1472 bool moved = false;
1468#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1475 {
1470 want_position_change = true; 1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1471#endif 1480#endif
1472
1473 bool moved = false;
1474 1481
1475 if (want_position_change) 1482 if (want_position_change)
1476 { 1483 {
1477 int x, y; 1484 int x, y;
1478 1485
… …
1484 else 1491 else
1485 get_window_origin (x, y); 1492 get_window_origin (x, y);
1486 1493
1487 if (x != parent_x || y != parent_y) 1494 if (x != parent_x || y != parent_y)
1488 { 1495 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x; 1496 parent_x = x;
1491 parent_y = y; 1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1492 } 1500 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 } 1501 }
1498 1502
1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1500 { 1504 {
1501 seen_resize = 1; 1505 seen_resize = 1;
… …
2383 } 2387 }
2384 2388
2385 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2386 { 2390 {
2387 mbstate.reset (); // reset now undefined conversion state 2391 mbstate.reset (); // reset now undefined conversion state
2392 // a -1 might indicate that a previous incomplet char is invalid (previous return -2)
2393 // in which case we "errornously" return the next byte which might be valid.
2388 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2394 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2389 } 2395 }
2390 2396
2391 // assume wchar == unicode 2397 // assume wchar == unicode
2392 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
… …
3468#if BG_IMAGE_FROM_FILE 3474#if BG_IMAGE_FROM_FILE
3469 case Rxvt_Pixmap: 3475 case Rxvt_Pixmap:
3470 if (!strcmp (str, "?")) 3476 if (!strcmp (str, "?"))
3471 { 3477 {
3472 char str[256]; 3478 char str[256];
3473 int h_scale = 0, v_scale = 0;
3474 int h_align = 0, v_align = 0;
3475 if (image_vec.size () > 0)
3476 {
3477 h_scale = image_vec[0].h_scale; 3479 int h_scale = fimage.h_scale;
3478 v_scale = image_vec[0].v_scale; 3480 int v_scale = fimage.v_scale;
3479 h_align = image_vec[0].h_align; 3481 int h_align = fimage.h_align;
3480 v_align = image_vec[0].v_align; 3482 int v_align = fimage.v_align;
3481 }
3482 3483
3483 sprintf (str, "[%dx%d+%d+%d]", 3484 sprintf (str, "[%dx%d+%d+%d]",
3484 h_scale, v_scale, 3485 h_scale, v_scale,
3485 h_align, v_align); 3486 h_align, v_align);
3486 process_xterm_seq (XTerm_title, str, CHAR_ST); 3487 process_xterm_seq (XTerm_title, str, CHAR_ST);
… …
3489 { 3490 {
3490 bool changed = false; 3491 bool changed = false;
3491 3492
3492 if (*str != ';') 3493 if (*str != ';')
3493 { 3494 {
3494 if (image_vec.size () > 0)
3495 changed = image_vec[0].set_file_geometry (str);
3496 else 3495 try
3497 { 3496 {
3498 rxvt_image *image = new_image ();
3499 if (!image->set_file_geometry (str)) 3497 fimage.set_file_geometry (this, str);
3500 image_vec.pop_back ();
3501 else
3502 changed = true; 3498 changed = true;
3499 }
3500 catch (const class rxvt_failure_exception &e)
3501 {
3503 } 3502 }
3504 } 3503 }
3505 else 3504 else
3506 { 3505 {
3507 str++; 3506 str++;
3508 if (image_vec.size () > 0)
3509 changed = image_vec[0].set_geometry (str, true); 3507 if (fimage.set_geometry (str, true))
3508 changed = true;
3510 } 3509 }
3511 3510
3512 if (changed) 3511 if (changed)
3513 { 3512 {
3514 if (bg_window_position_sensitive ()) 3513 if (bg_window_position_sensitive ())
3515 { 3514 {
3516 int x, y; 3515 int x, y;
3517 get_window_origin (x, y); 3516 get_window_origin (x, y);
3518 bg_set_position (x, y); 3517 parent_x = x;
3518 parent_y = y;
3519 } 3519 }
3520 update_background (); 3520 update_background ();
3521 } 3521 }
3522 } 3522 }
3523 break; 3523 break;

Diff Legend

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