| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Tue, 08 Mar 2016 09:00:31 -0800 | |
| changeset 5561 | 0416d82f7f55 |
| parent 5525 | components/desktop/xscreensaver/patches/28-photopile-title.patch@7fcde4c19777 |
| permissions | -rw-r--r-- |
|
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
1 |
From a006863efaf40e8c1e2bffb68fb3ce4c2dfb149d Mon Sep 17 00:00:00 2001 |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
2 |
From: John Beck <[email protected]> |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
3 |
Date: Fri, 4 Mar 2016 17:39:18 -0800 |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
4 |
Subject: [PATCH] photopile title |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
5 |
|
|
5525
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
This patch was developed in-house, offered upstream, but rejected because |
|
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
of a difference of opinion about typical settings for font and screen sizes. |
|
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
8 |
--- |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
9 |
hacks/glx/photopile.c | 2 +- |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
10 |
1 file changed, 1 insertion(+), 1 deletion(-) |
|
5525
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
|
|
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
12 |
diff --git a/hacks/glx/photopile.c b/hacks/glx/photopile.c |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
13 |
index 29617aa..8c96188 100644 |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
14 |
--- a/hacks/glx/photopile.c |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
15 |
+++ b/hacks/glx/photopile.c |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
16 |
@@ -640,7 +640,7 @@ draw_image (ModeInfo *mi, int i, GLfloat t, GLfloat s, GLfloat z) |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
17 |
XCharStruct e; |
|
5525
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
|
|
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
/* #### Highly approximate, but doing real clipping is harder... */ |
|
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
- int max = 35; |
|
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
+ int max = 61; |
|
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
if (strlen(title) > max) |
|
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
title += strlen(title) - max; |
|
7fcde4c19777
22846864 photopile should allow for longer file names
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
|
|
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
25 |
-- |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
26 |
2.6.1 |
|
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5525
diff
changeset
|
27 |