ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.245 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.252 by root, Wed Jan 25 21:09:21 2006 UTC

… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (xdisp, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (xdisp, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (xdisp, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
… …
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
181 //TODO//FIXME 184 //TODO//FIXME
182 saveLines++; 185 saveLines++;
183 prev_nrow--; 186 prev_nrow--;
184 top_row--; 187 top_row--;
… …
195 if (!row_buf) 198 if (!row_buf)
196 { 199 {
197 /* 200 /*
198 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
199 */ 202 */
200 top_row = 0; /* no saved lines */ 203 top_row = 0;
201 term_start = 0; 204 term_start = 0;
202 205
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 208
… …
234 selection.text = NULL; 237 selection.text = NULL;
235 selection.len = 0; 238 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
238 selection.clicks = 0; 241 selection.clicks = 0;
239 rvideo = 0; 242 rvideo_state = rvideo_mode = false;
240 } 243 }
241 else 244 else
242 { 245 {
243 /* 246 /*
244 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
280 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
282 285
283 if (top_row) 286 if (top_row)
284 { 287 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
287 290
288 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 293
… …
347 350
348 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
349 352
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 354
352#if DEBUG_STRICT
353 assert (len);
354 assert (pline.t);
355#endif
356
357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 357
360 lofs += len; 358 lofs += len;
361 qcol += len; 359 qcol += len;
… …
401 delete old_ra; 399 delete old_ra;
402 400
403 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
405 403
406 if (tabs)
407 free (tabs); 404 free (tabs);
408 } 405 }
409 406
410 CLEAR_ALL_SELECTION (); 407 CLEAR_ALL_SELECTION ();
411 408
412 prev_nrow = nrow; 409 prev_nrow = nrow;
… …
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416 413
417 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
418 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
419 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
420 tt_winch (); 420 tt_winch ();
421 421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 423}
424 424
… …
427 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
428 */ 428 */
429void 429void
430rxvt_term::scr_release () NOTHROW 430rxvt_term::scr_release () NOTHROW
431{ 431{
432 if (row_buf)
433 {
432 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
434 436
435 free (row_buf); 437 free (row_buf);
436 free (swap_buf); 438 free (swap_buf);
437 free (drawn_buf); 439 free (drawn_buf);
438 free (tabs); 440 free (tabs);
439 441
440 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
441} 444}
442 445
443/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
444/* 447/*
445 * Hard reset 448 * Hard reset
446 */ 449 */
447void 450void
448rxvt_term::scr_poweron () NOTHROW 451rxvt_term::scr_poweron ()
449{ 452{
450 scr_release (); 453 scr_release ();
451 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
452 scr_reset (); 455 scr_reset ();
453 456
… …
504 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
506#endif 509#endif
507} 510}
508 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
509/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
510/* 528/*
511 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 532 */
515int 533void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 534rxvt_term::scr_change_screen (int scrn)
517{ 535{
536 if (scrn == current_screen)
537 return;
538
518 want_refresh = 1; 539 want_refresh = 1;
519 view_start = 0; 540 view_start = 0;
520 541
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
525 543
526 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
527
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533 545
534#if NSCREENS 546#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
536 { 548 {
537 num_scr = 0; 549 num_scr = 0;
538 550
539 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 552
542 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
546 } 557 }
547 else 558 else
548#endif 559#endif
549 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 562}
554 563
555// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
556void 565void
557rxvt_term::scr_do_wrap () NOTHROW 566rxvt_term::scr_do_wrap () NOTHROW
… …
749 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
750 759
751 if (minlines > 0) 760 if (minlines > 0)
752 { 761 {
753 minlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
754 764
755 if (minlines > 0 765 if (minlines > 0
756 && screen.tscroll == 0 766 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 767 && screen.bscroll == nrow - 1)
758 { 768 {
… …
832 842
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835 c = 0xfffd; 845 c = 0xfffd;
836 846
837 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
839 // for the line drawing characters below as they might be invalid in the current 849 // drawing characters below as they might be invalid in the current
840 // locale. 850 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
842 852
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
844 { 854 {
845 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 856 // 5f-7e standard vt100
… …
1328 } 1338 }
1329 else 1339 else
1330 { 1340 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1343 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1335 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1337 } 1347 }
1338 1348
1339 for (; num--; row++) 1349 for (; num--; row++)
1340 { 1350 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
… …
1621 * Set reverse/normal video 1631 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1634 */
1625void 1635void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1637{
1628 XGCValues gcvalue; 1638 rvideo_mode = on;
1629 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1630 if (rvideo != mode) 1644 if (rvideo_state != on)
1631 { 1645 {
1632 rvideo = mode; 1646 rvideo_state = on;
1647
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1635 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1636#endif 1651#endif
1637#if TRANSPARENT 1652#if TRANSPARENT
1638 if (! OPTION (Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1639#endif 1654#endif
1640 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1641 pix_colors[Color_bg]);
1642 1656
1657 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1661
1647 scr_clear (); 1662 scr_clear ();
1648 scr_touch (true); 1663 scr_touch (true);
1649 } 1664 }
1650} 1665}
1651 1666
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1867
1853 return true; 1868 return true;
1854} 1869}
1855 1870
1871#ifndef NO_BELL
1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1856/* ------------------------------------------------------------------------- */ 1880/* ------------------------------------------------------------------------- */
1857void 1881void
1858rxvt_term::scr_bell () NOTHROW 1882rxvt_term::scr_bell () NOTHROW
1859{ 1883{
1860#ifndef NO_BELL 1884#ifndef NO_BELL
1861 1885
1862# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1888 if (OPTION (Opt_mapAlert))
1865# endif 1889# endif
1866 XMapWindow (display->display, parent[0]); 1890 XMapWindow (xdisp, parent[0]);
1867# endif 1891# endif
1868 1892
1869 if (OPTION (Opt_visualBell)) 1893 if (OPTION (Opt_visualBell))
1870 { 1894 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1896 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1897 display->flush ();
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1898
1874 scr_rvideo_mode (!rvideo); /* refresh also done */ 1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1875 } 1900 }
1876 else 1901 else
1877 XBell (display->display, 0); 1902 XBell (xdisp, 0);
1878 1903
1879#endif 1904#endif
1880} 1905}
1881 1906
1882/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
… …
2121 { 2146 {
2122 /* also comes here at end if needed because of >= above */ 2147 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2148 if (wlen < len)
2124 ::swap (wlen, len); 2149 ::swap (wlen, len);
2125 2150
2126 XCopyArea (display->display, vt, vt, 2151 XCopyArea (xdisp, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2153 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2131 len = -1; 2156 len = -1;
… …
2219 2244
2220 // only do special processing if any attributes are set, which is unlikely 2245 // only do special processing if any attributes are set, which is unlikely
2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2222 { 2247 {
2223#if ENABLE_STYLES 2248#if ENABLE_STYLES
2224 // force redraw after "careful" characters to avoid pixel droppings 2249 // "careful" (too wide) character handling
2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2226 drp[col + 1] = ~srp[col + 1];
2227 2250
2228 // include previous careful character(s) if possible, looks nicer (best effort...) 2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2229 while (text > stp 2252 while (text > stp
2230 && srp[text - stp - 1] & RS_Careful 2253 && srp[text - stp - 1] & RS_Careful
2231 && RS_SAME (rend, srp[text - stp - 1])) 2254 && RS_SAME (rend, srp[text - stp - 1]))
2232 text--, count++, xpixel -= fwidth; 2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2233#endif 2264#endif
2234 2265
2235 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2236 2267
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2321 2352
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2353 if (rend & RS_Uline && font->descent > 1 && fore != back)
2323 { 2354 {
2324#if ENABLE_FRILLS 2355#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2356 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2357 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2327 else 2358 else
2328#endif 2359#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2360 XSetForeground (xdisp, gc, pix_colors[fore]);
2330 2361
2331 XDrawLine (display->display, drawBuffer, gc, 2362 XDrawLine (xdisp, drawBuffer, gc,
2332 xpixel, ypixel + font->ascent + 1, 2363 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2365 }
2335 } /* for (col....) */ 2366 } /* for (col....) */
2336 } /* for (row....) */ 2367 } /* for (row....) */
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2401 cursorwidth++;
2371 2402
2372#ifndef NO_CURSORCOLOR 2403#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2404 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2405 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2375#endif 2406#endif
2376 2407
2377 XDrawRectangle (display->display, drawBuffer, gc, 2408 XDrawRectangle (xdisp, drawBuffer, gc,
2378 Col2Pixel (col), 2409 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2410 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2411 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2413 }
… …
2426#if XPM_BACKGROUND 2457#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap 2458 && !bgPixmap.pixmap
2428#endif 2459#endif
2429 ) 2460 )
2430 { 2461 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2462 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2463 XClearWindow (xdisp, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2464 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS 2465#if HAVE_SCROLLBARS
2435 if (scrollBar.win) 2466 if (scrollBar.win)
2436 { 2467 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2468 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2469 scrollBar.setIdle ();
2439 scrollbar_show (0); 2470 scrollbar_show (0);
2440 } 2471 }
2441#endif 2472#endif
2442 } 2473 }
… …
2455 2486
2456 num_scr_allow = 0; 2487 num_scr_allow = 0;
2457 want_refresh = 1; 2488 want_refresh = 1;
2458 2489
2459 if (really) 2490 if (really)
2460 XClearWindow (display->display, vt); 2491 XClearWindow (xdisp, vt);
2461} 2492}
2462 2493
2463void 2494void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2496{
… …
2640 } 2671 }
2641 2672
2642 unsigned long bytes_after; 2673 unsigned long bytes_after;
2643 XTextProperty ct; 2674 XTextProperty ct;
2644 2675
2645 if (XGetWindowProperty (display->display, win, prop, 2676 if (XGetWindowProperty (xdisp, win, prop,
2646 0, PROP_SIZE / 4, 2677 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2678 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2679 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2680 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2681 &ct.value) != Success)
… …
2659 if (bytes_after) 2690 if (bytes_after)
2660 { 2691 {
2661 // fetch and append remaining data 2692 // fetch and append remaining data
2662 XTextProperty ct2; 2693 XTextProperty ct2;
2663 2694
2664 if (XGetWindowProperty (display->display, win, prop, 2695 if (XGetWindowProperty (xdisp, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2696 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2697 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2698 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2699 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2700 &ct2.value) != Success)
… …
2682 2713
2683 if (ct.encoding == xa[XA_INCR]) 2714 if (ct.encoding == xa[XA_INCR])
2684 { 2715 {
2685 // INCR selection, start handshake 2716 // INCR selection, start handshake
2686 if (!delete_prop) 2717 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2718 XDeleteProperty (xdisp, win, prop);
2688 2719
2689 selection_wait = Sel_incr; 2720 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2721 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2722 incr_ev.start (NOW + 10);
2692 2723
… …
2753 paste (s, strlen (s)); 2784 paste (s, strlen (s));
2754 free (s); 2785 free (s);
2755 } 2786 }
2756 else 2787 else
2757#endif 2788#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2789 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2759 && cl) 2790 && cl)
2760 { 2791 {
2761 for (int i = 0; i < cr; i++) 2792 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2793 paste (cl[i], strlen (cl[i]));
2763 2794
… …
2845 else if (selnum == Sel_Secondary) 2876 else if (selnum == Sel_Secondary)
2846 sel = XA_SECONDARY; 2877 sel = XA_SECONDARY;
2847 else 2878 else
2848 sel = xa[XA_CLIPBOARD]; 2879 sel = xa[XA_CLIPBOARD];
2849 2880
2850 if (XGetSelectionOwner (display->display, sel) != None) 2881 if (XGetSelectionOwner (xdisp, sel) != None)
2851 { 2882 {
2852 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2883 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2853 vt, selection_request_time); 2884 vt, selection_request_time);
2854 return 1; 2885 return 1;
2855 } 2886 }
2856 2887
2857 return 0; 2888 return 0;
… …
3010bool 3041bool
3011rxvt_term::selection_grab (Time tm) NOTHROW 3042rxvt_term::selection_grab (Time tm) NOTHROW
3012{ 3043{
3013 selection_time = tm; 3044 selection_time = tm;
3014 3045
3015 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3046 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3016 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3047 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3017 { 3048 {
3018 display->set_selection_owner (this); 3049 display->set_selection_owner (this);
3019 return true; 3050 return true;
3020 } 3051 }
3021 else 3052 else
… …
3025 } 3056 }
3026 3057
3027#if 0 3058#if 0
3028 XTextProperty ct; 3059 XTextProperty ct;
3029 3060
3030 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3061 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3031 { 3062 {
3032 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3033 XFree (ct.value); 3064 XFree (ct.value);
3034 } 3065 }
3035#endif 3066#endif
… …
3483 */ 3514 */
3484void 3515void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3516rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3486{ 3517{
3487 XSelectionEvent ev; 3518 XSelectionEvent ev;
3488 dDisp;
3489 3519
3490 ev.type = SelectionNotify; 3520 ev.type = SelectionNotify;
3491 ev.property = None; 3521 ev.property = None;
3492 ev.display = rq.display; 3522 ev.display = rq.display;
3493 ev.requestor = rq.requestor; 3523 ev.requestor = rq.requestor;
… …
3507 *target++ = xa[XA_COMPOUND_TEXT]; 3537 *target++ = xa[XA_COMPOUND_TEXT];
3508#if X_HAVE_UTF8_STRING 3538#if X_HAVE_UTF8_STRING
3509 *target++ = xa[XA_UTF8_STRING]; 3539 *target++ = xa[XA_UTF8_STRING];
3510#endif 3540#endif
3511 3541
3512 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3542 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3513 32, PropModeReplace, 3543 32, PropModeReplace,
3514 (unsigned char *)target_list, target - target_list); 3544 (unsigned char *)target_list, target - target_list);
3515 ev.property = rq.property; 3545 ev.property = rq.property;
3516 } 3546 }
3517#if TODO // TODO 3547#if TODO // TODO
… …
3520 /* TODO: Handle MULTIPLE */ 3550 /* TODO: Handle MULTIPLE */
3521 } 3551 }
3522#endif 3552#endif
3523 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3553 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3524 { 3554 {
3525 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3555 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3526 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3556 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3527 ev.property = rq.property; 3557 ev.property = rq.property;
3528 } 3558 }
3529 else if (rq.target == XA_STRING 3559 else if (rq.target == XA_STRING
3530 || rq.target == xa[XA_TEXT] 3560 || rq.target == xa[XA_TEXT]
… …
3588 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3618 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3589 ct.nitems = strlen ((char *)ct.value); 3619 ct.nitems = strlen ((char *)ct.value);
3590 } 3620 }
3591 else 3621 else
3592#endif 3622#endif
3593 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3623 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3594 freect = 1; 3624 freect = 1;
3595 else 3625 else
3596 { 3626 {
3597 /* if we failed to convert then send it raw */ 3627 /* if we failed to convert then send it raw */
3598 ct.value = (unsigned char *)cl; 3628 ct.value = (unsigned char *)cl;
3599 ct.nitems = selectlen; 3629 ct.nitems = selectlen;
3600 ct.encoding = target; 3630 ct.encoding = target;
3601 } 3631 }
3602 3632
3603 XChangeProperty (disp, rq.requestor, rq.property, 3633 XChangeProperty (xdisp, rq.requestor, rq.property,
3604 ct.encoding, 8, PropModeReplace, 3634 ct.encoding, 8, PropModeReplace,
3605 ct.value, (int)ct.nitems); 3635 ct.value, (int)ct.nitems);
3606 ev.property = rq.property; 3636 ev.property = rq.property;
3607 3637
3608 if (freect) 3638 if (freect)
3609 XFree (ct.value); 3639 XFree (ct.value);
3610 } 3640 }
3611 3641
3612 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3642 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3613} 3643}
3614 3644
3615/* ------------------------------------------------------------------------- * 3645/* ------------------------------------------------------------------------- *
3616 * MOUSE ROUTINES * 3646 * MOUSE ROUTINES *
3617 * ------------------------------------------------------------------------- */ 3647 * ------------------------------------------------------------------------- */
… …
3633void 3663void
3634rxvt_term::im_set_position (XPoint &pos) NOTHROW 3664rxvt_term::im_set_position (XPoint &pos) NOTHROW
3635{ 3665{
3636 XWindowAttributes xwa; 3666 XWindowAttributes xwa;
3637 3667
3638 XGetWindowAttributes (display->display, vt, &xwa); 3668 XGetWindowAttributes (xdisp, vt, &xwa);
3639 3669
3640 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3670 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3641 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3671 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3642} 3672}
3643#endif 3673#endif
… …
3739rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3769rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3740{ 3770{
3741 while (*s) 3771 while (*s)
3742 { 3772 {
3743 text_t t = *s++; 3773 text_t t = *s++;
3744 int width = wcwidth (t); 3774 int width = WCWIDTH (t);
3745 3775
3746 while (width--) 3776 while (width--)
3747 { 3777 {
3748 scr_overlay_set (x++, y, t); 3778 scr_overlay_set (x++, y, t);
3749 t = NOCHAR; 3779 t = NOCHAR;

Diff Legend

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