1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 32_vscroll.dpatch by Junichi Uekawa <dancer@debian.org>
4
## All lines beginning with `## DP:' are a description of the patch.
5
## DP: remove scrollbar patch, updated from 247602 by Eugeniy Meshcheryakov <eugen@univ.kiev.ua>
8
diff -urNad xpdf-3.01~/xpdf/XPDFCore.cc xpdf-3.01/xpdf/XPDFCore.cc
9
--- xpdf-3.01~/xpdf/XPDFCore.cc 2006-07-13 00:06:46.000000000 +0900
10
+++ xpdf-3.01/xpdf/XPDFCore.cc 2006-07-13 00:08:17.000000000 +0900
12
XtSetArg(args[n], XmNvisualPolicy, XmVARIABLE); ++n;
13
scrolledWin = XmCreateScrolledWindow(parentWidget, "scroll", args, n);
14
XtManageChild(scrolledWin);
16
- XtSetArg(args[n], XmNorientation, XmHORIZONTAL); ++n;
17
- XtSetArg(args[n], XmNminimum, 0); ++n;
18
- XtSetArg(args[n], XmNmaximum, 1); ++n;
19
- XtSetArg(args[n], XmNsliderSize, 1); ++n;
20
- XtSetArg(args[n], XmNvalue, 0); ++n;
21
- XtSetArg(args[n], XmNincrement, 1); ++n;
22
- XtSetArg(args[n], XmNpageIncrement, 1); ++n;
23
- hScrollBar = XmCreateScrollBar(scrolledWin, "hScrollBar", args, n);
24
- XtManageChild(hScrollBar);
25
- XtAddCallback(hScrollBar, XmNvalueChangedCallback,
26
- &hScrollChangeCbk, (XtPointer)this);
29
+ XtSetArg(args[n], XmNorientation, XmHORIZONTAL); ++n;
30
+ XtSetArg(args[n], XmNminimum, 0); ++n;
31
+ XtSetArg(args[n], XmNmaximum, 1); ++n;
32
+ XtSetArg(args[n], XmNsliderSize, 1); ++n;
33
+ XtSetArg(args[n], XmNvalue, 0); ++n;
34
+ XtSetArg(args[n], XmNincrement, 1); ++n;
35
+ XtSetArg(args[n], XmNpageIncrement, 1); ++n;
36
+ hScrollBar = XmCreateScrollBar(scrolledWin, "hScrollBar", args, n);
37
+ XtManageChild(hScrollBar);
38
+ XtAddCallback(hScrollBar, XmNvalueChangedCallback,
39
+ &hScrollChangeCbk, (XtPointer)this);
40
#ifndef DISABLE_SMOOTH_SCROLL
41
- XtAddCallback(hScrollBar, XmNdragCallback,
42
- &hScrollDragCbk, (XtPointer)this);
43
+ XtAddCallback(hScrollBar, XmNdragCallback,
44
+ &hScrollDragCbk, (XtPointer)this);
47
- XtSetArg(args[n], XmNorientation, XmVERTICAL); ++n;
48
- XtSetArg(args[n], XmNminimum, 0); ++n;
49
- XtSetArg(args[n], XmNmaximum, 1); ++n;
50
- XtSetArg(args[n], XmNsliderSize, 1); ++n;
51
- XtSetArg(args[n], XmNvalue, 0); ++n;
52
- XtSetArg(args[n], XmNincrement, 1); ++n;
53
- XtSetArg(args[n], XmNpageIncrement, 1); ++n;
54
- vScrollBar = XmCreateScrollBar(scrolledWin, "vScrollBar", args, n);
55
- XtManageChild(vScrollBar);
56
- XtAddCallback(vScrollBar, XmNvalueChangedCallback,
57
- &vScrollChangeCbk, (XtPointer)this);
59
+ XtSetArg(args[n], XmNorientation, XmVERTICAL); ++n;
60
+ XtSetArg(args[n], XmNminimum, 0); ++n;
61
+ XtSetArg(args[n], XmNmaximum, 1); ++n;
62
+ XtSetArg(args[n], XmNsliderSize, 1); ++n;
63
+ XtSetArg(args[n], XmNvalue, 0); ++n;
64
+ XtSetArg(args[n], XmNincrement, 1); ++n;
65
+ XtSetArg(args[n], XmNpageIncrement, 1); ++n;
66
+ vScrollBar = XmCreateScrollBar(scrolledWin, "vScrollBar", args, n);
67
+ XtManageChild(vScrollBar);
68
+ XtAddCallback(vScrollBar, XmNvalueChangedCallback,
69
+ &vScrollChangeCbk, (XtPointer)this);
70
#ifndef DISABLE_SMOOTH_SCROLL
71
- XtAddCallback(vScrollBar, XmNdragCallback,
72
- &vScrollDragCbk, (XtPointer)this);
73
+ XtAddCallback(vScrollBar, XmNdragCallback,
74
+ &vScrollDragCbk, (XtPointer)this);
78
// create the drawing area
80
XtSetArg(args[n], XmNshadowType, XmSHADOW_IN); ++n;
82
XtSetArg(args[n], XmNsliderSize, drawAreaWidth); ++n;
83
XtSetArg(args[n], XmNincrement, 16); ++n;
84
XtSetArg(args[n], XmNpageIncrement, drawAreaWidth); ++n;
85
- XtSetValues(hScrollBar, args, n);
86
+ if (hScrollBar) XtSetValues(hScrollBar, args, n);
88
if (pages->getLength() > 0) {
91
XtSetArg(args[n], XmNsliderSize, drawAreaHeight); ++n;
92
XtSetArg(args[n], XmNincrement, 16); ++n;
93
XtSetArg(args[n], XmNpageIncrement, drawAreaHeight); ++n;
94
- XtSetValues(vScrollBar, args, n);
95
+ if (vScrollBar) XtSetValues(vScrollBar, args, n);
98
void XPDFCore::setCursor(Cursor cursor) {