1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
|
diff -rc okular.orig/aboutdata.h okular/aboutdata.h
*** okular.orig/aboutdata.h 2008-10-21 13:53:48.000000000 -0400
--- okular/aboutdata.h 2008-10-21 13:55:13.000000000 -0400
***************
*** 21,33 ****
"okular",
ki18n(iname), //I18N_NOOP("okular"),
OKULAR_VERSION_STRING,
! ki18n("Okular, a universal document viewer"),
KAboutData::License_GPL,
ki18n("(C) 2002 Wilco Greven, Christophe Devriese\n"
"(C) 2004-2005 Enrico Ros\n"
"(C) 2005 Piotr Szymanski\n"
"(C) 2004-2008 Albert Astals Cid\n"
! "(C) 2006-2008 Pino Toscano"),
KLocalizedString(),
"http://okular.kde.org"
);
--- 21,34 ----
"okular",
ki18n(iname), //I18N_NOOP("okular"),
OKULAR_VERSION_STRING,
! ki18n("Okular, a universal document viewer (prerex-enabled version)"),
KAboutData::License_GPL,
ki18n("(C) 2002 Wilco Greven, Christophe Devriese\n"
"(C) 2004-2005 Enrico Ros\n"
"(C) 2005 Piotr Szymanski\n"
"(C) 2004-2008 Albert Astals Cid\n"
! "(C) 2006-2008 Pino Toscano\n"
! "(C) 2006-2008 Bob Tennent"),
KLocalizedString(),
"http://okular.kde.org"
);
***************
*** 37,42 ****
--- 38,44 ----
about.addAuthor(ki18n("Albert Astals Cid"), ki18n("Former maintainer"), "aacid@kde.org");
about.addAuthor(ki18n("Piotr Szymanski"), ki18n("Created Okular from KPDF codebase"), "djurban@pld-dc.org");
about.addAuthor(ki18n("Enrico Ros"), ki18n("KPDF developer"), "eros.kde@email.it");
+ about.addAuthor(ki18n("Bob Tennent"), ki18n("prerex developer"), "rdtennent@gmail.com");
return about;
}
diff -rc okular.orig/core/document.cpp okular/core/document.cpp
*** okular.orig/core/document.cpp 2008-10-21 13:53:48.000000000 -0400
--- okular/core/document.cpp 2008-10-21 13:55:13.000000000 -0400
***************
*** 44,49 ****
--- 44,51 ----
#include <ktemporaryfile.h>
#include <ktoolinvocation.h>
+ #include <qclipboard.h>
+
// local includes
#include "action.h"
#include "annotations.h"
***************
*** 2740,2747 ****
case Action::Browse: {
const BrowseAction * browse = static_cast< const BrowseAction * >( action );
// if the url is a mailto one, invoke mailer
! if ( browse->url().startsWith( "mailto:", Qt::CaseInsensitive ) )
KToolInvocation::invokeMailer( browse->url() );
else
{
--- 2742,2759 ----
case Action::Browse: {
const BrowseAction * browse = static_cast< const BrowseAction * >( action );
+ if ( browse->url().startsWith( "coord:") )
+ { // for prerex: load coordinates of clicked box into the clipboard
+ QString message = browse->url();
+ QClipboard *cb = QApplication::clipboard();
+ message.remove("coord: ");
+ cb->setText(message, QClipboard::Selection );
+ }
+ else if ( browse->url().startsWith("anchor:") ) // ignore it
+ { }
+ else
// if the url is a mailto one, invoke mailer
! if ( browse->url().startsWith( QString("mailto:"), Qt::CaseInsensitive ) )
KToolInvocation::invokeMailer( browse->url() );
else
{
Only in okular/core: document.cpp.orig
diff -rc okular.orig/core/page.cpp okular/core/page.cpp
*** okular.orig/core/page.cpp 2008-10-21 13:53:48.000000000 -0400
--- okular/core/page.cpp 2008-10-21 13:55:13.000000000 -0400
***************
*** 20,25 ****
--- 20,27 ----
#include <kdebug.h>
+ #include <kmessagebox.h>
+
// local includes
#include "action.h"
#include "annotations.h"
***************
*** 34,39 ****
--- 36,42 ----
#include "rotationjob_p.h"
#include "textpage.h"
#include "textpage_p.h"
+ #include <stdlib.h>
#ifdef PAGE_PROFILE
#include <QtCore/QTime>
***************
*** 360,365 ****
--- 363,456 ----
return 0;
}
+ // computes the factor that scales from pixel coordinates to chart coordinates
+ const QPoint Page::scaleToChart (int xclick, int yclick, int widthPage, int heightPage) const
+ {
+ // Copyright (c) 2006 R. D. Tennent
+ // School of Computing, Queen's University, rdt@cs.queensu.ca
+ //
+ // There are *three* coordinate systems involved here:
+ //
+ // + chart coordinates, to which okular has no direct access
+ //
+ // + pixel coordinates, for example, as registered by a mouse click
+ //
+ // + normalized page coordinates in [0,1] range used internally
+ // by okular
+ //
+ // Implementation:
+ //
+ // Find the two "anchor: xci,yci" links, determine their
+ // "normalized" locations on the page, unnormalize to get the pixel
+ // coordinates (x1, y1) and (x2, y2) of their centre points, and
+ // then scale the mouse-click coordinates accordingly to get the
+ // corresponding chart coordinates (xc, yc).
+ //
+ QPoint clickChart = QPoint(); // what we're trying to determine
+ bool first = false, second = false;
+ int x1=0, y1=0, x2=0, y2=0; // pixel coordinates of centre points of two anchor links
+ int xc1=0, yc1=0, xc2=0, yc2=0; // chart coordinates of anchors, as determined by their URIs
+ int xc=0, yc=0; // rounded chart coordinates of mouse-click location
+
+ QLinkedList< ObjectRect * >::const_iterator it = m_rects.begin(), end = m_rects.end();
+ for ( ; it != end; ++it )
+ if ((*it)->objectType() == ObjectRect::Action)
+ {
+ const BrowseAction * action = static_cast< const BrowseAction * >( (*it)->object() );
+ if (action)
+ {
+ const BrowseAction * browse = dynamic_cast< const BrowseAction * >( action );
+ if (browse)
+ {
+ QString thisURL = browse->url();
+ if (thisURL.startsWith( "anchor:" ) )
+ {
+ int comma;
+ QString xs;
+ QRect unnormalized = (*it)->boundingRect(widthPage, heightPage);
+ thisURL.remove(0,7); // remove "anchor:"
+ comma = thisURL.indexOf(',');
+ xs = thisURL.left(comma); // x coordinate as a string
+ thisURL.remove(0, comma+1); // y coordinate as a string
+ if (!first)
+ {
+ QPoint p1; // centre of first anchor
+ xc1 = xs.toInt();
+ yc1 = thisURL.toInt();
+ p1 = unnormalized.center();
+ x1 = p1.x(); y1 = p1.y();
+ first = true;
+ }
+ else
+ {
+ QPoint p2; // centre of second anchor
+ xc2 = xs.toInt();
+ yc2 = thisURL.toInt();
+ p2 = unnormalized.center();
+ x2 = p2.x(); y2 = p2.y();
+ second = true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (!second) return QPoint(-1, -1);
+ // KMessageBox::information(0, QString()
+ // + " x1= " + QString::number(x1)
+ // + " y1= " + QString::number(y1)
+ // + " x2= " + QString::number(x2)
+ // + " y2= " + QString::number(y1)
+ // + " xclick= " + QString::number(xclick)
+ // + " yclick= " + QString::number(yclick)
+ // );
+ xc = (int)( 0.25L + (xc1 + xc2)/2.0L - ((x1 + x2)/2.0L - xclick) * (xc2 - xc1) / (x2 - x1) ) ;
+ yc = (int)( 0.75L + (yc1 + yc2)/2.0L - ((y1 + y2)/2.0L - yclick) * (yc2 - yc1) / (y2 - y1) );
+ clickChart = QPoint(xc, yc);
+ return clickChart;
+ }
+
+
const PageTransition * Page::transition() const
{
return d->m_transition;
diff -rc okular.orig/core/page.h okular/core/page.h
*** okular.orig/core/page.h 2008-10-21 13:53:48.000000000 -0400
--- okular/core/page.h 2008-10-21 13:55:13.000000000 -0400
***************
*** 326,331 ****
--- 326,336 ----
*/
void deleteAnnotations();
+ /** computes the factor that scales from pixel coordinates to chart coordinates:
+ */
+ const QPoint scaleToChart(int xclick, int yclick, int widthPage, int heightPage) const;
+
+
private:
PagePrivate* const d;
/// @cond PRIVATE
diff -rc okular.orig/shell/shell.cpp okular/shell/shell.cpp
*** okular.orig/shell/shell.cpp 2008-10-21 13:53:48.000000000 -0400
--- okular/shell/shell.cpp 2008-10-21 13:57:38.000000000 -0400
***************
*** 42,47 ****
--- 42,49 ----
#include <ktogglefullscreenaction.h>
#include <kactioncollection.h>
+ #include <kstatusbar.h>
+
// local includes
#include "kdocumentviewer.h"
Only in okular/shell: shell.cpp.orig
Only in okular/shell: shell.cpp.rej
diff -rc okular.orig/shell/shell.h okular/shell/shell.h
*** okular.orig/shell/shell.h 2008-10-21 13:53:48.000000000 -0400
--- okular/shell/shell.h 2008-10-21 13:55:13.000000000 -0400
***************
*** 101,106 ****
--- 101,107 ----
KToggleAction* m_showToolBarAction;
bool m_menuBarWasShown, m_toolBarWasShown;
KUrl m_openUrl;
+ KStatusBar *m_statusBar;
};
#endif
diff -rc okular.orig/ui/pageview.cpp okular/ui/pageview.cpp
*** okular.orig/ui/pageview.cpp 2008-10-21 13:53:48.000000000 -0400
--- okular/ui/pageview.cpp 2008-10-21 13:55:13.000000000 -0400
***************
*** 1643,1651 ****
}
if ( !d->mouseAnn )
{
! d->mouseGrabPos = d->mouseOnRect ? QPoint() : d->mousePressPos;
! if ( !d->mouseOnRect )
! setCursor( Qt::SizeAllCursor );
}
}
else if ( rightButton )
--- 1643,1680 ----
}
if ( !d->mouseAnn )
{
! d->mouseGrabPos = d->mouseOnRect ? QPoint() : d->mousePressPos;
! if ( !d->mouseOnRect )
! {
! QPoint click = QPoint(e->x(), e->y());
! // need to compute chart coordinates from pixel coordinates
! // first, find the relevant page:
! PageViewItem * pageItem = pickItemOnPoint( click.x(), click.y() );
! if ( pageItem )
! { // load chart coordinates of clicked point into clipboard
! QString message;
! QClipboard *cb = QApplication::clipboard();
! QPoint clickChart = pageItem->page()->
! scaleToChart(
! click.x() - pageItem->croppedGeometry().left(),
! click.y() - pageItem->croppedGeometry().top(),
! pageItem->croppedWidth(),
! pageItem->croppedHeight()
! );
! if (clickChart.x() == -1 && clickChart.y() == -1)
! { // no anchors
! setCursor( Qt::SizeAllCursor );
! break;
! }
! setCursor( Qt::CrossCursor );
! message = "";
! message.append(QString::number(clickChart.x()));
! message.append(',');
! message.append(QString::number(clickChart.y()));
! // message = QString::number(pageItem->width());
! cb->setText(message, QClipboard::Selection );
! }
! }
}
}
else if ( rightButton )
***************
*** 1767,1772 ****
--- 1796,1811 ----
// handle click over a link
const Okular::Action * action = static_cast< const Okular::Action * >( rect->object() );
d->document->processAction( action );
+ if (action)
+ {
+ const Okular::BrowseAction * browse = static_cast< const Okular::BrowseAction * >( action );
+ if (browse)
+ { // for coord URIs with prerex, change cursor to cross to signal click success
+ QString thisURL = browse->url();
+ if ( thisURL.startsWith( "coord:" ) )
+ setCursor( Qt::CrossCursor );
+ }
+ }
}
else
{
|
