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

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.67 by root, Tue Apr 11 14:36:59 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.67 by root, Tue Apr 11 14:36:59 2006 UTC