File: diff

package info (click to toggle)
clearlooks 0.5-1
  • links: PTS
  • area: main
  • in suites: sarge
  • size: 2,024 kB
  • ctags: 269
  • sloc: sh: 8,511; ansic: 4,149; makefile: 654
file content (385 lines) | stat: -rw-r--r-- 12,560 bytes parent folder | download
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
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
? .in
? ChangeLog
? Makefile
? aclocal.m4
? config.guess
? config.h
? config.h.in
? config.log
? config.status
? config.sub
? configure
? depcomp
? diff
? libtool
? ltmain.sh
? stamp-h1
? src/.deps
? src/.libs
? src/Makefile
? src/Makefile.in
? src/clearlooks_draw.lo
? src/clearlooks_rc_style.lo
? src/clearlooks_style.lo
? src/clearlooks_theme_main.lo
? src/libclearlooks.la
? src/support.lo
? themes/Makefile
? themes/Makefile.in
? themes/Clearlooks/Makefile
? themes/Clearlooks/Makefile.in
? themes/Clearlooks/gtk-2.0/Makefile
? themes/Clearlooks/gtk-2.0/Makefile.in
? themes/Clearlooks/icons/Makefile
? themes/Clearlooks/icons/Makefile.in
? themes/Clearlooks/icons/16x16/Makefile
? themes/Clearlooks/icons/16x16/Makefile.in
? themes/Clearlooks/icons/16x16/gtk/Makefile
? themes/Clearlooks/icons/16x16/gtk/Makefile.in
? themes/Clearlooks/icons/24x24/Makefile
? themes/Clearlooks/icons/24x24/Makefile.in
? themes/Clearlooks/icons/24x24/gtk/Makefile
? themes/Clearlooks/icons/24x24/gtk/Makefile.in
? themes/Clearlooks/metacity-1/Makefile
? themes/Clearlooks/metacity-1/Makefile.in
? themes/Clearlooks-DeepSky/Makefile
? themes/Clearlooks-DeepSky/Makefile.in
? themes/Clearlooks-DeepSky/gtk-2.0/Makefile
? themes/Clearlooks-DeepSky/gtk-2.0/Makefile.in
? themes/Clearlooks-Olive/Makefile
? themes/Clearlooks-Olive/Makefile.in
? themes/Clearlooks-Olive/gtk-2.0/Makefile
? themes/Clearlooks-Olive/gtk-2.0/Makefile.in
Index: NEWS
===================================================================
RCS file: /cvsroot/clearlooks/clearlooks/NEWS,v
retrieving revision 1.4
diff -u -r1.4 NEWS
--- NEWS	6 Mar 2005 19:50:27 -0000	1.4
+++ NEWS	16 Mar 2005 20:05:02 -0000
@@ -2,6 +2,8 @@
 Dark themes look good now, too!
 Fixed a GTK+2.2 incompatibity issue.
 Compiles with c89 compilers.
+Fixed Muine/Rhythmbox speaker icon color.
+Menuitem selection is flat now, to resemble a list item.
 
 Thu Mar  3 2005 [0.4.0]:
 New optional animated Progressbar.
Index: src/clearlooks_draw.c
===================================================================
RCS file: /cvsroot/clearlooks/clearlooks/src/clearlooks_draw.c,v
retrieving revision 1.23
diff -u -r1.23 clearlooks_draw.c
--- src/clearlooks_draw.c	12 Mar 2005 12:14:21 -0000	1.23
+++ src/clearlooks_draw.c	16 Mar 2005 20:05:02 -0000
@@ -72,7 +72,7 @@
 	if (r->bordergc == NULL)
 		return;
 
-	for ( i=0; i<4; i++) // draw all four borders + corners
+	for ( i=0; i<4; i++) /* draw all four borders + corners */
 	{
 		cl_get_coords (i, x, y, width, height, r, &x1, &y1, &x2, &y2);
 		cl_draw_line (window, widget, style, x1, y1, x2, y2, i, r);
@@ -128,7 +128,7 @@
 static GdkColor *cl_get_gradient_corner_color (CLRectangle *r, CLCornerSide corner)
 {
 	GdkColor *color;
-	
+
 	if (r->border_gradient.from == NULL || r->border_gradient.to == NULL)
 	{
 		color = NULL;
@@ -138,7 +138,7 @@
 	{
 		color = r->border_gradient.from;
 	}
-	else // no gradient or other corner
+	else /* no gradient or other corner */
 	{
 		color = r->border_gradient.to;
 	}
@@ -151,10 +151,10 @@
                      CLRectangle *r, CLCornerSide corner)
 {
 	GdkColor    *color;
-	GdkColor     aacolor; // anti-aliasing color
+	GdkColor     aacolor; /* anti-aliasing color */
 	GdkGCValues  values;
 	GdkColor     tmp;
-	
+
 	int x1;
 	int y1;
 
@@ -163,7 +163,7 @@
 	
 	color = cl_get_gradient_corner_color (r, corner);
 	gdk_gc_get_values (r->bordergc, &values);
-	
+
 	if (color == NULL)
 	{
 		tmp = values.foreground;
@@ -172,7 +172,7 @@
 	}
 	
 	blend (style->colormap, get_parent_bgcolor(widget), color, &aacolor, 70);
-	
+
 	if (r->corners[corner] == CL_CORNER_ROUND)
 	{
 		x1 = (corner == CL_CORNER_TOPLEFT ||
@@ -193,14 +193,15 @@
 		      corner == CL_CORNER_TOPRIGHT) ? y : y+height-1;		
 		
 		gdk_draw_point (window, r->bordergc, x1, y1);
-		
+
 		x1 = (corner == CL_CORNER_TOPLEFT ||
 		      corner == CL_CORNER_BOTTOMLEFT) ? x : x+width-1;
 
 		y1 = (corner == CL_CORNER_TOPLEFT ||
 		      corner == CL_CORNER_TOPRIGHT) ? y+1 : y+height-2;
-		
+
 		gdk_draw_point (window, r->bordergc, x1, y1);
+								
 	}
 	else if (r->corners[corner] == CL_CORNER_NARROW)
 	{
@@ -505,7 +506,7 @@
 	    	            &clearlooks_style->spot2, &tmp_color );
 	else
 		draw_vgradient (tmp, style->black_gc, style->colormap, 0, 0, width, height,
-	    	            &tmp_color, &clearlooks_style->spot2); //TODO: swap for RTL
+	    	            &tmp_color, &clearlooks_style->spot2); /* TODO: swap for RTL */
 	                
 	if (orientation == GTK_PROGRESS_RIGHT_TO_LEFT || 
 	    orientation == GTK_PROGRESS_BOTTOM_TO_TOP)
@@ -519,17 +520,17 @@
 	
 	if (is_horizontal)
 	{
-		points[0] = (GdkPoint){xdir*(topright - stripe_width - topright_div_2), 0};  // topleft
-		points[1] = (GdkPoint){xdir*(topright - topright_div_2), 0};                 // topright
-		points[2] = (GdkPoint){xdir*(stripe_width - topright_div_2), height};        // bottomright
-		points[3] = (GdkPoint){xdir*(-topright_div_2), height};                      // bottomleft
+		points[0] = (GdkPoint){xdir*(topright - stripe_width - topright_div_2), 0};  /* topleft */
+		points[1] = (GdkPoint){xdir*(topright - topright_div_2), 0};                 /* topright */
+		points[2] = (GdkPoint){xdir*(stripe_width - topright_div_2), height};        /* bottomright */
+		points[3] = (GdkPoint){xdir*(-topright_div_2), height};                      /* bottomleft */
 	}
 	else
 	{
-		points[0] = (GdkPoint){height, xdir*(topright - stripe_width - topright_div_2)};  // topleft
-		points[1] = (GdkPoint){height, xdir*(topright - topright_div_2)};                 // topright
-		points[2] = (GdkPoint){0, xdir*(stripe_width - topright_div_2)};        // bottomright
-		points[3] = (GdkPoint){0, xdir*(-topright_div_2)};                      // bottomleft
+		points[0] = (GdkPoint){height, xdir*(topright - stripe_width - topright_div_2)};  /* topleft */
+		points[1] = (GdkPoint){height, xdir*(topright - topright_div_2)};                 /* topright */
+		points[2] = (GdkPoint){0, xdir*(stripe_width - topright_div_2)};        /* bottomright */
+		points[3] = (GdkPoint){0, xdir*(-topright_div_2)};                      /* bottomleft */
 	}
 						 
 	
@@ -553,7 +554,7 @@
 	return tmp;
 }
 
-// could be improved, I think.
+/* could be improved, I think. */
 void cl_progressbar_fill (GdkDrawable *drawable, GtkWidget *widget,
                           GtkStyle *style, GdkGC *gc,
                           gint x, gint y,
Index: src/clearlooks_draw.h
===================================================================
RCS file: /cvsroot/clearlooks/clearlooks/src/clearlooks_draw.h,v
retrieving revision 1.9
diff -u -r1.9 clearlooks_draw.h
--- src/clearlooks_draw.h	12 Mar 2005 12:14:21 -0000	1.9
+++ src/clearlooks_draw.h	16 Mar 2005 20:05:03 -0000
@@ -29,13 +29,13 @@
 
 	guint8          corners[4];
 	
-	GdkGC          *topleft;		// top + left shadow
-	GdkGC          *bottomright;	// bottom + right shadow
+	GdkGC          *topleft;		/* top + left shadow */
+	GdkGC          *bottomright;	/* bottom + right shadow */
 	
-	GdkColor        tmp_color;		// used for gradient
+	GdkColor        tmp_color;		/* used for gradient */
 } CLRectangle;
 
-typedef enum // DON'T CHANGE THE ORDER!
+typedef enum /* DON'T CHANGE THE ORDER! */
 {
 	CL_CORNER_TOPRIGHT,
 	CL_CORNER_BOTTOMRIGHT,
@@ -43,7 +43,7 @@
 	CL_CORNER_TOPLEFT,
 } CLCornerSide;
 
-typedef enum // DON'T CHANGE THE ORDER!
+typedef enum /* DON'T CHANGE THE ORDER! */
 {
 	CL_BORDER_TOP,
 	CL_BORDER_RIGHT,
@@ -116,4 +116,5 @@
                             GdkRectangle *area, GtkStateType state_type, 
                             int x, int y, int wiidth, int height, CLRectangle *r);
 							  
-#endif // CLEARLOOKS_DRAW_H
+#endif /* CLEARLOOKS_DRAW_H */
+
Index: src/clearlooks_style.c
===================================================================
RCS file: /cvsroot/clearlooks/clearlooks/src/clearlooks_style.c,v
retrieving revision 1.72
diff -u -r1.72 clearlooks_style.c
--- src/clearlooks_style.c	15 Mar 2005 16:02:27 -0000	1.72
+++ src/clearlooks_style.c	16 Mar 2005 20:05:04 -0000
@@ -11,7 +11,7 @@
 #include "support.h"
 #include "config.h"
 
-//#define DEBUG 1
+/* #define DEBUG 1 */
 
 #define SCALE_SIZE 5
 
@@ -541,7 +541,7 @@
 	gdk_gc_set_clip_region (r.topleft,     NULL);
 	gdk_gc_set_clip_region (r.bottomright, NULL);
 	
-	// it's a semi hack
+	/* it's a semi hack */
 	gdk_draw_line (window, style->light_gc[state_type],
 	               light_rect.x, light_rect.y,
 	               light_rect.width, light_rect.height);
@@ -573,7 +573,8 @@
 	{
 		GdkRectangle new_area;
 		GdkColor tmp_color;
-	
+
+	printf("draw tab!\n");	
 		cl_rectangle_set_button (&r, style, state_type, FALSE,
 								CL_CORNER_ROUND, CL_CORNER_ROUND,
 								CL_CORNER_ROUND, CL_CORNER_ROUND);
@@ -885,15 +886,15 @@
 		printf("No widget to draw?!\n");
 		return;
 	}
-	
+
 	if (widget && DETAIL ("button") && widget->parent &&
-	         (GTK_IS_TREE_VIEW(widget->parent) || GTK_IS_CLIST (widget->parent))) // headers
+	         (GTK_IS_TREE_VIEW(widget->parent) || GTK_IS_CLIST (widget->parent))) /* listview headers */
 	{
 		gint columns = 0, column_index = 0, nwidth;
 
 		if ( width < 2 || height < 2 )
 			return;
-			
+		
 		if (GTK_IS_TREE_VIEW (widget->parent))
 			gtk_treeview_get_header_index (widget->parent, widget, &column_index, &columns);
 		
@@ -1008,7 +1009,7 @@
 		cl_draw_shadow (window, widget, style, x, y, width, height, &r);
 		cl_rectangle_reset_clip_rectangle (&r);	
 
-		// DRAW FILL		
+		/* DRAW FILL */
 		shade (&upper_color, &lower_color, 1.3);
 		
 		r.bordergc = clearlooks_style->spot3_gc;
@@ -1181,7 +1182,7 @@
 		cl_draw_shadow (window, widget, style, x, y, width, height, &r);
 		cl_rectangle_reset_clip_rectangle (&r);	
 	}
-	else if (detail && !strcmp (detail, "optionmenu")) // supporting deprecated
+	else if (detail && !strcmp (detail, "optionmenu")) /* supporting deprecated */
 	{
 		GtkRequisition indicator_size;
 		GtkBorder indicator_spacing;
@@ -1229,8 +1230,9 @@
 		GdkGC *dark = clearlooks_style->shade_gc[2];
 		GdkColor upper_color, lower_color;
 		
-		// don't draw sunken menubar on gnome panel
-		//IT'S A HACK! HORRIBLE HACK! HIDEOUS HACK! BUT IT WORKS FOR ME(tm)!
+		/* don't draw sunken menubar on gnome panel
+		   IT'S A HACK! HORRIBLE HACK! HIDEOUS HACK!
+		   BUT IT WORKS FOR ME(tm)! */
 		if (widget->parent &&
 			strcmp(G_OBJECT_TYPE_NAME (widget->parent), "PanelWidget") == 0)
 			return;
@@ -1249,7 +1251,7 @@
 		                                               &clearlooks_style->shade[3]);
 		cl_rectangle_set_gradient (&r.fill_gradient, &upper_color, &lower_color);
 		
-		// make vertical borders invisible
+		/* make vertical borders invisible */
 		x--; width+=2;
 		
 		cl_rectangle_set_clip_rectangle (&r, area);
@@ -1327,14 +1329,14 @@
 				widget && !GTK_WIDGET_NO_WINDOW (widget),
 				state_type, area, x, y, width, height);
 		
-		// we only want the borders on horizontal toolbars
+		/* we only want the borders on horizontal toolbars */
 		if ( DETAIL ("menubar") || height < 2*width ) { 
 			if (!DETAIL ("menubar"))
 				gdk_draw_line (window, clearlooks_style->shade_gc[0],
-				               x, y, x + width, y); // top
+				               x, y, x + width, y); /* top */
 							
 			gdk_draw_line (window, clearlooks_style->shade_gc[3],
-			               x, y + height - 1, x + width, y + height - 1); // bottom
+			               x, y + height - 1, x + width, y + height - 1); /* bottom */
 		}
 		
 		if (area)
@@ -1675,7 +1677,7 @@
                  gint            gap_x,
                  gint            gap_width)
 {
-	// I need to improve this function.
+	/* I need to improve this function. */
 	ClearlooksStyle *clearlooks_style = CLEARLOOKS_STYLE (style);
 	CLRectangle r;
 	GdkRegion *area_region = NULL, 
@@ -1813,7 +1815,7 @@
 	{
 		gdk_draw_line (window, clearlooks_style->shade_gc[2], x1, y, x2, y);
 		
-		//if (DETAIL ("menuitem"))
+		/* if (DETAIL ("menuitem")) */
 		gdk_draw_line (window, clearlooks_style->shade_gc[0], x1, y+1, x2, y+1);
 	}
 	
Index: src/support.c
===================================================================
RCS file: /cvsroot/clearlooks/clearlooks/src/support.c,v
retrieving revision 1.6
diff -u -r1.6 support.c
--- src/support.c	6 Mar 2005 22:59:39 -0000	1.6
+++ src/support.c	16 Mar 2005 20:05:04 -0000
@@ -600,6 +600,12 @@
 	GdkColor col;
 	int dr, dg, db;
 	GdkGCValues old_values;
+
+	if ( top_color == NULL || bottom_color == NULL )
+	{
+		gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);
+		return;
+	}
 	
 	gdk_gc_get_values (gc, &old_values);