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.155 by root, Thu Feb 3 07:45:39 2005 UTC vs.
Revision 1.158 by root, Sat Feb 19 19:37:34 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{
… …
1893rxvt_term::scr_page (enum page_dirn direction, int nlines) 1892rxvt_term::scr_page (enum page_dirn direction, int nlines)
1894{ 1893{
1895 int n; 1894 int n;
1896 unsigned int oldviewstart; 1895 unsigned int oldviewstart;
1897 1896
1898#ifdef DEBUG_STRICT
1899 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1900#endif
1901 oldviewstart = TermWin.view_start; 1897 oldviewstart = TermWin.view_start;
1898
1902 if (direction == UP) 1899 if (direction == UP)
1903 { 1900 {
1904 n = TermWin.view_start + nlines; 1901 n = TermWin.view_start + nlines;
1905 TermWin.view_start = min (n, TermWin.nscrolled); 1902 TermWin.view_start = min (n, TermWin.nscrolled);
1906 } 1903 }
1907 else 1904 else
1908 { 1905 {
1909 n = TermWin.view_start - nlines; 1906 n = TermWin.view_start - nlines;
1910 TermWin.view_start = max (n, 0); 1907 TermWin.view_start = max (n, 0);
1911 } 1908 }
1909
1912 return scr_changeview (oldviewstart); 1910 return scr_changeview (oldviewstart);
1913} 1911}
1914 1912
1915int 1913int
1916rxvt_term::scr_changeview (unsigned int oldviewstart) 1914rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
3535 */ 3533 */
3536void 3534void
3537rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3535rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3538{ 3536{
3539 XSelectionEvent ev; 3537 XSelectionEvent ev;
3538 dDisp;
3540 3539
3541 ev.type = SelectionNotify; 3540 ev.type = SelectionNotify;
3542 ev.property = None; 3541 ev.property = None;
3543 ev.display = rq.display; 3542 ev.display = rq.display;
3544 ev.requestor = rq.requestor; 3543 ev.requestor = rq.requestor;
… …
3558 *target++ = xa[XA_COMPOUND_TEXT]; 3557 *target++ = xa[XA_COMPOUND_TEXT];
3559#if X_HAVE_UTF8_STRING 3558#if X_HAVE_UTF8_STRING
3560 *target++ = xa[XA_UTF8_STRING]; 3559 *target++ = xa[XA_UTF8_STRING];
3561#endif 3560#endif
3562 3561
3563 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3562 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3564 32, PropModeReplace, 3563 32, PropModeReplace,
3565 (unsigned char *)target_list, target - target_list); 3564 (unsigned char *)target_list, target - target_list);
3566 ev.property = rq.property; 3565 ev.property = rq.property;
3567 } 3566 }
3568#if TODO // TODO 3567#if TODO // TODO
… …
3571 /* TODO: Handle MULTIPLE */ 3570 /* TODO: Handle MULTIPLE */
3572 } 3571 }
3573#endif 3572#endif
3574 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3575 { 3574 {
3576 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3575 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3577 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3576 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3578 ev.property = rq.property; 3577 ev.property = rq.property;
3579 } 3578 }
3580 else if (rq.target == XA_STRING 3579 else if (rq.target == XA_STRING
3581 || rq.target == xa[XA_TEXT] 3580 || rq.target == xa[XA_TEXT]
… …
3639 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3638 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3640 ct.nitems = strlen ((char *)ct.value); 3639 ct.nitems = strlen ((char *)ct.value);
3641 } 3640 }
3642 else 3641 else
3643#endif 3642#endif
3644 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3643 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3645 freect = 1; 3644 freect = 1;
3646 else 3645 else
3647 { 3646 {
3648 /* if we failed to convert then send it raw */ 3647 /* if we failed to convert then send it raw */
3649 ct.value = (unsigned char *)cl; 3648 ct.value = (unsigned char *)cl;
3650 ct.nitems = selectlen; 3649 ct.nitems = selectlen;
3651 ct.encoding = target; 3650 ct.encoding = target;
3652 } 3651 }
3653 3652
3654 XChangeProperty (display->display, rq.requestor, rq.property, 3653 XChangeProperty (disp, rq.requestor, rq.property,
3655 ct.encoding, 8, PropModeReplace, 3654 ct.encoding, 8, PropModeReplace,
3656 ct.value, (int)ct.nitems); 3655 ct.value, (int)ct.nitems);
3657 ev.property = rq.property; 3656 ev.property = rq.property;
3658 3657
3659 if (freect) 3658 if (freect)
3660 XFree (ct.value); 3659 XFree (ct.value);
3661 } 3660 }
3662 3661
3663 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3662 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3664} 3663}
3665 3664
3666/* ------------------------------------------------------------------------- * 3665/* ------------------------------------------------------------------------- *
3667 * MOUSE ROUTINES * 3666 * MOUSE ROUTINES *
3668 * ------------------------------------------------------------------------- */ 3667 * ------------------------------------------------------------------------- */

Diff Legend

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