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.149 by root, Mon Dec 13 06:44:18 2004 UTC vs.
Revision 1.161 by root, Tue Feb 22 21:41:50 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
… …
203 /* 202 /*
204 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
205 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
206 */ 205 */
207 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
209 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
211 210
212 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
213 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
214 213
215 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
217 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
219 218
220 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
221 { 220 {
222 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
223 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
… …
294 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
295 } 294 }
296 295
297 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
298 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
299 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
300 298
301 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
302 } 300 }
303 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
304 { 302 {
… …
335 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
336 screen.cur.row += k; 334 screen.cur.row += k;
337 screen.s_cur.row += k; 335 screen.s_cur.row += k;
338 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
339 } 337 }
338
340#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
341 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
342 assert (swap.cur.row < TermWin.nrow);
343#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
344
345 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
346 MIN_IT (swap.cur.row, nrow - 1);
347#endif 343#endif
348 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
349 } 345 }
350 346
351 /* resize columns */ 347 /* resize columns */
… …
394 } 390 }
395 391
396 } 392 }
397 393
398 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
399 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
400 395
401 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
402 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
403 } 398 }
404 399
… …
566 if (current_screen == scrn) 561 if (current_screen == scrn)
567 return scrn; 562 return scrn;
568 563
569 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
570 565
571 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
572 567
573 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575# ifdef DEBUG_STRICT
576 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578# else /* drive with your eyes closed */
579 MAX_IT (screen.cur.row, 0); 570 MAX_IT (screen.cur.row, 0);
580 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581 MAX_IT (screen.cur.col, 0); 572 MAX_IT (screen.cur.col, 0);
582 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583# endif
584 574
585#if NSCREENS 575#if NSCREENS
586 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
587 { 577 {
588 num_scr = 0; 578 num_scr = 0;
… …
709 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
710 } 700 }
711 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
712 { 702 {
713 /* move selected region too */ 703 /* move selected region too */
714 selection.beg.row -= count; 704 selection.beg.row -= count;
715 selection.end.row -= count; 705 selection.end.row -= count;
716 selection.mark.row -= count; 706 selection.mark.row -= count;
717 } 707 }
718 } 708 }
719 709
720 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
728 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
729 MIN_IT (count, i); 719 MIN_IT (count, i);
730 720
731 if (j > 0) 721 if (j > 0)
732 { 722 {
733 /* A: scroll up */ 723 /* scroll up */
734 724
735 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738 728
739 /* A2: Rotate lines */ 729 /* Rotate lines */
740 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); 732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); 733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744 734
745 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
746 } 736 }
747 else /* if (j < 0) */ 737 else /* if (j < 0) */
748 { 738 {
749 /* B: scroll down */ 739 /* scroll down */
750 740
751 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
752 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
753 { 743 {
754 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
755 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
756 } 746 }
757 747
758 /* B2: Rotate lines */ 748 /* Rotate lines */
759 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
760 { 750 {
761 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
762 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
763 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
765 755
766 j = row1, i = count; 756 j = row1, i = count;
767 count = -count; 757 count = -count;
768 } 758 }
769 759
770 /* C: Resurrect lines */ 760 /* Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
775 for (; i--; j++) 765 for (; i--; j++)
… …
1171 */ 1161 */
1172#if ENABLE_FRILLS 1162#if ENABLE_FRILLS
1173void 1163void
1174rxvt_term::scr_forwardindex () 1164rxvt_term::scr_forwardindex ()
1175{ 1165{
1176 int row; 1166 int row;
1177 1167
1178 if (screen.cur.col < TermWin.ncol - 1) 1168 if (screen.cur.col < TermWin.ncol - 1)
1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1180 else 1170 else
1181 { 1171 {
… …
1400 screen.tlen[row + row_offset] = 0; 1390 screen.tlen[row + row_offset] = 0;
1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1402 } 1392 }
1403} 1393}
1404 1394
1395#if ENABLE_FRILLS
1396void
1397rxvt_term::scr_erase_savelines ()
1398{
1399 want_refresh = 1;
1400 ZERO_SCROLLBACK ();
1401
1402 TermWin.nscrolled = 0;
1403}
1404#endif
1405
1405/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1406/* 1407/*
1407 * Fill the screen with `E's 1408 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1410 */
1410void 1411void
1411rxvt_term::scr_E () 1412rxvt_term::scr_E ()
1412{ 1413{
1413 int i, j, k; 1414 int i, j, k;
1414 rend_t *r1, fs; 1415 rend_t *r1, fs;
1415 1416
1416 want_refresh = 1; 1417 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1418 1419
1419 num_scr_allow = 0; 1420 num_scr_allow = 0;
… …
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1903rxvt_term::scr_page (enum page_dirn direction, int nlines)
1903{ 1904{
1904 int n; 1905 int n;
1905 unsigned int oldviewstart; 1906 unsigned int oldviewstart;
1906 1907
1907#ifdef DEBUG_STRICT
1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909#endif
1910 oldviewstart = TermWin.view_start; 1908 oldviewstart = TermWin.view_start;
1909
1911 if (direction == UP) 1910 if (direction == UP)
1912 { 1911 {
1913 n = TermWin.view_start + nlines; 1912 n = TermWin.view_start + nlines;
1914 TermWin.view_start = min (n, TermWin.nscrolled); 1913 TermWin.view_start = min (n, TermWin.nscrolled);
1915 } 1914 }
1916 else 1915 else
1917 { 1916 {
1918 n = TermWin.view_start - nlines; 1917 n = TermWin.view_start - nlines;
1919 TermWin.view_start = max (n, 0); 1918 TermWin.view_start = max (n, 0);
1920 } 1919 }
1920
1921 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1922} 1922}
1923 1923
1924int 1924int
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
2400 else 2400 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2402 2402
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2404 {
2405#if ENABLE_FRILLS
2406 if (ISSET_PIXCOLOR (Color_underline))
2407 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2408 else
2409#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2410 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2411
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2412 XDrawLine (display->display, drawBuffer, TermWin.gc,
2407 xpixel, ypixel + font->ascent + 1, 2413 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2414 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2415 }
2410 } /* for (col....) */ 2416 } /* for (col....) */
… …
2656/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2657/* 2663/*
2658 * Paste a selection direct to the command fd 2664 * Paste a selection direct to the command fd
2659 */ 2665 */
2660void 2666void
2661rxvt_term::paste (const unsigned char *data, unsigned int len) 2667rxvt_term::paste (unsigned char *data, unsigned int len)
2662{ 2668{
2663 unsigned int i, j, n;
2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2665
2666 /* convert normal newline chars into common keyboard Return key sequence */ 2669 /* convert normal newline chars into common keyboard Return key sequence */
2667 for (i = 0; i < len; i += PASTE_SIZE) 2670 for (unsigned int i = 0; i < len; i++)
2668 {
2669 n = min (len - i, PASTE_SIZE);
2670 memcpy (ds, data + i, n);
2671
2672 for (j = 0; j < n; j++)
2673 if (ds[j] == C0_LF) 2671 if (data[i] == C0_LF)
2674 ds[j] = C0_CR; 2672 data[i] = C0_CR;
2675 2673
2676 tt_write (ds, (int)n); 2674 tt_write (data, len);
2677 }
2678
2679 free (ds);
2680} 2675}
2681 2676
2682/* ------------------------------------------------------------------------- */ 2677/* ------------------------------------------------------------------------- */
2683/* 2678/*
2684 * Respond to a notification that a primary selection has been sent 2679 * Respond to a notification that a primary selection has been sent
… …
2916 2911
2917int 2912int
2918rxvt_term::selection_request_other (Atom target, int selnum) 2913rxvt_term::selection_request_other (Atom target, int selnum)
2919{ 2914{
2920 Atom sel; 2915 Atom sel;
2921#ifdef DEBUG_SELECT
2922 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2923#endif
2924 2916
2925 selection_type |= selnum; 2917 selection_type |= selnum;
2926 2918
2927 if (selnum == Sel_Primary) 2919 if (selnum == Sel_Primary)
2928 sel = XA_PRIMARY; 2920 sel = XA_PRIMARY;
… …
3423 selection_delimit_word (DN, &selection.end, &selection.end); 3415 selection_delimit_word (DN, &selection.end, &selection.end);
3424 } 3416 }
3425 else if (selection.clicks == 3) 3417 else if (selection.clicks == 3)
3426 { 3418 {
3427#if ENABLE_FRILLS 3419#if ENABLE_FRILLS
3428 if ((options & Opt_tripleclickwords)) 3420 if (options & Opt_tripleclickwords)
3429 { 3421 {
3430 int end_row; 3422 int end_row;
3431 3423
3432 selection_delimit_word (UP, &selection.beg, &selection.beg); 3424 selection_delimit_word (UP, &selection.beg, &selection.beg);
3433 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3425 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3451 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3443 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3452 selection.mark.col++; 3444 selection.mark.col++;
3453 3445
3454 selection.beg.col = 0; 3446 selection.beg.col = 0;
3455 selection.end.col = ncol; 3447 selection.end.col = ncol;
3448
3449 // select a complete logical line
3450 while (selection.beg.row > -TermWin.saveLines
3451 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3452 selection.beg.row--;
3453
3454 while (selection.end.row < TermWin.nrow
3455 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3456 selection.end.row++;
3456 } 3457 }
3457 } 3458 }
3458 3459
3459 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3460 { /* mark may need to be changed */ 3461 { /* mark may need to be changed */
… …
3540 */ 3541 */
3541void 3542void
3542rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3543rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3543{ 3544{
3544 XSelectionEvent ev; 3545 XSelectionEvent ev;
3546 dDisp;
3545 3547
3546 ev.type = SelectionNotify; 3548 ev.type = SelectionNotify;
3547 ev.property = None; 3549 ev.property = None;
3548 ev.display = rq.display; 3550 ev.display = rq.display;
3549 ev.requestor = rq.requestor; 3551 ev.requestor = rq.requestor;
… …
3563 *target++ = xa[XA_COMPOUND_TEXT]; 3565 *target++ = xa[XA_COMPOUND_TEXT];
3564#if X_HAVE_UTF8_STRING 3566#if X_HAVE_UTF8_STRING
3565 *target++ = xa[XA_UTF8_STRING]; 3567 *target++ = xa[XA_UTF8_STRING];
3566#endif 3568#endif
3567 3569
3568 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3570 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3569 32, PropModeReplace, 3571 32, PropModeReplace,
3570 (unsigned char *)target_list, target - target_list); 3572 (unsigned char *)target_list, target - target_list);
3571 ev.property = rq.property; 3573 ev.property = rq.property;
3572 } 3574 }
3573#if TODO // TODO 3575#if TODO // TODO
… …
3576 /* TODO: Handle MULTIPLE */ 3578 /* TODO: Handle MULTIPLE */
3577 } 3579 }
3578#endif 3580#endif
3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3581 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3580 { 3582 {
3581 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3583 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3582 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3584 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3583 ev.property = rq.property; 3585 ev.property = rq.property;
3584 } 3586 }
3585 else if (rq.target == XA_STRING 3587 else if (rq.target == XA_STRING
3586 || rq.target == xa[XA_TEXT] 3588 || rq.target == xa[XA_TEXT]
… …
3644 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3646 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3645 ct.nitems = strlen ((char *)ct.value); 3647 ct.nitems = strlen ((char *)ct.value);
3646 } 3648 }
3647 else 3649 else
3648#endif 3650#endif
3649 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3651 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3650 freect = 1; 3652 freect = 1;
3651 else 3653 else
3652 { 3654 {
3653 /* if we failed to convert then send it raw */ 3655 /* if we failed to convert then send it raw */
3654 ct.value = (unsigned char *)cl; 3656 ct.value = (unsigned char *)cl;
3655 ct.nitems = selectlen; 3657 ct.nitems = selectlen;
3656 ct.encoding = target; 3658 ct.encoding = target;
3657 } 3659 }
3658 3660
3659 XChangeProperty (display->display, rq.requestor, rq.property, 3661 XChangeProperty (disp, rq.requestor, rq.property,
3660 ct.encoding, 8, PropModeReplace, 3662 ct.encoding, 8, PropModeReplace,
3661 ct.value, (int)ct.nitems); 3663 ct.value, (int)ct.nitems);
3662 ev.property = rq.property; 3664 ev.property = rq.property;
3663 3665
3664 if (freect) 3666 if (freect)
3665 XFree (ct.value); 3667 XFree (ct.value);
3666 } 3668 }
3667 3669
3668 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3670 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3669} 3671}
3670 3672
3671/* ------------------------------------------------------------------------- * 3673/* ------------------------------------------------------------------------- *
3672 * MOUSE ROUTINES * 3674 * MOUSE ROUTINES *
3673 * ------------------------------------------------------------------------- */ 3675 * ------------------------------------------------------------------------- */

Diff Legend

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