[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.66 by root, Tue Apr 11 14:36:02 2006 UTC

…		…
1	package Crossfire::Client::Widget;	1	package CFClient::Widget;
2		2
3	use strict;	3	use strict;
4		4
5	use Scalar::Util;	5	use Scalar::Util;
6		6
7	use SDL::OpenGL;	7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
9		9
10	our $FOCUS; # the widget with current focus	10	use CFClient;
11	#our @ACTIVE_WIDGETS;	11
		12	our ($FOCUS, $HOVER, $GRAB); # various widgets
		13
		14	our $TOPLEVEL;
		15	our $BUTTON_STATE;
12		16
13	# class methods for events	17	# class methods for events
14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	18	sub feed_sdl_key_down_event {
15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	19	$FOCUS->key_down ($_[0]) if $FOCUS;
		20	}
		21
		22	sub feed_sdl_key_up_event {
		23	$FOCUS->key_up ($_[0]) if $FOCUS;
		24	}
		25
16	sub feed_sdl_button_down_event { }	26	sub feed_sdl_button_down_event {
		27	my ($ev) = @_;
		28	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		29
		30	if (!$BUTTON_STATE) {
		31	my $widget = $TOPLEVEL->find_widget ($x, $y);
		32
		33	$GRAB = $widget;
		34	$GRAB->update if $GRAB;
		35	}
		36
		37	$BUTTON_STATE \|= 1 << ($ev->button - 1);
		38
		39	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		40	}
		41
17	sub feed_sdl_button_up_event { }	42	sub feed_sdl_button_up_event {
		43	my ($ev) = @_;
		44	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		45
		46	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		47
		48	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
		49
		50	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		51
		52	if (!$BUTTON_STATE) {
		53	my $grab = $GRAB; undef $GRAB;
		54	$grab->update if $grab;
		55	$GRAB->update if $GRAB;
		56	}
		57	}
		58
		59	sub feed_sdl_motion_event {
		60	my ($ev) = @_;
		61	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		62
		63	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);
		64
		65	if ($widget != $HOVER) {
		66	my $hover = $HOVER; $HOVER = $widget;
		67
		68	$hover->update if $hover;
		69	$HOVER->update if $HOVER;
		70	}
		71
		72	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
		73	}
18		74
19	sub new {	75	sub new {
20	my $class = shift;	76	my $class = shift;
21		77
22	bless { @_ }, $class	78	bless {
		79	x => 0,
		80	y => 0,
		81	z => 0,
		82	@_
		83	}, $class
23	}	84	}
24
25	#sub activate {
26	# push @ACTIVE_WIDGETS, $_[0];
27	# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28	#}
29
30	#sub deactivate {
31	# @ACTIVE_WIDGETS =
32	# sort { $a->{z} <=> $b->{z} }
33	# grep { $_ && $_ != $_[0] }
34	# @ACTIVE_WIDGETS;
35	#}
36		85
37	sub move {	86	sub move {
38	my ($self, $x, $y, $z) = @_;	87	my ($self, $x, $y, $z) = @_;
39	$self->{x} = $x;	88	$self->{x} = $x;
40	$self->{y} = $y;	89	$self->{y} = $y;
44	sub needs_redraw {	93	sub needs_redraw {
45	0	94	0
46	}	95	}
47		96
48	sub size_request {	97	sub size_request {
		98	require Carp;
49	die "size_request is abtract";	99	Carp::confess "size_request is abtract";
		100	}
		101
		102	sub size_allocate {
		103	my ($self, $w, $h) = @_;
		104
		105	$self->{w} = $w;
		106	$self->{h} = $h;
		107	}
		108
		109	# translate global koordinates to local coordinate system
		110	sub translate {
		111	my ($self, $x, $y) = @_;
		112
		113	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50	}	114	}
51		115
52	sub focus_in {	116	sub focus_in {
53	my ($widget) = @_;	117	my ($self) = @_;
54	$FOCUS = $widget;	118
		119	my $focus = $FOCUS; $FOCUS = $self;
		120	$focus->update if $focus;
		121	$FOCUS->update;
55	}	122	}
56		123
57	sub focus_out {	124	sub focus_out {
58	my ($widget) = @_;	125	my ($self) = @_;
59	}
60		126
61	sub key_down {	127	return unless $FOCUS == $self;
62	my ($widget, $sdlev) = @_;
63	}
64		128
65	sub key_up {	129	my $focus = $FOCUS; undef $FOCUS;
66	my ($widget, $sdlev) = @_;	130	$focus->update if $focus; #?
67	}	131	}
68		132
		133	sub mouse_motion { }
		134	sub button_up { }
69	sub button_down {	135	sub button_down { }
70	my ($widget, $sdlev) = @_;	136	sub key_down { }
71	}	137	sub key_up { }
72		138
73	sub button_up {	139	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74	my ($widget, $sdlev) = @_;	140	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75	}
76
77	sub w { $_[0]->{w} }
78	sub h { $_[0]->{h} }
79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	141	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	142	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	143	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82		144
83	sub draw {	145	sub draw {
84	my ($self) = @_;	146	my ($self) = @_;
85		147
86	glPushMatrix;	148	glPushMatrix;
87	glTranslate $self->{x}, $self->{y}, 0;	149	glTranslate $self->{x}, $self->{y}, 0;
88	$self->_draw;	150	$self->_draw;
		151	if ($self == $HOVER) {
		152	glColor 1, 1, 1, 0.4;
		153	glEnable GL_BLEND;
		154	glBegin GL_QUADS;
		155	glVertex 0 , 0;
		156	glVertex $self->{w}, 0;
		157	glVertex $self->{w}, $self->{h};
		158	glVertex 0 , $self->{h};
		159	glEnd;
		160	glDisable GL_BLEND;
		161	}
89	glPopMatrix;	162	glPopMatrix;
90	}	163	}
91		164
92	sub _draw {	165	sub _draw {
93	my ($widget) = @_;	166	my ($self) = @_;
		167
		168	warn "no draw defined for $self\n";
94	}	169	}
95		170
96	sub bbox {	171	sub bbox {
97	my ($self) = @_;	172	my ($self) = @_;
98	my ($w, $h) = $self->size_request;	173	my ($w, $h) = $self->size_request;
…		…
102	$self->{x} = $w,	177	$self->{x} = $w,
103	$self->{y} = $h	178	$self->{y} = $h
104	)	179	)
105	}	180	}
106		181
		182	sub find_widget {
		183	my ($self, $x, $y) = @_;
		184
		185	return $self
		186	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		187	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		188
		189	()
		190	}
		191
107	sub del_parent { $_[0]->{parent} = undef }	192	sub del_parent { $_[0]->{parent} = undef }
108		193
109	sub set_parent {	194	sub set_parent {
110	my ($self, $par) = @_;	195	my ($self, $par) = @_;
111		196
…		…
128	my ($self) = @_;	213	my ($self) = @_;
129		214
130	#$self->deactivate;	215	#$self->deactivate;
131	}	216	}
132		217
		218	#############################################################################
		219
		220	package CFClient::Widget::Empty;
		221
		222	our @ISA = CFClient::Widget::;
		223
		224	sub size_request {
		225	(0, 0)
		226	}
		227
		228	sub draw {
		229	}
		230
		231	#############################################################################
		232
133	package Crossfire::Client::Widget::Container;	233	package CFClient::Widget::Container;
134		234
135	our @ISA = Crossfire::Client::Widget::;	235	our @ISA = CFClient::Widget::;
		236
		237	sub new {
		238	my ($class, %arg) = @_;
		239
		240	my $children = delete $arg{children} \|\| [];
		241
		242	my $self = $class->SUPER::new (children => [], %arg);
		243	$self->add ($_) for @$children;
		244
		245	$self
		246	}
		247
		248	sub add {
		249	my ($self, $chld, $expand) = @_;
		250
		251	$chld->{expand} = $expand;
		252	$chld->set_parent ($self);
		253
		254	$self->{children} = [
		255	sort { $a->{z} <=> $b->{z} }
		256	@{$self->{children}}, $chld
		257	];
		258
		259	$self->size_allocate ($self->{w}, $self->{h})
		260	if $self->{w}; #TODO: check for "realised state"
		261	}
		262
		263	sub remove {
		264	my ($self, $widget) = @_;
		265
		266	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
		267
		268	$self->size_allocate ($self->{w}, $self->{h});
		269	}
		270
		271	sub find_widget {
		272	my ($self, $x, $y) = @_;
		273
		274	$x -= $self->{x};
		275	$y -= $self->{y};
		276
		277	my $res;
		278
		279	for (reverse @{ $self->{children} }) {
		280	$res = $_->find_widget ($x, $y)
		281	and return $res;
		282	}
		283
		284	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		285	}
		286
		287	sub _draw {
		288	my ($self) = @_;
		289
		290	$_->draw for @{$self->{children}};
		291	}
		292
		293	#############################################################################
		294
		295	package CFClient::Widget::Bin;
		296
		297	our @ISA = CFClient::Widget::Container::;
		298
		299	sub new {
		300	my ($class, %arg) = @_;
		301
		302	my $child = (delete $arg{child}) \|\| new CFClient::Widget::Empty::;
		303
		304	$class->SUPER::new (children => [$child], %arg)
		305	}
		306
		307	sub add {
		308	my ($self, $widget) = @_;
		309
		310	$self->{children} = [];
		311
		312	$self->SUPER::add ($widget);
		313	}
		314
		315	sub remove {
		316	my ($self, $widget) = @_;
		317
		318	$self->SUPER::remove ($widget);
		319
		320	$self->{children} = [new CFClient::Widget::Empty]
		321	unless @{$self->{children}};
		322	}
		323
		324	sub child { $_[0]->{children}[0] }
		325
		326	sub size_request {
		327	$_[0]{children}[0]->size_request if $_[0]{children}[0];
		328	}
		329
		330	sub size_allocate {
		331	my ($self, $w, $h) = @_;
		332
		333	$self->SUPER::size_allocate ($w, $h);
		334	$self->{children}[0]->size_allocate ($w, $h)
		335	if $self->{children}[0]
		336	}
		337
		338	#############################################################################
		339
		340	package CFClient::Widget::Window;
		341
		342	our @ISA = CFClient::Widget::Bin::;
136		343
137	use SDL::OpenGL;	344	use SDL::OpenGL;
138		345
139	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }	346	sub new {
140	sub get { $_[0]->{child} }	347	my ($class, %arg) = @_;
141	sub remove {
142	my ($self, $chld) = @_;
143	delete $self->{child}
144	if $self->{child} == $chld;
145	}
146		348
147	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	349	my $self = $class->SUPER::new (%arg);
148
149	sub _draw { die "Containers can't be drawn!" }
150
151	package Crossfire::Client::Widget::Toplevel;
152
153	our @ISA = Crossfire::Client::Widget::;
154
155	use SDL::OpenGL;
156
157	sub add {
158	my ($self, $chld) = @_;
159
160	push @{$self->{childs}}, $chld;
161	@{$self->{childs}} =
162	sort { $a->{z} <=> $b->{z} }
163	@{$self->{childs}};
164
165	$chld->set_parent ($self);
166	}
167
168	sub remove {
169	my ($self, $chld) = @_;
170	@{$self->{childs}} =
171	sort { $a->{z} <=> $b->{z} }
172	grep { $_ && $_ != $_[0] }
173	@{$self->{childs}}
174	}	350	}
175		351
176	sub update {	352	sub update {
177	my ($self) = @_;	353	my ($self) = @_;
178	::refresh ();	354
		355	# we want to do this delayed...
		356	$self->render_chld;
		357	$self->SUPER::update;
		358	}
		359
		360	sub render_chld {
		361	my ($self) = @_;
		362
		363	$self->{texture} =
		364	CFClient::Texture->new_from_opengl (
		365	$self->{w}, $self->{h}, sub { $self->child->draw }
		366	);
		367	}
		368
		369	sub size_allocate {
		370	my ($self, $w, $h) = @_;
		371
		372	$self->{w} = $w;
		373	$self->{h} = $h;
		374
		375	$self->child->size_allocate ($w, $h);
		376
		377	$self->render_chld;
179	}	378	}
180		379
181	sub _draw {	380	sub _draw {
182	my ($self) = @_;	381	my ($self) = @_;
183		382
184	$_->draw for @{$self->{childs}};	383	my ($w, $h) = ($self->w, $self->h);
185	}
186
187	package Crossfire::Client::Widget::Window;
188
189	our @ISA = Crossfire::Client::Widget::Container::;
190
191	use SDL::OpenGL;
192
193	sub add {
194	my ($self, $chld) = @_;
195	$self->SUPER::add ($chld);
196	$chld->set_parent ($self);
197	$self->update; #TODO: Move this to the size_request event propably?
198	}
199
200	sub remove {
201	my ($self) = @_;
202	# TODO FIXME: removing a child from a window will crash, see render_chld
203	$self->update;
204	}
205
206	sub update {
207	my ($self) = @_;
208	$self->render_chld;
209	}
210
211	sub render_chld {
212	my ($self) = @_;
213	my $chld = $self->get;
214	my ($w, $h) = $self->size_request;
215
216	$self->{texture} =
217	Crossfire::Client::Texture->new_from_opengl (
218	$w, $h, sub { $chld->draw }
219	);
220	$self->{texture}->upload;
221	}
222
223	sub size_request {
224	my ($self) = @_;
225	my $chld = $self->get
226	or return (0, 0);
227	$chld->size_request
228	}
229
230	sub _draw {
231	my ($self) = @_;
232
233	my ($w, $h) = $self->size_request;#TODO# use width/height of texture
234		384
235	my $tex = $self->{texture}	385	my $tex = $self->{texture}
236	or return;	386	or return;
237		387
238	glEnable GL_BLEND;	388	glEnable GL_BLEND;
239	glEnable GL_TEXTURE_2D;	389	glEnable GL_TEXTURE_2D;
240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	390	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241	glBindTexture GL_TEXTURE_2D, $tex->{name};
242		391
243	glColor 1, 0, 1;	392	$tex->draw_quad (0, 0, $w, $h);
244
245	glBegin GL_QUADS;
246	glTexCoord 0, 0; glVertex 0, 0;
247	glTexCoord 0, 1; glVertex 0, $h;
248	glTexCoord 1, 1; glVertex $w, $h;
249	glTexCoord 1, 0; glVertex $w, 0;
250	glEnd;
251		393
252	glDisable GL_BLEND;	394	glDisable GL_BLEND;
253	glDisable GL_TEXTURE_2D;	395	glDisable GL_TEXTURE_2D;
254	}	396	}
255		397
		398	#############################################################################
		399
256	package Crossfire::Client::Widget::Frame;	400	package CFClient::Widget::Frame;
257		401
258	our @ISA = Crossfire::Client::Widget::Container::;	402	our @ISA = CFClient::Widget::Bin::;
259		403
260	use SDL::OpenGL;	404	use SDL::OpenGL;
261		405
262	sub size_request {	406	sub size_request {
263	my ($self) = @_;	407	my ($self) = @_;
264	my $chld = $self->get	408	my $chld = $self->child
265	or return (0, 0);	409	or return (0, 0);
266		410
267	$chld->move (2, 2);	411	$chld->move (2, 2);
268		412
269	map { $_ + 4 } $chld->size_request;	413	map { $_ + 4 } $chld->size_request;
270	}	414	}
271		415
		416	sub size_allocate {
		417	my ($self, $w, $h) = @_;
		418
		419	$self->{w} = $w;
		420	$self->{h} = $h;
		421
		422	$self->child->size_allocate ($w - 4, $h - 4);
		423	$self->child->move (2, 2);
		424	}
		425
272	sub _draw {	426	sub _draw {
273	my ($self) = @_;	427	my ($self) = @_;
274		428
275	my $chld = $self->get;	429	my $chld = $self->child;
276		430
277	my ($w, $h) = $chld->size_request;	431	my ($w, $h) = $chld->size_request;
278		432
279	glBegin GL_QUADS;	433	glBegin GL_QUADS;
280	glColor 0, 0, 0;	434	glColor 0, 0, 0;
281	glTexCoord 0, 0; glVertex 0 , 0;	435	glVertex 0 , 0;
282	glTexCoord 0, 1; glVertex 0 , $h + 4;	436	glVertex 0 , $h + 4;
283	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	437	glVertex $w + 4 , $h + 4;
284	glTexCoord 1, 0; glVertex $w + 4 , 0;	438	glVertex $w + 4 , 0;
285	glEnd;	439	glEnd;
286		440
287	$chld->draw;	441	$chld->draw;
288	}	442	}
289		443
		444	#############################################################################
		445
290	package Crossfire::Client::Widget::FancyFrame;	446	package CFClient::Widget::FancyFrame;
291		447
292	our @ISA = Crossfire::Client::Widget::Frame::;	448	our @ISA = CFClient::Widget::Bin::;
293		449
294	use SDL::OpenGL;	450	use SDL::OpenGL;
295		451
296	#TODO: implement themed frame	452	my @tex =
		453	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		454	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
297		455
		456	sub size_request {
		457	my ($self) = @_;
		458
		459	my ($w, $h) = $self->SUPER::size_request;
		460
		461	$h += $tex[1]->{height};
		462	$h += $tex[4]->{height};
		463	$w += $tex[2]->{width};
		464	$w += $tex[3]->{width};
		465
		466	($w, $h)
		467	}
		468
		469	sub size_allocate {
		470	my ($self, $w, $h) = @_;
		471
		472	$self->SUPER::size_allocate ($w, $h);
		473
		474	$h -= $tex[1]->{height};
		475	$h -= $tex[4]->{height};
		476	$w -= $tex[2]->{width};
		477	$w -= $tex[3]->{width};
		478
		479	$h = $h < 0 ? 0 : $h;
		480	$w = $w < 0 ? 0 : $w;
		481
		482	my $child = $self->child;
		483
		484	$child->size_allocate ($w, $h);
		485	$child->move ($tex[3]->{width}, $tex[1]->{height});
		486	}
		487
		488	sub _draw {
		489	my ($self) = @_;
		490
		491	my ($w, $h) = ($self->{w}, $self->{h});
		492	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		493
		494	glEnable GL_BLEND;
		495	glEnable GL_TEXTURE_2D;
		496	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		497	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		498
		499	my $top = $tex[1];
		500	$top->draw_quad (0, 0, $w, $top->{height});
		501
		502	my $left = $tex[3];
		503	$left->draw_quad (0, $top->{height}, $left->{width}, $ch);
		504
		505	my $right = $tex[2];
		506	$right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
		507
		508	my $bottom = $tex[4];
		509	$bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
		510
		511	my $bg = $tex[0];
		512	glBindTexture GL_TEXTURE_2D, $bg->{name};
		513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		514	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		515	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		516
		517	my $rep_x = $cw / $bg->{width};
		518	my $rep_y = $ch / $bg->{height};
		519
		520	$bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
		521
		522	glDisable GL_BLEND;
		523	glDisable GL_TEXTURE_2D;
		524
		525	$self->child->draw;
		526
		527	}
		528
		529	#############################################################################
		530
298	package Crossfire::Client::Widget::Table;	531	package CFClient::Widget::Table;
299		532
300	our @ISA = Crossfire::Client::Widget::Container::;	533	our @ISA = CFClient::Widget::Bin::;
301		534
302	use SDL::OpenGL;	535	use SDL::OpenGL;
303		536
304	sub add {	537	sub add {
305	my ($self, $x, $y, $chld) = @_;	538	my ($self, $x, $y, $chld) = @_;
306	my $old_chld = $self->{childs}[$y][$x];	539	my $old_chld = $self->{children}[$y][$x];
307		540
308	$self->{childs}[$y][$x] = $chld;	541	$self->{children}[$y][$x] = $chld;
309	$chld->set_parent ($self);	542	$chld->set_parent ($self);
310	$self->update;	543	$self->update;
311	}	544	}
312		545
313	sub max_row_height {	546	sub max_row_height {
314	my ($self, $row) = @_;	547	my ($self, $row) = @_;
315		548
316	my $hs = 0;	549	my $hs = 0;
317	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	550	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] \|\| []}; $xi++) {
318	my $c = $self->{childs}->[$row]->[$xi];	551	my $c = $self->{children}->[$row]->[$xi];
319	if ($c) {	552	if ($c) {
320	my ($w, $h) = $c->size_request;	553	my ($w, $h) = $c->size_request;
321	if ($hs < $h) { $hs = $h }	554	if ($hs < $h) { $hs = $h }
322	}	555	}
323	}	556	}
…		…
326		559
327	sub max_col_width {	560	sub max_col_width {
328	my ($self, $col) = @_;	561	my ($self, $col) = @_;
329		562
330	my $ws = 0;	563	my $ws = 0;
331	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	564	for (my $yi = 0; $yi <= $#{$self->{children} \|\| []}; $yi++) {
332	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	565	my $c = ($self->{children}->[$yi] \|\| [])->[$col];
333	if ($c) {	566	if ($c) {
334	my ($w, $h) = $c->size_request;	567	my ($w, $h) = $c->size_request;
335	if ($ws < $w) { $ws = $w }	568	if ($ws < $w) { $ws = $w }
336	}	569	}
337	}	570	}
…		…
341	sub size_request {	574	sub size_request {
342	my ($self) = @_;	575	my ($self) = @_;
343		576
344	my ($hs, $ws) = (0, 0);	577	my ($hs, $ws) = (0, 0);
345		578
346	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	579	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
347	$hs += $self->max_row_height ($yi);	580	$hs += $self->max_row_height ($yi);
348	}	581	}
349		582
350	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	583	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
351	my $wm = 0;	584	my $wm = 0;
352	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	585	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
353	$wm += $self->max_col_width ($xi)	586	$wm += $self->max_col_width ($xi)
354	}	587	}
355	if ($ws < $wm) { $ws = $wm }	588	if ($ws < $wm) { $ws = $wm }
356	}	589	}
357		590
…		…
360		593
361	sub _draw {	594	sub _draw {
362	my ($self) = @_;	595	my ($self) = @_;
363		596
364	my $y = 0;	597	my $y = 0;
365	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	598	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
366	my $x = 0;	599	my $x = 0;
367		600
368	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	601	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
369		602
370	my $c = $self->{childs}->[$yi]->[$xi];	603	my $c = $self->{children}->[$yi]->[$xi];
371	if ($c) {	604	if ($c) {
372	$c->move ($x, $y, 0); #TODO: Move to size_request	605	$c->move ($x, $y, 0); #TODO: Move to size_request
373	$c->draw if $c;	606	$c->draw if $c;
374	}	607	}
375		608
…		…
378		611
379	$y += $self->max_row_height ($yi);	612	$y += $self->max_row_height ($yi);
380	}	613	}
381	}	614	}
382		615
		616	#############################################################################
		617
383	package Crossfire::Client::Widget::VBox;	618	package CFClient::Widget::VBox;
384		619
385	our @ISA = Crossfire::Client::Widget::Container::;	620	our @ISA = CFClient::Widget::Container::;
386		621
387	use SDL::OpenGL;	622	use SDL::OpenGL;
388		623
389	sub add {
390	my ($self, $chld) = @_;
391	push @{$self->{childs}}, $chld;
392	$chld->set_parent ($self);
393	$self->update;
394	}
395
396	sub size_request {	624	sub size_request {
397	my ($self) = @_;	625	my ($self) = @_;
398		626
399	my ($hs, $ws) = (0, 0);	627	my @alloc = map [$_->size_request], @{$self->{children}};
		628
		629	(
		630	(List::Util::max map $_->[0], @alloc),
		631	(List::Util::sum map $_->[1], @alloc),
		632	)
		633	}
		634
		635	sub size_allocate {
		636	my ($self, $w, $h) = @_;
		637
		638	$self->w ($w);
		639	$self->h ($h);
		640
		641	my $exp;
		642	my @oth;
		643	# find expand widget
400	for (@{$self->{childs} \|\| []}) {	644	for (@{$self->{children}}) {
		645	if ($_->{expand}) {
		646	$exp = $_;
		647	last;
		648	}
		649	push @oth, $_;
		650	}
		651
		652	my ($ow, $oh);
		653
		654	# get sizes of other widgets
		655	for (@oth) {
401	my ($w, $h) = $_->size_request;	656	my ($w, $h) = $_->size_request;
402	$hs += $h;	657	$oh += $h;
403	if ($ws < $w) { $ws = $w }	658	if ($ow < $w) { $ow = $w }
404	}	659	}
405		660
406	return ($ws, $hs);	661	my $y = 0;
407	}
408
409	sub _draw {
410	my ($self) = @_;
411
412	my ($x, $y);
413	for (@{$self->{childs} \|\| []}) {	662	for (@{$self->{children}}) {
414	$_->move (0, $y, 0); #TODO: move to size_request	663	$_->move (0, $y);
415	$_->draw;	664
		665	if ($_ == $exp) {
		666	$_->size_allocate ($w, $h - $oh);
		667	$y += $h - $oh;
		668	} else {
416	my ($w, $h) = $_->size_request;	669	my ($cw, $h) = $_->size_request;
		670	$_->size_allocate ($w, $h);
417	$y += $h;	671	$y += $h;
		672	}
418	}	673	}
419	}	674	}
420		675
		676	#############################################################################
		677
421	package Crossfire::Client::Widget::Label;	678	package CFClient::Widget::Label;
422		679
423	our @ISA = Crossfire::Client::Widget::;	680	our @ISA = CFClient::Widget::;
424		681
425	use SDL::OpenGL;	682	use SDL::OpenGL;
426		683
427	sub new {	684	sub new {
428	my ($class, $x, $y, $z, $height, $text) = @_;	685	my ($class, %arg) = @_;
429		686
430	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	687	# TODO: color, and make height, xyz etc. optional
		688	my $self = $class->SUPER::new (
		689	color => [1, 1, 1],
		690	height => $::FONTSIZE,
		691	text => "",
		692	layout => new CFClient::Layout,
		693	%arg
		694	);
431		695
432	$self->set_text ($text);	696	$self->set_text ($self->{text});
433		697
434	$self	698	$self
435	}	699	}
436		700
437	sub set_text {	701	sub set_text {
438	my ($self, $text) = @_;	702	my ($self, $text) = @_;
439		703
440	$self->{text} = $text;	704	$self->{text} = $text;
441	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};	705	$self->{layout}->set_markup ($text);
442		706
443	$self->update;	707	delete $self->{texture};
444	}	708	}
445		709
446	sub get_text {	710	sub get_text {
447	my ($self, $text) = @_;	711	my ($self, $text) = @_;
448		712
…		…
450	}	714	}
451		715
452	sub size_request {	716	sub size_request {
453	my ($self) = @_;	717	my ($self) = @_;
454		718
455	(	719	$self->{layout}->set_width;
		720	$self->{layout}->set_height ($self->{height});
		721	$self->{layout}->size
		722	# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
		723	# (
456	$self->{texture}{width},	724	# $self->{texture}{width},
457	$self->{texture}{height},	725	# $self->{texture}{height},
458	)	726	# )
		727	# } else {
		728	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
		729	#
		730	# ($w, $h)
		731	# }
		732	}
		733
		734	sub size_allocate {
		735	my ($self, $w, $h) = @_;
		736
		737	$self->SUPER::size_allocate ($w, $h);
		738	delete $self->{texture};
459	}	739	}
460		740
461	sub _draw {	741	sub _draw {
462	my ($self) = @_;	742	my ($self) = @_;
463		743
464	my $tex = $self->{texture};	744	my $tex = $self->{texture} \|\|= do {
		745	$self->{layout}->set_width ($self->{w});
		746	new_from_layout CFClient::Texture $self->{layout};
		747	};
465		748
466	glEnable GL_BLEND;	749	glEnable GL_BLEND;
467	glEnable GL_TEXTURE_2D;	750	glEnable GL_TEXTURE_2D;
468	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	751	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	752	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
470	glBindTexture GL_TEXTURE_2D, $tex->{name};
471		753
472	glColor 1, 1, 1, 0.8;	754	glColor @{$self->{color}};
473		755
474	glBegin GL_QUADS;	756	$tex->draw_quad (0, 0);
475	glTexCoord 0, 0; glVertex 0 , 0;
476	glTexCoord 0, 1; glVertex 0 , $tex->{height};
477	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
478	glTexCoord 1, 0; glVertex $tex->{width}, 0;
479	glEnd;
480		757
481	glDisable GL_BLEND;	758	glDisable GL_BLEND;
482	glDisable GL_TEXTURE_2D;	759	glDisable GL_TEXTURE_2D;
483	}	760	}
484		761
		762	#############################################################################
		763
485	package Crossfire::Client::Widget::TextEntry;	764	package CFClient::Widget::Entry;
486		765
487	our @ISA = Crossfire::Client::Widget::Label::;	766	our @ISA = CFClient::Widget::Label::;
488		767
489	use SDL;	768	use SDL;
490	use SDL::OpenGL;	769	use SDL::OpenGL;
491		770
492	sub key_down {	771	sub key_down {
493	my ($self, $ev) = @_;	772	my ($self, $ev) = @_;
494		773
495	my $mod = $ev->key_mod;	774	my $mod = $ev->key_mod;
496	my $sym = $ev->key_sym;	775	my $sym = $ev->key_sym;
497		776
498	$ev->set_unicode (1);
499	my $uni = $ev->key_unicode;	777	my $uni = $ev->key_unicode;
500		778
501	my $text = $self->get_text;	779	my $text = $self->get_text;
502		780
503	if ($sym == SDLK_BACKSPACE) {	781	if ($sym == SDLK_BACKSPACE) {
504	substr $text, -1, 1, '';	782	substr $text, -1, 1, '';
505
506	} elsif ($uni) {	783	} elsif ($uni) {
507	$text .= chr $uni;	784	$text .= chr $uni;
508	}	785	}
		786
509	$self->set_text ($text);	787	$self->set_text ($text);
510	}	788	}
511		789
		790	sub button_down {
		791	my ($self, $ev) = @_;
512		792
513	# XXX: TextView isn't neccessary with pango multiline text rendering	793	$self->focus_in;
514	package Crossfire::Client::Widget::TextView;	794	}
515		795
516	use strict;	796	sub mouse_motion {
517
518	our @ISA = qw/Crossfire::Client::Widget/;
519
520	use SDL::OpenGL;
521	use SDL::OpenGL::Constants;
522
523	sub new {
524	my ($class, $text, $h) = @_;	797	my ($self, $ev, $x, $y) = @_;
525	my $self = $class->SUPER::new ();	798	printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
526
527	$self->{txt_height} = $h;
528	@{$self->{lines}} = split /\r?\n/, $text;
529
530	for (split /\r?\n/, $text) {
531	$self->add_line ($_);
532	}
533	$self
534	}	799	}
535		800
536	#sub render_lines {	801	sub _draw {
537	# my ($self) = @_;	802	my ($self) = @_;
538	#	803
539	# $self->{txt_lines} = [];	804	if ($FOCUS == $self) {
540	#	805	glColor 1, 1, 1;
541	# for (@{$self->{lines}}) {	806	} else {
542	# push @{$self->{txt_lines}},	807	glColor 0.7, 0.7, 0.7;
543	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
544	# }	808	}
545	#}
546
547	sub add_line {
548	my ($self, $line) = @_;
549	push @{$self->{lines}}, $line;
550
551	push @{$self->{txt_lines}},
552	new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
553	}
554
555	sub size_request {
556	my ($self) = @_;
557
558	my $w = 0;
559	my $h = 0;
560
561	for (@{$self->{txt_lines}}) {
562	if ($w < $_->{width}) { $w = $_->{width} }
563	$h += $_->{height};
564	}
565
566	return ($w, $h);
567	}
568
569	sub draw_line {
570	my ($self, $tex, $y) = @_;
571
572	glBindTexture GL_TEXTURE_2D, $tex->{name};
573
574	glColor 1, 0, 1;
575		809
576	glBegin GL_QUADS;	810	glBegin GL_QUADS;
577	glTexCoord 0, 0; glVertex 0 , $y;	811	glVertex 0 , 0;
578	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};	812	glVertex 0 , $self->{h} - 1;
579	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};	813	glVertex $self->{w} - 1, $self->{h} - 1;
580	glTexCoord 1, 0; glVertex $tex->{width}, $y;	814	glVertex $self->{w} - 1, 0;
581	glEnd;	815	glEnd;
582	}
583		816
584	sub _draw {	817	$self->SUPER::_draw;
585	my ($self) = @_;
586
587	glEnable GL_BLEND;
588	glEnable GL_TEXTURE_2D;
589	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
590
591	my $l = 0;
592	for (@{$self->{txt_lines}}) {
593	$self->draw_line ($_, $l);
594	$l += $_->{height};
595	}
596
597	glDisable GL_BLEND;
598	glDisable GL_TEXTURE_2D;
599	}	818	}
600		819
		820	#############################################################################
		821
601	package Crossfire::Client::Widget::MapWidget;	822	package CFClient::Widget::MapWidget;
602		823
603	use strict;	824	use strict;
604		825
605	use List::Util qw(min max);	826	use List::Util qw(min max);
606		827
607	use SDL;	828	use SDL;
608	use SDL::OpenGL;	829	use SDL::OpenGL;
609	use SDL::OpenGL::Constants;	830	use SDL::OpenGL::Constants;
610		831
611	our @ISA = Crossfire::Client::Widget::;	832	our @ISA = CFClient::Widget::;
		833
		834	sub new {
		835	my $class = shift;
		836
		837	$class->SUPER::new (
		838	z => -1,
		839	list => (glGenLists 1),
		840	@_
		841	)
		842	}
612		843
613	sub key_down {	844	sub key_down {
614	print "MAPKEYDOWN\n";	845	print "MAPKEYDOWN\n";
615	}	846	}
616		847
617	sub key_up {	848	sub key_up {
618	}	849	}
619		850
		851	sub size_request {
		852	(
		853	1 + int $::WIDTH / 32,
		854	1 + int $::HEIGHT / 32,
		855	)
		856	}
		857
		858	sub update {
		859	my ($self) = @_;
		860
		861	$self->{need_update} = 1;
		862	}
		863
620	sub _draw {	864	sub _draw {
621	my ($self) = @_;	865	my ($self) = @_;
622		866
		867	if (delete $self->{need_update}) {
		868	glNewList $self->{list}, GL_COMPILE;
		869
623	my $mx = $::CONN->{mapx};	870	my $mx = $::CONN->{mapx};
624	my $my = $::CONN->{mapy};	871	my $my = $::CONN->{mapy};
625		872
626	my $map = $::CONN->{map};	873	my $map = $::CONN->{map};
627		874
628	my ($xofs, $yofs);	875	my ($xofs, $yofs);
629		876
630	my $sw = 1 + int $::WIDTH / 32;	877	my $sw = 1 + int $::WIDTH / 32;
631	my $sh = 1 + int $::HEIGHT / 32;	878	my $sh = 1 + int $::HEIGHT / 32;
632		879
633	if ($::CONN->{mapw} > $sw) {	880	if ($::CONN->{mapw} > $sw) {
634	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	881	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
635	} else {	882	} else {
636	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	883	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
637	}	884	}
638		885
639	if ($::CONN->{maph} > $sh) {	886	if ($::CONN->{maph} > $sh) {
640	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	887	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
641	} else {	888	} else {
642	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	889	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
643	}	890	}
644		891
645	glEnable GL_TEXTURE_2D;	892	glEnable GL_TEXTURE_2D;
646	glEnable GL_BLEND;	893	glEnable GL_BLEND;
647	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	894	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
648		895
		896	my $sw4 = ($sw + 3) & ~3;
		897	my $darkness = "\x00" x ($sw4 * $sh);
		898
649	for my $x (0 .. $sw - 1) {	899	for my $x (0 .. $sw - 1) {
		900	my $row = $map->[$x + $xofs];
650	for my $y (0 .. $sh - 1) {	901	for my $y (0 .. $sh - 1) {
651		902
652	my $cell = $map->[$x + $xofs][$y + $yofs]	903	my $cell = $row->[$y + $yofs]
653	or next;	904	or next;
654		905
655	my $darkness = $cell->[0] * (1 / 255);	906	my $dark = $cell->[0];
656	if ($darkness < 0) {	907	if ($dark < 0) {
657	glColor 0.3, 0.3, 0.3;	908	substr $darkness, $y * $sw4 + $x, 1, chr 224;
658	} else {	909	} else {
659	glColor $darkness, $darkness, $darkness;	910	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
660	}	911	}
661		912
662	for my $num (grep $_, @$cell[1,2,3]) {	913	for my $num (grep $_, @$cell[1,2,3]) {
663	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	914	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
664		915
665	glBindTexture GL_TEXTURE_2D, $tex->{name};
666
667	my $w = $tex->{width};	916	my $w = $tex->{width};
668	my $h = $tex->{height};	917	my $h = $tex->{height};
669		918
670	my $px = ($x + 1) * 32 - $w;	919	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
671	my $py = ($y + 1) * 32 - $h;
672
673	glBegin GL_QUADS;
674	glTexCoord 0, 0; glVertex $px , $py;
675	glTexCoord 0, 1; glVertex $px , $py + $h;
676	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
677	glTexCoord 1, 0; glVertex $px + $w, $py;
678	glEnd;	920	}
679	}	921	}
680	}	922	}
		923
		924	# if (1) { # higher quality darkness
		925	# $lighting =~ s/(.)/$1$1$1/gs;
		926	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
		927	#
		928	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
		929	#
		930	# $lighting = $pb->get_pixels;
		931	# $lighting =~ s/(.)../$1/gs;
681	}	932	# }
682		933
		934	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		935	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		936
		937	$darkness = new CFClient::Texture
		938	width => $sw4,
		939	height => $sh,
		940	data => $darkness,
		941	internalformat => GL_ALPHA,
		942	format => GL_ALPHA;
		943
		944	glColor 0.45, 0.45, 0.45, 1;
		945	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
		946
683	glDisable GL_TEXTURE_2D;	947	glDisable GL_TEXTURE_2D;
684	glDisable GL_BLEND;	948	glDisable GL_BLEND;
		949
		950	glEndList;
		951	}
		952
		953	glCallList $self->{list};
685	}	954	}
686		955
687	my %DIR = (	956	my %DIR = (
688	SDLK_KP8, [1, "north"],	957	SDLK_KP8, [1, "north"],
689	SDLK_KP9, [2, "northeast"],	958	SDLK_KP9, [2, "northeast"],
…		…
733	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1002	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
734	$::CONN->send ("command run_stop");	1003	$::CONN->send ("command run_stop");
735	}	1004	}
736	}	1005	}
737		1006
738	1;	1007	#############################################################################
739		1008
		1009	package CFClient::Widget::Animator;
		1010
		1011	use SDL::OpenGL;
		1012
		1013	our @ISA = CFClient::Widget::Bin::;
		1014
		1015	sub moveto {
		1016	my ($self, $x, $y) = @_;
		1017
		1018	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
		1019	$self->{speed} = 0.001;
		1020	$self->{time} = 1;
		1021
		1022	::animation_start $self;
		1023	}
		1024
		1025	sub animate {
		1026	my ($self, $interval) = @_;
		1027
		1028	$self->{time} -= $interval * $self->{speed};
		1029	if ($self->{time} <= 0) {
		1030	$self->{time} = 0;
		1031	::animation_stop $self;
		1032	}
		1033
		1034	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
		1035
		1036	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
		1037	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
		1038	}
		1039
		1040	sub _draw {
		1041	my ($self) = @_;
		1042
		1043	glPushMatrix;
		1044	glRotate $self->{time} * 1000, 0, 1, 0;
		1045	$self->{children}[0]->draw;
		1046	glPopMatrix;
		1047	}
		1048
		1049	#############################################################################
		1050
		1051	package CFClient::Widget::Toplevel;
		1052
		1053	our @ISA = CFClient::Widget::Container::;
		1054
		1055	sub size_request {
		1056	($::WIDTH, $::HEIGHT)
		1057	}
		1058
		1059	sub size_allocate {
		1060	my ($self, $w, $h) = @_;
		1061
		1062	$self->SUPER::size_allocate ($w, $h);
		1063
		1064	$_->size_allocate ($_->size_request)
		1065	for @{$self->{children}};
		1066	}
		1067
		1068	sub translate {
		1069	my ($self, $x, $y) = @_;
		1070
		1071	($x, $y)
		1072	}
		1073
		1074	sub update {
		1075	my ($self) = @_;
		1076
		1077	$self->size_allocate ($self->size_request);
		1078	::refresh ();
		1079	}
		1080
		1081	sub add {
		1082	my ($self, $widget) = @_;
		1083
		1084	$self->SUPER::add ($widget);
		1085
		1086	$widget->size_allocate ($widget->size_request);
		1087	}
		1088
		1089	sub draw {
		1090	my ($self) = @_;
		1091
		1092	$self->_draw;
		1093	}
		1094
		1095	#############################################################################
		1096
		1097	package CFClient::Widget;
		1098
		1099	$TOPLEVEL = new CFClient::Widget::Toplevel;
		1100
		1101	1
		1102

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs. Revision 1.66 by root, Tue Apr 11 14:36:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.32 by elmex, Sun Apr 9 01:21:11 2006 UTC vs.
Revision 1.66 by root, Tue Apr 11 14:36:02 2006 UTC