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.512 by root, Mon May 28 16:40:03 2012 UTC vs.
Revision 1.523 by sf-exg, Fri Jun 29 13:57:26 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)
… …
421 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
423 427
424 kbuf[0] = 0; 428 kbuf[0] = 0;
425 429
426#ifdef USE_XIM 430#if USE_XIM
427 if (Input_Context) 431 if (Input_Context)
428 { 432 {
429 Status status_return; 433 Status status_return;
430 434
431#if 0 435#if 0
… …
987 while (row < end_row); 991 while (row < end_row);
988 } 992 }
989 993
990 scr_refresh (); 994 scr_refresh ();
991 scrollBar.show (1); 995 scrollBar.show (1);
992#ifdef USE_XIM 996#if USE_XIM
993 im_send_spot (); 997 im_send_spot ();
994#endif 998#endif
995 } 999 }
996 1000
997 display->flush (); 1001 display->flush ();
… …
1461 if (ev.xconfigure.window == parent) 1465 if (ev.xconfigure.window == parent)
1462 { 1466 {
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1468 ;
1465 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1466#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1469 { 1475 {
1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1470 int x, y; 1484 int x, y;
1485
1471 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1472 { 1487 {
1473 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1475 } 1490 }
1476 else 1491 else
1477 get_window_origin (x, y); 1492 get_window_origin (x, y);
1478 1493
1479 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1480 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1481 moved = true; 1499 moved = true;
1500 }
1482 } 1501 }
1483#endif
1484 1502
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1504 {
1487 seen_resize = 1; 1505 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1830 1848
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1851 return;
1834 1852
1835# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1853 switch (ev.type)
1837 { 1854 {
1838 case PropertyNotify: 1855 case PropertyNotify:
1839 /* 1856 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1857 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1858 * use the property to determine the pixmap. We use it later on.
1842 */ 1859 */
1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 { 1862 {
1863# if ENABLE_TRANSPARENCY
1846 bg_set_root_pixmap (); 1864 bg_set_root_pixmap ();
1847 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1848 } 1870 }
1849 1871
1850 break; 1872 break;
1851 } 1873 }
1852# endif
1853 1874
1854 refresh_check (); 1875 refresh_check ();
1855} 1876}
1856#endif 1877#endif
1857 1878
… …
3437 process_color_seq (op, Color_tint, str, resp); 3458 process_color_seq (op, Color_tint, str, resp);
3438 { 3459 {
3439 bool changed = false; 3460 bool changed = false;
3440 3461
3441 if (ISSET_PIXCOLOR (Color_tint)) 3462 if (ISSET_PIXCOLOR (Color_tint))
3442 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3463 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3443 3464
3444 if (changed) 3465 if (changed)
3445 update_background (); 3466 update_background ();
3446 } 3467 }
3447 3468
… …
3451#if BG_IMAGE_FROM_FILE 3472#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3473 case Rxvt_Pixmap:
3453 if (!strcmp (str, "?")) 3474 if (!strcmp (str, "?"))
3454 { 3475 {
3455 char str[256]; 3476 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale; 3477 int h_scale = fimage.h_scale;
3461 v_scale = image_vec[0].v_scale; 3478 int v_scale = fimage.v_scale;
3462 h_align = image_vec[0].h_align; 3479 int h_align = fimage.h_align;
3463 v_align = image_vec[0].v_align; 3480 int v_align = fimage.v_align;
3464 }
3465 3481
3466 sprintf (str, "[%dx%d+%d+%d]", 3482 sprintf (str, "[%dx%d+%d+%d]",
3467 h_scale, v_scale, 3483 h_scale, v_scale,
3468 h_align, v_align); 3484 h_align, v_align);
3469 process_xterm_seq (XTerm_title, str, CHAR_ST); 3485 process_xterm_seq (XTerm_title, str, CHAR_ST);
… …
3472 { 3488 {
3473 bool changed = false; 3489 bool changed = false;
3474 3490
3475 if (*str != ';') 3491 if (*str != ';')
3476 { 3492 {
3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else 3493 try
3480 { 3494 {
3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str)) 3495 fimage.set_file_geometry (this, str);
3483 image_vec.pop_back ();
3484 else
3485 changed = true; 3496 changed = true;
3497 }
3498 catch (const class rxvt_failure_exception &e)
3499 {
3486 } 3500 }
3487 } 3501 }
3488 else 3502 else
3489 { 3503 {
3490 str++; 3504 str++;
3491 if (image_vec.size () > 0)
3492 changed = image_vec[0].set_geometry (str, true); 3505 if (fimage.set_geometry (str, true))
3506 changed = true;
3493 } 3507 }
3494 3508
3495 if (changed) 3509 if (changed)
3496 { 3510 {
3497 if (bg_window_position_sensitive ()) 3511 if (bg_window_position_sensitive ())
3498 { 3512 {
3499 int x, y; 3513 int x, y;
3500 get_window_origin (x, y); 3514 get_window_origin (x, y);
3501 bg_set_position (x, y); 3515 parent_x = x;
3516 parent_y = y;
3502 } 3517 }
3503 update_background (); 3518 update_background ();
3504 } 3519 }
3505 } 3520 }
3506 break; 3521 break;

Diff Legend

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