head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.4 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.2 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.1.0.160 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.158 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.156 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.154 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.152 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.150 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.148 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.146 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.144 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.142 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.140 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.138 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.136 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.134 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.132 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.130 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.128 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.126 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.124 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.122 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.120 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.116 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.96 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.118 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.114 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.112 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.110 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.108 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.106 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.104 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.102 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.100 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.98 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.94 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.92 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.90 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.88 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.86 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.84 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.82 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.80 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.78 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.76 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.74 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.72 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.70 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.68 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.66 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.64 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.62 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.60 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.58 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.56 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.54 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.52 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.50 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.48 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.46 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.44 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.42 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.40 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.38 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.36 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.34 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.32 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.30 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.28 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.26 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.24 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.22 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.20 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.18 pkgsrc-2008Q1:1.1.0.16 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.14 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.12 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.10 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.8 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.6 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.4 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2025.10.20.18.32.10; author vins; state Exp; branches; next 1.1; commitid pqZKxJZNUbSE1lfG; 1.1 date 2006.06.20.13.07.20; author martin; state Exp; branches; next ; desc @@ 1.2 log @x11/rxvt: fix build with GCC14 Fix a number of warnings to allow it to compile with recent compilers. Tested with NetBSD 10.1 and pkgsrc's GCC14. Revision bumped. @ text @$NetBSD: patch-al,v 1.1 2006/06/20 13:07:20 martin Exp $ * Fix 64-bit crash inside rxvt_selection_send(). See https://gnats.netbsd.org/33680 --- src/screen.c.orig 2003-03-23 16:56:06.000000000 +0000 +++ src/screen.c @@@@ -3211,9 +3211,9 @@@@ rxvt_selection_adjust_kanji(rxvt_t *r) && IS_MULTI1(r->screen.rend[r1][c1 - 1])) r->selection.beg.col--; } - if (r->selection.end.col < r->TermWin.ncol) { + c1 = r->selection.end.col; + if (0 < c1 && c1 < r->TermWin.ncol) { r1 = r->selection.end.row + r->TermWin.saveLines; - c1 = r->selection.end.col; if (IS_MULTI1(r->screen.rend[r1][c1 - 1]) && IS_MULTI2(r->screen.rend[r1][c1])) r->selection.end.col++; @@@@ -3515,11 +3515,12 @@@@ rxvt_selection_send(rxvt_t *r, const XSe { XSelectionEvent ev; #ifdef USE_XIM - Atom32 target_list[4]; + long target_list[4]; #else - Atom32 target_list[3]; + long target_list[3]; #endif Atom target; + long time; XTextProperty ct; XICCEncodingStyle style; char *cl[2], dummy[1]; @@@@ -3540,16 +3541,17 @@@@ rxvt_selection_send(rxvt_t *r, const XSe target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT]; #endif XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM, - (8 * sizeof(target_list[0])), PropModeReplace, + 32, PropModeReplace, (unsigned char *)target_list, (sizeof(target_list) / sizeof(target_list[0]))); ev.property = rq->property; } else if (rq->target == r->h->xa[XA_MULTIPLE]) { /* TODO: Handle MULTIPLE */ } else if (rq->target == r->h->xa[XA_TIMESTAMP] && r->selection.text) { + time = r->h->selection_time; XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_INTEGER, - (8 * sizeof(Time)), PropModeReplace, - (unsigned char *)&r->h->selection_time, 1); + 32, PropModeReplace, + (unsigned char *)&time, 1); ev.property = rq->property; } else if (rq->target == XA_STRING || rq->target == r->h->xa[XA_COMPOUND_TEXT] @ 1.1 log @In XChangeProperty(), format = 32 means long - no matter how many bits long has. The format value furthermore is not arbitrary, but needs to be 8, 16 or 32. So don't pass Atom32 instead of long, or some sizeof() calculation as format, hardcode the value and make sure the arg is properly aligned. Fixes PR 33680 (old problem), and an alignement related crash with gcc4 on sparc64. @ text @d1 1 a1 1 $NetBSD$ d3 17 a19 2 --- src/screen.c.orig 2003-03-23 17:56:06.000000000 +0100 +++ src/screen.c 2006-06-20 14:52:21.000000000 +0200 @