ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.53 by root, Mon Apr 10 11:56:28 2006 UTC vs.
Revision 1.116 by root, Sat Apr 15 21:16:50 2006 UTC

1	package Crossfire::Client::Widget;	1	package CFClient::UI;
2		2
3	use strict;	3	use strict;
4		4
5	use Scalar::Util;	5	use Scalar::Util ();
		6	use List::Util ();
6		7
7	use SDL::OpenGL;	8	use CFClient;
8	use SDL::OpenGL::Constants;
9
10	use Crossfire::Client;
11		9
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		11
14	our $TOPLEVEL;	12	our $ROOT;
15	our $BUTTON_STATE;	13	our $BUTTON_STATE;
16		14
17	# class methods for events	15	# class methods for events
18	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
19	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
26	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
27	my ($ev) = @_;	25	my ($ev) = @_;
28	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29		27
30	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
31	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
32		30
33	$GRAB = $widget;	31	$GRAB = $widget;
34	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
35	}	33	}
36		34
37	$BUTTON_STATE |= 1 << ($ev->button - 1);	35	$BUTTON_STATE |= 1 << ($ev->button - 1);
38		36
39	$GRAB->button_down ($ev) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
40	}	38	}
41		39
42	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
43	my ($ev) = @_;	41	my ($ev) = @_;
44	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45		43
46	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47		45
48	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
		47
		48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER;	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71	}	71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for (@$vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
		84	}
		85
		86	#############################################################################
		87
		88	package CFClient::UI::Base;
		89
		90	use strict;
		91
		92	use SDL::OpenGL;
72		93
73	sub new {	94	sub new {
74	my $class = shift;	95	my $class = shift;
75		96
76	bless { @_ }, $class	97	my $self = bless {
		98	x => 0,
		99	y => 0,
		100	z => 0,
		101	w => -1,
		102	h => -1,
		103	@_
		104	}, $class;
		105
		106	for (keys %$self) {
		107	if (/^connect_(.*)$/) {
		108	$self->connect ($1 => delete $self->{$_});
		109	}
		110	}
		111
		112	$self
77	}	113	}
78		114
79	sub move {	115	sub move {
80	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
81	$self->{x} = $x;	117	$self->{x} = $x;
…		…
90	sub size_request {	126	sub size_request {
91	require Carp;	127	require Carp;
92	Carp::confess "size_request is abtract";	128	Carp::confess "size_request is abtract";
93	}	129	}
94		130
95	sub size_allocate {	131	sub _size_allocate {
96	my ($self, $w, $h) = @_;	132	my ($self, $x, $y, $w, $h) = @_;
		133
		134	$self->{x} = $x;
		135	$self->{y} = $y;
		136
		137	return unless $self->{w} != $w || $self->{h} != $h;
97		138
98	$self->{w} = $w;	139	$self->{w} = $w;
99	$self->{h} = $h;	140	$self->{h} = $h;
		141
		142	1
		143	}
		144
		145	sub size_allocate {
		146	my ($self, $x, $y, $w, $h) = @_;
		147
		148	$self->_size_allocate ($x, $y, $w, $h);
		149	}
		150
		151	# return top left coordinates
		152	sub _topleft {
		153	my ($self, $x, $y) = @_;
		154
		155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
		158	# translate global coordinates to local coordinate system
		159	sub coord2local {
		160	my ($self, $x, $y) = @_;
		161
		162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
100	}	172	}
101		173
102	sub focus_in {	174	sub focus_in {
103	my ($self) = @_;	175	my ($self) = @_;
		176
		177	return if $FOCUS == $self;
		178	return unless $self->{can_focus};
104		179
105	my $focus = $FOCUS; $FOCUS = $self;	180	my $focus = $FOCUS; $FOCUS = $self;
106	$focus->update if $focus;	181	$focus->update if $focus;
107	$FOCUS->update;	182	$FOCUS->update;
108	}	183	}
…		…
116	$focus->update if $focus; #?	191	$focus->update if $focus; #?
117	}	192	}
118		193
119	sub mouse_motion { }	194	sub mouse_motion { }
120	sub button_up { }	195	sub button_up { }
121	sub button_down { }
122	sub key_down { }	196	sub key_down { }
123	sub key_up { }	197	sub key_up { }
		198
		199	sub button_down {
		200	my ($self, $ev, $x, $y) = @_;
		201
		202	$self->focus_in;
		203	}
124		204
125	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	205	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	206	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	207	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	208	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	209	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130		210
131	sub draw {	211	sub draw {
132	my ($self) = @_;	212	my ($self) = @_;
133		213
		214	return unless $self->{h} && $self->{w};
		215
134	glPushMatrix;	216	glPushMatrix;
135	glTranslate $self->{x}, $self->{y}, 0;	217	glTranslate $self->{x}, $self->{y}, 0;
136	$self->_draw;	218	$self->_draw;
137	if ($self == $HOVER) {	219	glPopMatrix;
138	glColor 1, 1, 1, 0.4;	220
		221	if ($self == $HOVER && $self->{can_hover}) {
		222	my ($x, $y) = @$self{qw(x y)};
		223
		224	glColor 0, 0, 1, 0.2;
139	glEnable GL_BLEND;	225	glEnable GL_BLEND;
		226	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140	glBegin GL_QUADS;	227	glBegin GL_QUADS;
141	glVertex 0 , 0;	228	glVertex $x , $y;
142	glVertex $self->{w}, 0;	229	glVertex $x + $self->{w}, $y;
143	glVertex $self->{w}, $self->{h};	230	glVertex $x + $self->{w}, $y + $self->{h};
144	glVertex 0 , $self->{h};	231	glVertex $x , $y + $self->{h};
145	glEnd;	232	glEnd;
146	glDisable GL_BLEND;	233	glDisable GL_BLEND;
147	}	234	}
148	glPopMatrix;
149	}	235	}
150		236
151	sub _draw {	237	sub _draw {
152	my ($self) = @_;	238	my ($self) = @_;
153		239
154	warn "no draw defined for $self\n";	240	warn "no draw defined for $self\n";
155	}
156
157	sub bbox {
158	my ($self) = @_;
159	my ($w, $h) = $self->size_request;
160	(
161	$self->{x},
162	$self->{y},
163	$self->{x} = $w,
164	$self->{y} = $h
165	)
166	}	241	}
167		242
168	sub find_widget {	243	sub find_widget {
169	my ($self, $x, $y) = @_;	244	my ($self, $x, $y) = @_;
170		245
…		…
173	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	248	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
174		249
175	()	250	()
176	}	251	}
177		252
178	sub del_parent { $_[0]->{parent} = undef }
179
180	sub set_parent {	253	sub set_parent {
181	my ($self, $par) = @_;	254	my ($self, $parent) = @_;
182		255
183	$self->{parent} = $par;
184	Scalar::Util::weaken $self->{parent};	256	Scalar::Util::weaken ($self->{parent} = $parent);
185	}
186
187	sub get_parent {
188	$_[0]->{parent}
189	}	257	}
190		258
191	sub update {	259	sub update {
192	my ($self) = @_;	260	my ($self) = @_;
193		261
194	$self->{parent}->update	262	$self->{parent}->update
195	if $self->{parent};	263	if $self->{parent};
196	}	264	}
197		265
		266	sub connect {
		267	my ($self, $signal, $cb) = @_;
		268
		269	push @{ $self->{cb}{$signal} }, $cb;
		270	}
		271
		272	sub emit {
		273	my ($self, $signal, @args) = @_;
		274
		275	$_->($self, @args)
		276	for @{$self->{cb}{$signal} || []};
		277	}
		278
198	sub DESTROY {	279	sub DESTROY {
199	my ($self) = @_;	280	my ($self) = @_;
200		281
201	#$self->deactivate;	282	#$self->deactivate;
202	}	283	}
203		284
204	#############################################################################	285	#############################################################################
205		286
206	package Crossfire::Client::Widget::Container;	287	package CFClient::UI::DrawBG;
207		288
208	our @ISA = Crossfire::Client::Widget::;	289	our @ISA = CFClient::UI::Base::;
		290
		291	use strict;
		292	use SDL::OpenGL;
209		293
210	sub new {	294	sub new {
		295	my $class = shift;
		296
		297	# range [value, low, high, page]
		298
		299	$class->SUPER::new (
		300	bg => [0, 0, 0, 0.2],
		301	active_bg => [1, 1, 1, 0.5],
		302	@_
		303	)
		304	}
		305
		306	sub _draw {
		307	my ($self) = @_;
		308
		309	my ($w, $h) = @$self{qw(w h)};
		310
		311	glEnable GL_BLEND;
		312	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		313	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		314
		315	glBegin GL_QUADS;
		316	glVertex 0 , 0;
		317	glVertex 0 , $h;
		318	glVertex $w, $h;
		319	glVertex $w, 0;
		320	glEnd;
		321
		322	glDisable GL_BLEND;
		323	}
		324
		325	#############################################################################
		326
		327	package CFClient::UI::Empty;
		328
		329	our @ISA = CFClient::UI::Base::;
		330
		331	sub size_request {
		332	(0, 0)
		333	}
		334
		335	sub draw { }
		336
		337	#############################################################################
		338
		339	package CFClient::UI::Container;
		340
		341	our @ISA = CFClient::UI::Base::;
		342
		343	sub new {
211	my ($class, @widgets) = @_;	344	my ($class, %arg) = @_;
212		345
		346	my $children = delete $arg{children} || [];
		347
213	my $self = $class->SUPER::new (children => []);	348	my $self = $class->SUPER::new (children => [], %arg);
214	$self->add ($_) for @widgets;	349	$self->add ($_) for @$children;
215		350
216	$self	351	$self
217	}	352	}
218		353
219	sub add {	354	sub add {
220	my ($self, $chld, $expand) = @_;	355	my ($self, $child) = @_;
221		356
222	$chld->{expand} = $expand;
223	$chld->set_parent ($self);	357	$child->set_parent ($self);
224		358
		359	use sort 'stable';
		360
225	@{$self->{children}} =	361	$self->{children} = [
226	sort { $a->{z} <=> $b->{z} }	362	sort { $a->{z} <=> $b->{z} }
227	@{$self->{children}}, $chld;	363	@{$self->{children}}, $child
		364	];
228		365
229	$self->size_allocate ($self->{w}, $self->{h})	366	$self->{w} = $self->{h} = -1;
230	if $self->{w}; #TODO: check for "realised state"	367	$self->update;
231	}	368	}
232		369
233	sub remove {	370	sub remove {
234	my ($self, $widget) = @_;	371	my ($self, $widget) = @_;
235		372
236	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	373	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237		374
238	$self->size_allocate ($self->{w}, $self->{h});	375	$self->size_allocate (0, 0, $self->{w}, $self->{h});
239	}	376	}
240		377
241	sub find_widget {	378	sub find_widget {
242	my ($self, $x, $y) = @_;	379	my ($self, $x, $y) = @_;
243		380
…		…
260	$_->draw for @{$self->{children}};	397	$_->draw for @{$self->{children}};
261	}	398	}
262		399
263	#############################################################################	400	#############################################################################
264		401
265	package Crossfire::Client::Widget::Bin;	402	package CFClient::UI::Bin;
266		403
267	our @ISA = Crossfire::Client::Widget::Container::;	404	our @ISA = CFClient::UI::Container::;
		405
		406	sub new {
		407	my ($class, %arg) = @_;
		408
		409	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
		410
		411	$class->SUPER::new (children => [$child], %arg)
		412	}
		413
		414	sub add {
		415	my ($self, $widget) = @_;
		416
		417	$self->{children} = [];
		418
		419	$self->SUPER::add ($widget);
		420	}
		421
		422	sub remove {
		423	my ($self, $widget) = @_;
		424
		425	$self->SUPER::remove ($widget);
		426
		427	$self->{children} = [new CFClient::UI::Empty]
		428	unless @{$self->{children}};
		429	}
268		430
269	sub child { $_[0]->{children}[0] }	431	sub child { $_[0]->{children}[0] }
270		432
271	sub size_request {	433	sub size_request {
272	$_[0]{children}[0]->size_request if $_[0]{children}[0];	434	$_[0]{children}[0]->size_request
273	}	435	}
274		436
275	sub size_allocate {	437	sub size_allocate {
276	my ($self, $w, $h) = @_;	438	my ($self, $x, $y, $w, $h) = @_;
277		439
278	$self->SUPER::size_allocate ($w, $h);	440	$self->_size_allocate ($x, $y, $w, $h) or return;
		441
279	$self->{children}[0]->size_allocate ($w, $h)	442	$self->{children}[0]->size_allocate (0, 0, $w, $h);
280	if $self->{children}[0]
281	}	443	}
282		444
283	#############################################################################	445	#############################################################################
284		446
285	package Crossfire::Client::Widget::Window;	447	package CFClient::UI::Window;
286		448
287	our @ISA = Crossfire::Client::Widget::Bin::;	449	our @ISA = CFClient::UI::Bin::;
288		450
289	use SDL::OpenGL;	451	use SDL::OpenGL;
290		452
291	sub new {	453	sub new {
292	my ($class, $x, $y, $z, $w, $h) = @_;	454	my ($class, %arg) = @_;
293		455
294	my $self = $class->SUPER::new;	456	my $self = $class->SUPER::new (%arg);
295
296	@$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297	}	457	}
298		458
299	sub update {	459	sub update {
300	my ($self) = @_;	460	my ($self) = @_;
301		461
		462	# we want to do this delayed...
302	$self->render_chld;	463	$self->render_chld;
303	$self->SUPER::update;	464	$self->SUPER::update;
304	}	465	}
305		466
306	sub render_chld {	467	sub render_chld {
307	my ($self) = @_;	468	my ($self) = @_;
308		469
309	$self->{texture} =	470	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
310	Crossfire::Client::Texture->new_from_opengl (	471	glClearColor 0, 0, 0, 1;
311	$self->{w}, $self->{h}, sub { $self->child->draw }	472	glClear GL_COLOR_BUFFER_BIT;
312	);	473	$self->child->draw;
		474	};
313	}	475	}
314		476
315	sub size_allocate {	477	sub size_allocate {
316	my ($self, $w, $h) = @_;	478	my ($self, $x, $y, $w, $h) = @_;
317		479
318	$self->{w} = $w;	480	$self->_size_allocate ($x, $y, $w, $h) or return;
319	$self->{h} = $h;
320		481
321	$self->child->size_allocate ($w, $h);	482	$self->child->size_allocate (0, 0, $w, $h);
322		483
323	$self->render_chld;	484	$self->render_chld;
324	}	485	}
325		486
326	sub _draw {	487	sub _draw {
…		…
330		491
331	my $tex = $self->{texture}	492	my $tex = $self->{texture}
332	or return;	493	or return;
333		494
334	glEnable GL_BLEND;	495	glEnable GL_BLEND;
		496	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335	glEnable GL_TEXTURE_2D;	497	glEnable GL_TEXTURE_2D;
336	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	498	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337	glBindTexture GL_TEXTURE_2D, $tex->{name};
338		499
339	glBegin GL_QUADS;	500	$tex->draw_quad (0, 0, $w, $h);
340	glTexCoord 0, 0; glVertex 0, 0;
341	glTexCoord 0, 1; glVertex 0, $h;
342	glTexCoord 1, 1; glVertex $w, $h;
343	glTexCoord 1, 0; glVertex $w, 0;
344	glEnd;
345		501
346	glDisable GL_BLEND;	502	glDisable GL_BLEND;
347	glDisable GL_TEXTURE_2D;	503	glDisable GL_TEXTURE_2D;
348	}	504	}
349		505
350	#############################################################################	506	#############################################################################
351		507
352	package Crossfire::Client::Widget::Frame;	508	package CFClient::UI::Frame;
353		509
354	our @ISA = Crossfire::Client::Widget::Bin::;	510	our @ISA = CFClient::UI::Bin::;
355		511
356	use SDL::OpenGL;	512	use SDL::OpenGL;
357		513
358	sub size_request {	514	sub size_request {
359	my ($self) = @_;	515	my ($self) = @_;
…		…
364		520
365	map { $_ + 4 } $chld->size_request;	521	map { $_ + 4 } $chld->size_request;
366	}	522	}
367		523
368	sub size_allocate {	524	sub size_allocate {
369	my ($self, $w, $h) = @_;	525	my ($self, $x, $y, $w, $h) = @_;
370		526
371	$self->{w} = $w;	527	$self->_size_allocate ($x, $y, $w, $h) or return;
372	$self->{h} = $h;
373		528
374	$self->child->size_allocate ($w - 4, $h - 4);	529	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
375	$self->child->move (2, 2);
376	}	530	}
377		531
378	sub _draw {	532	sub _draw {
379	my ($self) = @_;	533	my ($self) = @_;
380		534
…		…
382		536
383	my ($w, $h) = $chld->size_request;	537	my ($w, $h) = $chld->size_request;
384		538
385	glBegin GL_QUADS;	539	glBegin GL_QUADS;
386	glColor 0, 0, 0;	540	glColor 0, 0, 0;
387	glTexCoord 0, 0; glVertex 0 , 0;	541	glVertex 0 , 0;
388	glTexCoord 0, 1; glVertex 0 , $h + 4;	542	glVertex 0 , $h + 4;
389	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	543	glVertex $w + 4 , $h + 4;
390	glTexCoord 1, 0; glVertex $w + 4 , 0;	544	glVertex $w + 4 , 0;
391	glEnd;	545	glEnd;
392		546
393	$chld->draw;	547	$chld->draw;
394	}	548	}
395		549
396	#############################################################################	550	#############################################################################
397		551
398	package Crossfire::Client::Widget::FancyFrame;	552	package CFClient::UI::FancyFrame;
399		553
400	our @ISA = Crossfire::Client::Widget::Bin::;	554	our @ISA = CFClient::UI::Bin::;
401		555
402	use SDL::OpenGL;	556	use SDL::OpenGL;
403		557
404	my @tex =	558	my @tex =
405	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }	559	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
406	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	560	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
407		561
		562	sub new {
		563	my $class = shift;
		564
		565	# TODO: user_x, user_y, overwrite moveto?
		566
		567	$class->SUPER::new (
		568	bg => [1, 1, 1, 1],
		569	border_bg => [1, 1, 1, 1],
		570	border => $::FONTSIZE * 0.8,
		571	@_
		572	)
		573	}
		574
408	sub size_request {	575	sub size_request {
409	my ($self) = @_;	576	my ($self) = @_;
410		577
		578	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		579
411	my ($w, $h) = $self->SUPER::size_request;	580	my ($w, $h) = $self->SUPER::size_request;
412		581
413	$h += $tex[1]->{height};	582	(
414	$h += $tex[4]->{height};	583	$w + $self->{border} * 2,
415	$w += $tex[2]->{width};	584	$h + $self->{border} * 2,
416	$w += $tex[3]->{width};	585	)
417
418	($w, $h)
419	}	586	}
420		587
421	sub size_allocate {	588	sub size_allocate {
422	my ($self, $w, $h) = @_;	589	my ($self, $x, $y, $w, $h) = @_;
423		590
424	$self->SUPER::size_allocate ($w, $h);	591	$self->_size_allocate ($x, $y, $w, $h) or return;
425		592
426	$h -= $tex[1]->{height};	593	$h -= List::Util::max 0, $self->{border} * 2;
427	$h -= $tex[4]->{height};	594	$w -= List::Util::max 0, $self->{border} * 2;
428	$w -= $tex[2]->{width};
429	$w -= $tex[3]->{width};
430		595
431	$h = $h < 0 ? 0 : $h;	596	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
432	$w = $w < 0 ? 0 : $w;	597	}
433		598
434	$self->child->size_allocate ($w, $h);	599	sub button_down {
435	$self->child->move ($tex[3]->{width}, $tex[1]->{height});	600	my ($self, $ev, $x, $y) = @_;
		601
		602	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
		603	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
		604
		605	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		606	my ($bw, $bh) = ($self->{w}, $self->{h});
		607
		608	$self->{motion} = sub {
		609	my ($ev, $x, $y) = @_;
		610
		611	($x, $y) = ($ev->motion_x, $ev->motion_y);
		612
		613	$self->{user_w} = $bw + $x - $ox;
		614	$self->{user_h} = $bh + $y - $oy;
		615	$self->update;
		616	};
		617
		618	} elsif ($x >= 0 && $x < $self->{w}
		619	&& $y >= 0 && $y < $self->{border}) {
		620
		621	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		622	my ($bx, $by) = ($self->{x}, $self->{y});
		623
		624	$self->{motion} = sub {
		625	my ($ev, $x, $y) = @_;
		626
		627	($x, $y) = ($ev->motion_x, $ev->motion_y);
		628
		629	$self->move ($bx + $x - $ox, $by + $y - $oy);
		630	$self->update;
		631	};
		632	}
		633	}
		634
		635	sub button_up {
		636	my ($self, $ev, $x, $y) = @_;
		637
		638	delete $self->{motion};
		639	}
		640
		641	sub mouse_motion {
		642	my ($self, $ev, $x, $y) = @_;
		643
		644	$self->{motion}->($ev, $x, $y) if $self->{motion};
436	}	645	}
437		646
438	sub _draw {	647	sub _draw {
439	my ($self) = @_;	648	my ($self) = @_;
440		649
441	my ($w, $h) = ($self->{w}, $self->{h});	650	my ($w, $h ) = ($self->{w}, $self->{h});
442	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	651	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
443		652
444	glEnable GL_BLEND;	653	glEnable GL_BLEND;
		654	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
445	glEnable GL_TEXTURE_2D;	655	glEnable GL_TEXTURE_2D;
446	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
447	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	656	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
448		657
449	my $top = $tex[1];	658	glColor @{ $self->{border_bg} };
450	glBindTexture GL_TEXTURE_2D, $top->{name};	659	$tex[1]->draw_quad (0, 0, $w, $self->{border});
451		660	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
452	glBegin GL_QUADS;	661	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
453	glTexCoord 0, 0; glVertex 0 , 0;	662	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
454	glTexCoord 0, 1; glVertex 0 , $top->{height};
455	glTexCoord 1, 1; glVertex $w , $top->{height};
456	glTexCoord 1, 0; glVertex $w , 0;
457	glEnd;
458
459	my $left = $tex[3];
460	glBindTexture GL_TEXTURE_2D, $left->{name};
461
462	glBegin GL_QUADS;
463	glTexCoord 0, 0; glVertex 0 , $top->{height};
464	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
465	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
466	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
467	glEnd;
468
469	my $right = $tex[2];
470	glBindTexture GL_TEXTURE_2D, $right->{name};
471
472	glBegin GL_QUADS;
473	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
474	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
475	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
476	glTexCoord 1, 0; glVertex $w , $top->{height};
477	glEnd;
478
479	my $bottom = $tex[4];
480	glBindTexture GL_TEXTURE_2D, $bottom->{name};
481
482	glBegin GL_QUADS;
483	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
484	glTexCoord 0, 1; glVertex 0 , $h;
485	glTexCoord 1, 1; glVertex $w , $h;
486	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
487	glEnd;
488		663
489	my $bg = $tex[0];	664	my $bg = $tex[0];
490	glBindTexture GL_TEXTURE_2D, $bg->{name};
491	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
492	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
493	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
494		665
		666	# TODO: repeat texture not scale
495	my $rep_x = $cw / $bg->{width};	667	my $rep_x = $cw / $bg->{w};
496	my $rep_y = $ch / $bg->{height};	668	my $rep_y = $ch / $bg->{h};
497		669
498	glBegin GL_QUADS;	670	glColor @{ $self->{bg} };
499	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
500	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
501	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
502	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
503	glEnd;
504		671
		672	$bg->{s} = $rep_x;
		673	$bg->{t} = $rep_y;
		674	$bg->{wrap_mode} = 1;
		675	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
		676
		677	glDisable GL_TEXTURE_2D;
505	glDisable GL_BLEND;	678	glDisable GL_BLEND;
506	glDisable GL_TEXTURE_2D;
507		679
508	$self->child->draw;	680	$self->child->draw;
509
510	}	681	}
511		682
512	#############################################################################	683	#############################################################################
513		684
514	package Crossfire::Client::Widget::Table;	685	package CFClient::UI::Table;
515		686
516	our @ISA = Crossfire::Client::Widget::Bin::;	687	our @ISA = CFClient::UI::Base::;
		688
		689	use List::Util qw(max sum);
517		690
518	use SDL::OpenGL;	691	use SDL::OpenGL;
519		692
		693	sub new {
		694	my $class = shift;
		695
		696	$class->SUPER::new (
		697	col_expand => [],
		698	@_
		699	)
		700	}
		701
520	sub add {	702	sub add {
521	my ($self, $x, $y, $chld) = @_;	703	my ($self, $x, $y, $child) = @_;
522	my $old_chld = $self->{children}[$y][$x];
523		704
		705	$child->set_parent ($self);
524	$self->{children}[$y][$x] = $chld;	706	$self->{children}[$y][$x] = $child;
525	$chld->set_parent ($self);	707
		708	$self->{w} = $self->{h} = -1;
526	$self->update;	709	$self->update;
527	}	710	}
528		711
529	sub max_row_height {	712	# TODO: move to container class maybe? send childs a signal on removal?
		713	sub clear {
530	my ($self, $row) = @_;	714	my ($self) = @_;
531		715
532	my $hs = 0;	716	delete $self->{children};
533	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {	717	$self->update;
		718	}
		719
		720	sub get_wh {
		721	my ($self) = @_;
		722
		723	my (@w, @h);
		724
		725	for my $y (0 .. $#{$self->{children}}) {
534	my $c = $self->{children}->[$row]->[$xi];	726	my $row = $self->{children}[$y]
535	if ($c) {	727	or next;
		728
		729	for my $x (0 .. $#$row) {
		730	my $widget = $row->[$x]
		731	or next;
536	my ($w, $h) = $c->size_request;	732	my ($w, $h) = $widget->size_request;
537	if ($hs < $h) { $hs = $h }	733
		734	$w[$x] = max $w[$x], $w;
		735	$h[$y] = max $h[$y], $h;
538	}	736	}
539	}	737	}
540	return $hs;
541	}
542		738
543	sub max_col_width {	739	(\@w, \@h)
		740	}
		741
		742	sub size_request {
544	my ($self, $col) = @_;	743	my ($self) = @_;
545		744
		745	my ($ws, $hs) = $self->get_wh;
		746
		747	(
		748	(sum @$ws),
		749	(sum @$hs),
		750	)
		751	}
		752
		753	sub size_allocate {
		754	my ($self, $x, $y, $w, $h) = @_;
		755
		756	$self->_size_allocate ($x, $y, $w, $h) or return;
		757
		758	my ($ws, $hs) = $self->get_wh;
		759
		760	my $req_w = sum @$ws;
		761	my $req_h = sum @$hs;
		762
		763	# TODO: nicer code && do row_expand
		764	my @col_expand = @{$self->{col_expand}};
		765	@col_expand = (1) x @$ws unless @col_expand;
		766	my $col_expand = (sum @col_expand) || 1;
		767
		768	# linearly scale sizes
		769	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
		770	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		771
		772	CFClient::UI::harmonize $ws;
		773	CFClient::UI::harmonize $hs;
		774
		775	my $y;
		776
		777	for my $r (0 .. $#{$self->{children}}) {
		778	my $row = $self->{children}[$r]
		779	or next;
		780
546	my $ws = 0;	781	my $x = 0;
547	for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {	782	my $row_h = $hs->[$r];
548	my $c = ($self->{children}->[$yi] || [])->[$col];	783
549	if ($c) {	784	for my $c (0 .. $#$row) {
550	my ($w, $h) = $c->size_request;	785	my $col_w = $ws->[$c];
551	if ($ws < $w) { $ws = $w }	786
		787	if (my $widget = $row->[$c]) {
		788	$widget->size_allocate ($x, $y, $col_w, $row_h);
		789	}
		790
		791	$x += $col_w;
552	}	792	}
		793
		794	$y += $row_h;
553	}	795	}
554	return $ws;	796
555	}	797	}
		798
		799	sub find_widget {
		800	my ($self, $x, $y) = @_;
		801
		802	$x -= $self->{x};
		803	$y -= $self->{y};
		804
		805	my $res;
		806
		807	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
		808	$res = $_->find_widget ($x, $y)
		809	and return $res;
		810	}
		811
		812	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		813	}
		814
		815	sub _draw {
		816	my ($self) = @_;
		817
		818	for (grep $_, @{$self->{children}}) {
		819	$_->draw for grep $_, @$_;
		820	}
		821	}
		822
		823	#############################################################################
		824
		825	package CFClient::UI::HBox;
		826
		827	# TODO: wrap into common Box base class
		828
		829	our @ISA = CFClient::UI::Container::;
556		830
557	sub size_request {	831	sub size_request {
558	my ($self) = @_;	832	my ($self) = @_;
559		833
		834	my @alloc = map [$_->size_request], @{$self->{children}};
		835
		836	(
		837	(List::Util::sum map $_->[0], @alloc),
		838	(List::Util::max map $_->[1], @alloc),
		839	)
		840	}
		841
		842	sub size_allocate {
		843	my ($self, $x, $y, $w, $h) = @_;
		844
		845	$self->_size_allocate ($x, $y, $w, $h);
		846
560	my ($hs, $ws) = (0, 0);	847	($h, $w) = ($w, $h);
561		848
562	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	849	my $children = $self->{children};
563	$hs += $self->max_row_height ($yi);
564	}
565		850
566	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	851	my @h = map +($_->size_request)[0], @$children;
567	my $wm = 0;	852
568	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {	853	my $req_h = List::Util::sum @h;
569	$wm += $self->max_col_width ($xi)	854
		855	if ($req_h > $h) {
		856	# ah well, not enough space
		857	$_ *= $h / $req_h for @h;
		858	} else {
		859	my $exp = List::Util::sum map $_->{expand}, @$children;
		860	$exp ||= 1;
		861
		862	for (0 .. $#$children) {
		863	my $child = $children->[$_];
		864
		865	my $alloc_h = $h[$_];
		866	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
		867	$h[$_] = $alloc_h;
570	}	868	}
571	if ($ws < $wm) { $ws = $wm }
572	}	869	}
573		870
574	return ($ws, $hs);	871	CFClient::UI::harmonize \@h;
575	}
576
577	sub _draw {
578	my ($self) = @_;
579		872
580	my $y = 0;	873	my $y = 0;
581	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {	874	for (0 .. $#$children) {
		875	my $child = $children->[$_];
582	my $x = 0;	876	my $h = $h[$_];
		877	$child->size_allocate ($y, 0, $h, $w);
583		878
584	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {	879	$y += $h;
585
586	my $c = $self->{children}->[$yi]->[$xi];
587	if ($c) {
588	$c->move ($x, $y, 0); #TODO: Move to size_request
589	$c->draw if $c;
590	}
591
592	$x += $self->max_col_width ($xi);
593	}
594
595	$y += $self->max_row_height ($yi);
596	}	880	}
597	}	881	}
598		882
599	#############################################################################	883	#############################################################################
600		884
601	package Crossfire::Client::Widget::VBox;	885	package CFClient::UI::VBox;
602		886
		887	# TODO: wrap into common Box base class
		888
603	our @ISA = Crossfire::Client::Widget::Container::;	889	our @ISA = CFClient::UI::Container::;
604
605	use SDL::OpenGL;
606		890
607	sub size_request {	891	sub size_request {
608	my ($self) = @_;	892	my ($self) = @_;
609		893
610	my @alloc = map [$_->size_request], @{$self->{children}};	894	my @alloc = map [$_->size_request], @{$self->{children}};
…		…
614	(List::Util::sum map $_->[1], @alloc),	898	(List::Util::sum map $_->[1], @alloc),
615	)	899	)
616	}	900	}
617		901
618	sub size_allocate {	902	sub size_allocate {
619	my ($self, $w, $h) = @_;	903	my ($self, $x, $y, $w, $h) = @_;
620		904
621	$self->w ($w);	905	$self->_size_allocate ($x, $y, $w, $h);
622	$self->h ($h);
623		906
624	my $exp;	907	my $children = $self->{children};
625	my @oth;	908
626	# find expand widget	909	my @h = map +($_->size_request)[1], @$children;
627	for (@{$self->{children}}) {	910
628	if ($_->{expand}) {	911	my $req_h = List::Util::sum @h;
		912
		913	if ($req_h > $h) {
		914	# ah well, not enough space
		915	$_ *= $h / $req_h for @h;
		916	} else {
		917	my $exp = List::Util::sum map $_->{expand}, @$children;
629	$exp = $_;	918	$exp ||= 1;
630	last;	919
		920	for (0 .. $#$children) {
		921	my $child = $children->[$_];
		922
		923	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
631	}	924	}
632	push @oth, $_;
633	}	925	}
634		926
635	my ($ow, $oh);	927	CFClient::UI::harmonize \@h;
636
637	# get sizes of other widgets
638	for (@oth) {
639	my ($w, $h) = $_->size_request;
640	$oh += $h;
641	if ($ow < $w) { $ow = $w }
642	}
643		928
644	my $y = 0;	929	my $y = 0;
645	for (@{$self->{children}}) {	930	for (0 .. $#$children) {
646	$_->move (0, $y);	931	my $child = $children->[$_];
647		932	my $h = $h[$_];
648	if ($_ == $exp) {
649	$_->size_allocate ($w, $h - $oh);
650	$y += $h - $oh;
651	} else {
652	my ($cw, $h) = $_->size_request;
653	$_->size_allocate ($w, $h);	933	$child->size_allocate (0, $y, $w, $h);
		934
654	$y += $h;	935	$y += $h;
655	}
656	}	936	}
657	}	937	}
658		938
659	#############################################################################	939	#############################################################################
660		940
661	package Crossfire::Client::Widget::Label;	941	package CFClient::UI::Label;
662		942
663	our @ISA = Crossfire::Client::Widget::;	943	our @ISA = CFClient::UI::Base::;
664		944
665	use SDL::OpenGL;	945	use SDL::OpenGL;
666		946
667	sub new {	947	sub new {
668	my ($class, $x, $y, $z, $height, $text) = @_;	948	my ($class, %arg) = @_;
669		949
670	$height ||= $::FONTSIZE;	950	my $self = $class->SUPER::new (
		951	fg => [1, 1, 1],
		952	fontsize => $::FONTSIZE,
		953	text => "",
		954	align => -1,
		955	valign => -1,
		956	padding => 2,
		957	layout => new CFClient::Layout,
		958	%arg
		959	);
671		960
672	# TODO: color, and make height, xyz etc. optional
673	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
674
675	$self->set_text ($text);	961	$self->set_text ($self->{text});
676		962
677	$self	963	$self
		964	}
		965
		966	sub escape_text {
		967	local $_ = $_[1];
		968
		969	s/&/&amp;/g;
		970	s/>/&gt;/g;
		971	s/</&lt;/g;
		972
		973	$_[1]
678	}	974	}
679		975
680	sub set_text {	976	sub set_text {
681	my ($self, $text) = @_;	977	my ($self, $text) = @_;
682		978
683	$self->{text} = $text;	979	$self->{text} = $text;
684	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};	980	$self->{layout}->set_markup ($text);
685		981
		982	delete $self->{texture};
		983	# $self->{w} = $self->{h} = -1;
686	$self->update;	984	$self->update;
687	}	985	}
688		986
689	sub get_text {	987	sub get_text {
690	my ($self, $text) = @_;	988	my ($self, $text) = @_;
…		…
693	}	991	}
694		992
695	sub size_request {	993	sub size_request {
696	my ($self) = @_;	994	my ($self) = @_;
697		995
698	if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack	996	$self->{layout}->set_width;
		997	$self->{layout}->set_height ($self->{fontsize});
		998	my ($w, $h) = $self->{layout}->size;
		999
		1000	(
		1001	$w + $self->{padding} * 2,
		1002	$h + $self->{padding} * 2,
		1003	)
		1004	}
		1005
		1006	sub size_allocate {
		1007	my ($self, $x, $y, $w, $h) = @_;
		1008
		1009	$self->_size_allocate ($x, $y, $w, $h) or return;
		1010
		1011	delete $self->{texture};
		1012	}
		1013
		1014	sub update {
		1015	my ($self) = @_;
		1016
		1017	delete $self->{texture};
		1018	$self->SUPER::update;
		1019	}
		1020
		1021	sub _draw {
		1022	my ($self) = @_;
		1023
		1024	my $tex = $self->{texture} ||= do {
		1025	$self->{layout}->set_width ($self->{w});
		1026	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
		1027	new_from_layout CFClient::Texture $self->{layout}
		1028	};
		1029
		1030	glEnable GL_BLEND;
		1031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1032	glEnable GL_TEXTURE_2D;
		1033	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1034
		1035	glColor @{$self->{fg}};
		1036
		1037	my $x =
		1038	$self->{align} < 0 ? $self->{padding}
		1039	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1040	: ($self->{w} - $tex->{w}) * 0.5;
		1041
		1042	my $y =
		1043	$self->{valign} < 0 ? $self->{padding}
		1044	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1045	: ($self->{h} - $tex->{h}) * 0.5;
		1046
		1047	$tex->draw_quad (int $x, int $y);
		1048
		1049	glDisable GL_TEXTURE_2D;
		1050	glDisable GL_BLEND;
		1051	}
		1052
		1053	#############################################################################
		1054
		1055	package CFClient::UI::Entry;
		1056
		1057	our @ISA = CFClient::UI::Label::;
		1058
		1059	use SDL;
		1060	use SDL::OpenGL;
		1061
		1062	sub new {
		1063	my $class = shift;
		1064
		1065	$class->SUPER::new (
		1066	fg => [1, 1, 1],
		1067	bg => [0, 0, 0, 0.2],
		1068	active_bg => [1, 1, 1, 0.5],
		1069	active_fg => [0, 0, 0],
		1070	can_hover => 1,
		1071	can_focus => 1,
		1072	valign => 0,
699	(	1073	@_
700	$self->{texture}{width},	1074	)
701	$self->{texture}{height},	1075	}
702	)	1076
		1077	sub _set_text {
		1078	my ($self, $text) = @_;
		1079
		1080	my $old_text = $self->{text};
		1081
		1082	$self->{last_activity} = $::NOW;
		1083
		1084	$self->{text} = $text;
		1085	$self->{layout}->set_width ($self->{w});
		1086	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
		1087
		1088	$text =~ s/./*/g if $self->{hidden};
		1089
		1090	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
		1091
		1092	$text = substr $text, 0, $self->{cursor};
		1093	utf8::encode $text;
		1094
		1095	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1096
		1097	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1098	if $old_text ne $self->{text};
		1099	}
		1100
		1101	sub size_request {
		1102	my ($self) = @_;
		1103
		1104	my ($w, $h) = $self->SUPER::size_request;
		1105
		1106	($w + 1, $h) # add 1 for cursor
		1107	}
		1108
		1109	sub size_allocate {
		1110	my ($self, $x, $y, $w, $h) = @_;
		1111
		1112	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1113
		1114	$self->_set_text ($self->{text});
		1115	}
		1116
		1117	sub set_text {
		1118	my ($self, $text) = @_;
		1119
		1120	$self->{cursor} = length $text;
		1121	$self->_set_text ($text);
		1122	$self->update;
		1123	}
		1124
		1125	sub key_down {
		1126	my ($self, $ev) = @_;
		1127
		1128	my $mod = $ev->key_mod;
		1129	my $sym = $ev->key_sym;
		1130
		1131	my $uni = $ev->key_unicode;
		1132
		1133	my $text = $self->get_text;
		1134
		1135	if ($sym == SDLK_BACKSPACE) {
		1136	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
		1137	} elsif ($sym == SDLK_DELETE) {
		1138	substr $text, $self->{cursor}, 1, "";
		1139	} elsif ($sym == SDLK_LEFT) {
		1140	--$self->{cursor} if $self->{cursor};
		1141	} elsif ($sym == SDLK_RIGHT) {
		1142	++$self->{cursor} if $self->{cursor} < length $self->{text};
		1143	} elsif ($sym == SDLK_HOME) {
		1144	$self->{cursor} = 0;
		1145	} elsif ($sym == SDLK_END) {
		1146	$self->{cursor} = length $text;
		1147	} elsif ($sym == SDLK_ESCAPE) {
		1148	$self->emit ('escape');
		1149	} elsif ($uni) {
		1150	substr $text, $self->{cursor}++, 0, chr $uni;
		1151	}
		1152
		1153	$self->_set_text ($text);
		1154	$self->update;
		1155	}
		1156
		1157	sub focus_in {
		1158	my ($self) = @_;
		1159
		1160	$self->{last_activity} = $::NOW;
		1161
		1162	$self->SUPER::focus_in;
		1163	}
		1164
		1165	sub button_down {
		1166	my ($self, $ev, $x, $y) = @_;
		1167
		1168	$self->SUPER::button_down ($ev, $x, $y);
		1169
		1170	my $idx = $self->{layout}->xy_to_index ($x, $y);
		1171
		1172	# byte-index to char-index
		1173	my $text = $self->{text};
		1174	utf8::encode $text;
		1175	$self->{cursor} = length substr $text, 0, $idx;
		1176
		1177	$self->_set_text ($self->{text});
		1178	$self->update;
		1179	}
		1180
		1181	sub mouse_motion {
		1182	my ($self, $ev, $x, $y) = @_;
		1183	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1184	}
		1185
		1186	sub _draw {
		1187	my ($self) = @_;
		1188
		1189	local $self->{fg} = $self->{fg};
		1190
		1191	if ($FOCUS == $self) {
		1192	glColor @{$self->{active_bg}};
		1193	$self->{fg} = $self->{active_fg};
703	} else {	1194	} else {
704	my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};	1195	glColor @{$self->{bg}};
		1196	}
705		1197
706	($w, $h)	1198	glEnable GL_BLEND;
		1199	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1200	glBegin GL_QUADS;
		1201	glVertex 0 , 0;
		1202	glVertex 0 , $self->{h};
		1203	glVertex $self->{w}, $self->{h};
		1204	glVertex $self->{w}, 0;
		1205	glEnd;
		1206	glDisable GL_BLEND;
		1207
		1208	$self->SUPER::_draw;
		1209
		1210	#TODO: force update every cursor change :(
		1211	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1212	glColor @{$self->{fg}};
		1213	glBegin GL_LINES;
		1214	glVertex $self->{cur_x}, $self->{cur_y};
		1215	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
		1216	glEnd;
		1217	}
		1218	}
		1219
		1220	package CFClient::UI::LineEntry;
		1221
		1222	our @ISA = CFClient::UI::Entry::;
		1223
		1224	use SDL;
		1225	use SDL::OpenGL;
		1226
		1227	sub key_down {
		1228	my ($self, $ev) = @_;
		1229
		1230	my $sym = $ev->key_sym;
		1231
		1232	if ($sym == SDLK_RETURN) {
		1233	$self->emit (activate => $self->get_text);
		1234	$self->update;
		1235
		1236	} else {
		1237	$self->SUPER::key_down ($ev);
		1238	}
		1239
		1240	}
		1241
		1242	#############################################################################
		1243
		1244	package CFClient::UI::Button;
		1245
		1246	our @ISA = CFClient::UI::Label::;
		1247
		1248	use SDL;
		1249	use SDL::OpenGL;
		1250
		1251	my @tex =
		1252	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1253	qw(b1_button_active.png);
		1254
		1255	sub new {
		1256	my $class = shift;
		1257
		1258	$class->SUPER::new (
		1259	padding => 4,
		1260	fg => [1, 1, 1],
		1261	bg => [1, 1, 1, 0.2],
		1262	active_fg => [1, 1, 0],
		1263	can_hover => 1,
		1264	@_
707	}	1265	)
		1266	}
708		1267
		1268	sub button_up {
		1269	my ($self, $ev, $x, $y) = @_;
		1270
		1271	if ($x >= 0 && $x < $self->{w}
		1272	&& $y >= 0 && $y < $self->{h}) {
		1273	$self->emit ("activate");
		1274	}
709	}	1275	}
710		1276
711	sub _draw {	1277	sub _draw {
712	my ($self) = @_;	1278	my ($self) = @_;
713		1279
714	my $tex = $self->{texture};	1280	local $self->{fg} = $self->{fg};
		1281	my $tex = $tex[0];
715		1282
716	glEnable GL_BLEND;	1283	glEnable GL_BLEND;
717	glEnable GL_TEXTURE_2D;	1284	glEnable GL_TEXTURE_2D;
718	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1285	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
719	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1286
		1287	if ($GRAB == $self) {
		1288	$self->{fg} = $self->{active_fg};
		1289	}
		1290
720	glBindTexture GL_TEXTURE_2D, $tex->{name};	1291	glBindTexture GL_TEXTURE_2D, $tex->{name};
		1292	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
721		1293
722	glColor 1, 0, 0, 1; # TODO color	1294	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
723		1295
724	glBegin GL_QUADS;	1296	glDisable GL_TEXTURE_2D;
725	glTexCoord 0, 0; glVertex 0 , 0;	1297	glDisable GL_BLEND;
726	glTexCoord 0, 1; glVertex 0 , $tex->{height};	1298
727	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	1299	$self->SUPER::_draw;
728	glTexCoord 1, 0; glVertex $tex->{width}, 0;	1300	}
729	glEnd;	1301
		1302	#############################################################################
		1303
		1304	package CFClient::UI::CheckBox;
		1305
		1306	our @ISA = CFClient::UI::DrawBG::;
		1307
		1308	my @tex =
		1309	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1310	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1311
		1312	use SDL;
		1313	use SDL::OpenGL;
		1314
		1315	sub new {
		1316	my $class = shift;
		1317
		1318	$class->SUPER::new (
		1319	padding => 2,
		1320	fg => [1, 1, 1],
		1321	active_fg => [1, 1, 0],
		1322	state => 0,
		1323	can_hover => 1,
		1324	@_
		1325	)
		1326	}
		1327
		1328	sub size_request {
		1329	my ($self) = @_;
		1330
		1331	($self->{padding} * 2 + 6) x 2
		1332	}
		1333
		1334	sub size_allocate {
		1335	my ($self, $x, $y, $w, $h) = @_;
		1336
		1337	$self->_size_allocate ($x, $y, $w, $h);
		1338	}
		1339
		1340	sub button_down {
		1341	my ($self, $ev, $x, $y) = @_;
		1342
		1343	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1344	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1345	$self->{state} = !$self->{state};
		1346	$self->emit (changed => $self->{state});
		1347	}
		1348	}
		1349
		1350	sub _draw {
		1351	my ($self) = @_;
		1352
		1353	$self->SUPER::_draw;
		1354
		1355	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1356
		1357	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1358
		1359	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1360
		1361	glEnable GL_BLEND;
		1362	glEnable GL_TEXTURE_2D;
		1363	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1364
		1365	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1366
		1367	$tex->draw_quad (0, 0, $s, $s);
		1368
		1369	glDisable GL_TEXTURE_2D;
		1370	glDisable GL_BLEND;
		1371	}
		1372
		1373	#############################################################################
		1374
		1375	package CFClient::UI::Slider;
		1376
		1377	use strict;
		1378
		1379	use SDL::OpenGL;
		1380
		1381	our @ISA = CFClient::UI::DrawBG::;
		1382
		1383	my @tex =
		1384	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1385	qw(s1_slider.png s1_slider_bg.png);
		1386
		1387	sub new {
		1388	my $class = shift;
		1389
		1390	# range [value, low, high, page]
		1391
		1392	# TODO: 0-width page
		1393	# TODO: req_w/h are wrong with vertical
		1394	# TODO: calculations are off
		1395	my $self = $class->SUPER::new (
		1396	fg => [1, 1, 1],
		1397	active_fg => [0, 0, 0],
		1398	range => [0, 0, 100, 10],
		1399	req_w => 40,
		1400	req_h => 13,
		1401	vertical => 0,
		1402	can_hover => 1,
		1403	inner_pad => 5,
		1404	@_
		1405	);
		1406
		1407	$self
		1408	}
		1409
		1410	sub size_request {
		1411	my ($self) = @_;
		1412
		1413	my $w = $self->{req_w};
		1414	my $h = $self->{req_h};
		1415
		1416	$self->{vertical} ? ($h, $w) : ($w, $h)
		1417	}
		1418
		1419	sub button_down {
		1420	my ($self, $ev, $x, $y) = @_;
		1421
		1422	$self->SUPER::button_down ($ev, $x, $y);
		1423	$self->mouse_motion ($ev, $x, $y);
		1424	}
		1425
		1426	sub mouse_motion {
		1427	my ($self, $ev, $x, $y) = @_;
		1428
		1429	if ($GRAB == $self) {
		1430	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1431
		1432	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		1433
		1434	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1435	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1436
		1437	$x -= $inner_pad_px; # substract the padding
		1438	$x = $x * ($hi - $lo) / $inner_w + $lo;
		1439	$x = $lo if $x < $lo;
		1440	$x = $hi - $page if $x > $hi - $page;
		1441	$self->{range}[0] = $x;
		1442
		1443	$self->emit (changed => $x);
		1444	$self->update;
		1445	}
		1446	}
		1447
		1448	# the inner_* stuff is for generating a padding for the slider handle,
		1449	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1450	# correct propably, but it does the job for now
		1451	sub _calc_inner_pad_px {
		1452	my ($self, $w) = @_;
		1453	($w / 100) * $self->{inner_pad} # % to pixels
		1454	}
		1455
		1456	sub _draw {
		1457	my ($self) = @_;
		1458
		1459	$self->SUPER::_draw ();
		1460
		1461	my ($w, $h) = @$self{qw(w h)};
		1462
		1463	if ($self->{vertical}) {
		1464	# draw a vertical slider like a rotated horizontal slider
		1465
		1466	glRotate 90, 0, 0, 1;
		1467	glTranslate 0, -$self->{w}, 0;
		1468
		1469	($w, $h) = ($h, $w);
		1470	}
		1471
		1472	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
		1473	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
		1474
		1475	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1476
		1477	$hi = $value + 1 if $lo == $hi;
		1478
		1479	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1480	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1481
		1482	$page = int $page * $inner_w / ($hi - $lo);
		1483	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
		1484
		1485	$w -= $page;
		1486	$page &= ~1;
		1487	glTranslate $page * 0.5, 0, 0;
		1488	$page ||= 2;
		1489
		1490	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
		1491	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
		1492
		1493	glEnable GL_BLEND;
		1494	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1495	glEnable GL_TEXTURE_2D;
		1496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1497
		1498	# draw background
		1499	$tex[1]->draw_quad (0, 0, $w, $h);
		1500
		1501	# draw handle
		1502	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
730		1503
731	glDisable GL_BLEND;	1504	glDisable GL_BLEND;
732	glDisable GL_TEXTURE_2D;	1505	glDisable GL_TEXTURE_2D;
733	}	1506	}
734		1507
735	#############################################################################	1508	#############################################################################
736		1509
737	package Crossfire::Client::Widget::Entry;	1510	package CFClient::UI::TextView;
738		1511
739	our @ISA = Crossfire::Client::Widget::Label::;	1512	our @ISA = CFClient::UI::HBox::;
		1513
		1514	use SDL::OpenGL;
		1515
		1516	sub new {
		1517	my $class = shift;
		1518
		1519	my $self = $class->SUPER::new (
		1520	req_w => $::WIDTH / 6,
		1521	req_h => $::HEIGHT / 6,
		1522	fontsize => $::FONTSIZE,
		1523	@_,
		1524
		1525	layout => (new CFClient::Layout),
		1526	par => [],
		1527	height => 0,
		1528	children => [
		1529	(new CFClient::UI::Empty expand => 1),
		1530	(new CFClient::UI::Slider vertical => 1),
		1531	],
		1532	);
		1533
		1534	$self->{children}[1]->connect (changed => sub {
		1535	$self->update;
		1536	});
		1537
		1538	$self
		1539	}
		1540
		1541	sub set_fontsize {
		1542	my ($self, $fontsize) = @_;
		1543
		1544	$self->{fontsize} = $fontsize;
		1545	$self->reflow;
		1546	}
		1547
		1548	sub text_height {
		1549	my ($self, $text) = @_;
		1550
		1551	my $layout = $self->{layout};
		1552
		1553	$layout->set_height ($self->{fontsize});
		1554	$layout->set_width ($self->{w});
		1555	$layout->set_text ($text);
		1556
		1557	($layout->size)[1]
		1558	}
		1559
		1560	sub reflow {
		1561	my ($self) = @_;
		1562
		1563	$self->{need_reflow}++;
		1564	$self->update;
		1565	}
		1566
		1567	sub size_request {
		1568	my ($self) = @_;
		1569
		1570	($self->{req_w}, $self->{req_h})
		1571	}
		1572
		1573	sub size_allocate {
		1574	my ($self, $x, $y, $w, $h) = @_;
		1575
		1576	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1577
		1578	$self->{layout}->set_height ($self->{fontsize});
		1579	$self->{layout}->set_width ($self->{w});
		1580
		1581	$self->reflow;
		1582	}
		1583
		1584	sub add_paragraph {
		1585	my ($self, $color, $text) = @_;
		1586
		1587	#TODO: intelligently "reformat" paragraph
		1588
		1589	my $height = $self->text_height ($text);
		1590
		1591	$self->{height} += $height;
		1592
		1593	push @{$self->{par}}, [$height, $color, $text];
		1594
		1595	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1596	$self->{children}[1]->update;
		1597	}
		1598
		1599	sub update {
		1600	my ($self) = @_;
		1601
		1602	$self->SUPER::update;
		1603
		1604	return unless $self->{h} > 0;
		1605
		1606	delete $self->{texture};
		1607
		1608	$ROOT->on_refresh ($self, sub {
		1609	if (delete $self->{need_reflow}) {
		1610	my $height = 0;
		1611
		1612	$height += $_->[0] = $self->text_height ($_->[2])
		1613	for @{$self->{par}};
		1614
		1615	$self->{height} = $height;
		1616
		1617	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1618
		1619	delete $self->{texture};
		1620	}
		1621
		1622	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1623	glClearColor 0, 0, 0, 1;
		1624	glClear GL_COLOR_BUFFER_BIT;
		1625
		1626	glEnable GL_BLEND;
		1627	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1628	glEnable GL_TEXTURE_2D;
		1629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1630
		1631	my $top = int $self->{children}[1]{range}[0];
		1632
		1633	my $y0 = $top;
		1634	my $y1 = $top + $self->{h};
		1635
		1636	my $y = 0;
		1637
		1638	my $layout = $self->{layout};
		1639
		1640	for my $par (@{$self->{par}}) {
		1641	my $h = $par->[0];
		1642
		1643	if ($y0 < $y + $h && $y < $y1) {
		1644	$layout->set_text ($par->[2]);
		1645
		1646	glColor @{ $par->[1] };
		1647	my ($W, $H) = $layout->size;
		1648	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1649	}
		1650
		1651	$y += $h;
		1652	}
		1653
		1654	glDisable GL_TEXTURE_2D;
		1655	glDisable GL_BLEND;
		1656	};
		1657	});
		1658	}
		1659
		1660	sub _draw {
		1661	my ($self) = @_;
		1662
		1663	if ($self->{texture}) {
		1664	glEnable GL_TEXTURE_2D;
		1665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1666	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1667	glDisable GL_TEXTURE_2D;
		1668	}
		1669
		1670	$self->{children}[1]->draw;
		1671
		1672	}
		1673
		1674	#############################################################################
		1675
		1676	package CFClient::UI::MapWidget;
		1677
		1678	use strict;
		1679
		1680	use List::Util qw(min max);
740		1681
741	use SDL;	1682	use SDL;
742	use SDL::OpenGL;	1683	use SDL::OpenGL;
743		1684
744	sub key_down {	1685	our @ISA = CFClient::UI::Base::;
745	my ($self, $ev) = @_;
746		1686
747	my $mod = $ev->key_mod;	1687	sub new {
748	my $sym = $ev->key_sym;	1688	my $class = shift;
749		1689
750	my $uni = $ev->key_unicode;	1690	$class->SUPER::new (
751		1691	z => -1,
752	my $text = $self->get_text;	1692	can_focus => 1,
753		1693	list => (glGenLists 1),
754	if ($sym == SDLK_BACKSPACE) {	1694	@_
755	substr $text, -1, 1, '';
756	} elsif ($uni) {
757	$text .= chr $uni;
758	print "$uni <$text>\n";#d#
759	}	1695	)
760
761	$self->set_text ($text);
762	}	1696	}
763
764	sub button_down {
765	my ($self, $ev) = @_;
766
767	$self->focus_in;
768	}
769
770	sub _draw {
771	my ($self) = @_;
772
773	if ($FOCUS == $self) {
774	glColor 1, 1, 1;
775	} else {
776	glColor 0.7, 0.7, 0.7;
777	}
778
779	glBegin GL_QUADS;
780	glVertex 0 , 0;
781	glVertex 0 , $self->{h} - 1;
782	glVertex $self->{w} - 1, $self->{h} - 1;
783	glVertex $self->{w} - 1, 0;
784	glEnd;
785
786	$self->SUPER::_draw;
787	}
788
789	#############################################################################
790
791	package Crossfire::Client::Widget::MapWidget;
792
793	use strict;
794
795	use List::Util qw(min max);
796
797	use SDL;
798	use SDL::OpenGL;
799	use SDL::OpenGL::Constants;
800
801	our @ISA = Crossfire::Client::Widget::;
802		1697
803	sub key_down {	1698	sub key_down {
804	print "MAPKEYDOWN\n";	1699	print "MAPKEYDOWN\n";
805	}	1700	}
806		1701
807	sub key_up {	1702	sub key_up {
808	}	1703	}
809		1704
		1705	sub button_down {
		1706	my ($self, $ev, $x, $y) = @_;
		1707
		1708	$self->focus_in;
		1709
		1710	if ($ev->button == 2) {
		1711	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1712	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1713
		1714	$self->{motion} = sub {
		1715	my ($ev, $x, $y) = @_;
		1716
		1717	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1718
		1719	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1720	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1721
		1722	$self->update;
		1723	};
		1724	}
		1725	}
		1726
		1727	sub button_up {
		1728	my ($self, $ev, $x, $y) = @_;
		1729
		1730	delete $self->{motion};
		1731	}
		1732
		1733	sub mouse_motion {
		1734	my ($self, $ev, $x, $y) = @_;
		1735
		1736	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1737	}
		1738
810	sub size_request {	1739	sub size_request {
811	(	1740	(
812	1 + int $::WIDTH / 32,	1741	1 + 32 * int $::WIDTH / 32,
813	1 + int $::HEIGHT / 32,	1742	1 + 32 * int $::HEIGHT / 32,
814	)	1743	)
815	}	1744	}
816		1745
		1746	sub update {
		1747	my ($self) = @_;
		1748
		1749	$self->{need_update} = 1;
		1750	$self->SUPER::update;
		1751	}
		1752
817	sub _draw {	1753	sub draw {
818	my ($self) = @_;	1754	my ($self) = @_;
819		1755
820	my $mx = $::CONN->{mapx};	1756	if (delete $self->{need_update}) {
821	my $my = $::CONN->{mapy};	1757	glNewList $self->{list}, GL_COMPILE;
822		1758
823	my $map = $::CONN->{map};	1759	if ($::MAP) {
824
825	my ($xofs, $yofs);
826
827	my $sw = 1 + int $::WIDTH / 32;	1760	my $sw = int $::WIDTH / 32;
828	my $sh = 1 + int $::HEIGHT / 32;	1761	my $sh = int $::HEIGHT / 32;
829		1762
830	if ($::CONN->{mapw} > $sw) {	1763	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
831	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1764	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
832	} else {
833	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
834	}
835		1765
836	if ($::CONN->{maph} > $sh) {	1766	glTranslate $sx0 - 32, $sy0 - 32, 0;
837	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
838	} else {
839	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
840	}
841		1767
		1768	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1769
		1770	if ($::CFG->{fow_enable}) {
		1771	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1772	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1773	glConvolutionFilter2D
		1774	GL_CONVOLUTION_2D,
		1775	GL_ALPHA,
		1776	3, 3,
		1777	GL_ALPHA, GL_FLOAT,
		1778	pack "f*",
		1779	0.1, 0.1, 0.1,
		1780	0.1, 0.2, 0.1,
		1781	0.1, 0.1, 0.1,
		1782	;
		1783	glEnable GL_CONVOLUTION_2D;
		1784	}
		1785
		1786	my $tex = new CFClient::Texture
		1787	w => $w,
		1788	h => $h,
		1789	data => $data,
		1790	internalformat => GL_ALPHA,
		1791	format => GL_ALPHA;
		1792
		1793	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1794
		1795	glEnable GL_BLEND;
		1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
842	glEnable GL_TEXTURE_2D;	1797	glEnable GL_TEXTURE_2D;
843	glEnable GL_BLEND;
844	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1798	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
845		1799
846	my $sw4 = ($sw + 3) & ~3;	1800	glColor +($::CFG->{fow_intensity}) x 3, 1;
847	my $lighting = "\x00" x ($sw4 * $sh);	1801	$tex->draw_quad (0, 0, $w * 32, $h * 32);
848		1802
849	for my $x (0 .. $sw - 1) {	1803	glDisable GL_TEXTURE_2D;
850	for my $y (0 .. $sh - 1) {	1804	glDisable GL_BLEND;
851
852	my $cell = $map->[$x + $xofs][$y + $yofs]
853	or next;
854
855	my $darkness = $cell->[0] * (1 / 255);
856	if ($darkness < 0) {
857	$darkness = $cell->[1] ? 0.2 : 0;
858	}	1805	}
859	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
860		1806
861	for my $num (grep $_, @$cell[1,2,3]) {	1807	# HACK BEGIN
862	my $tex = $::CONN->{face}[$num]{texture} || next;	1808	{
		1809	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1810	my ($w, $h) = (250, 250);
863		1811
864	glBindTexture GL_TEXTURE_2D, $tex->{name};	1812	glEnable GL_BLEND;
		1813	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1814	glEnable GL_TEXTURE_2D;
		1815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
865		1816
866	my $w = $tex->{width};	1817	CFClient::Texture->new (
867	my $h = $tex->{height};	1818	w => $w,
		1819	h => $h,
		1820	data => $::MAP->mapmap ($w, $h),
		1821	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1822	)->draw_quad (100, 100);
868		1823
869	my $px = ($x + 1) * 32 - $w;	1824	glDisable GL_TEXTURE_2D;
870	my $py = ($y + 1) * 32 - $h;	1825	glDisable GL_BLEND;
871
872	glBegin GL_QUADS;
873	glTexCoord 0, 0; glVertex $px , $py;
874	glTexCoord 0, 1; glVertex $px , $py + $h;
875	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
876	glTexCoord 1, 0; glVertex $px + $w, $py;
877	glEnd;
878	}	1826	}
		1827	# HACK END
879	}	1828	}
880	}
881		1829
882	# if (1) { # higher quality darkness	1830	glEndList;
883	# $lighting =~ s/(.)/$1$1$1/gs;
884	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
885	#
886	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
887	#
888	# $lighting = $pb->get_pixels;
889	# $lighting =~ s/(.)../$1/gs;
890	# }	1831	}
891		1832
892	$lighting = new Crossfire::Client::Texture	1833	glPushMatrix;
893	width => $sw4,	1834	glCallList $self->{list};
894	height => $sh,	1835	glPopMatrix;
895	data => $lighting,
896	internalformat => GL_ALPHA,
897	format => GL_ALPHA;
898		1836
899	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1837	if ($FOCUS != $self) {
900	glColor 0.5, 0.5, 0.5, 1;	1838	glColor 64/255, 64/255, 64/255;
901	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1839	glLogicOp GL_AND;
902	glBindTexture GL_TEXTURE_2D, $lighting->{name};	1840	glEnable GL_COLOR_LOGIC_OP;
903	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
904	glBegin GL_QUADS;	1841	glBegin GL_QUADS;
905	glTexCoord 0, 0; glVertex 0 , 0;	1842	glVertex 0, 0;
906	glTexCoord 0, 1; glVertex 0 , $sh * 32;	1843	glVertex 0, $::HEIGHT;
907	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;	1844	glVertex $::WIDTH, $::HEIGHT;
908	glTexCoord 1, 0; glVertex $sw4 * 32, 0;	1845	glVertex $::WIDTH, 0;
909	glEnd;	1846	glEnd;
910		1847	glDisable GL_COLOR_LOGIC_OP;
911	glDisable GL_TEXTURE_2D;	1848	}
912	glDisable GL_BLEND;
913	}	1849	}
914		1850
915	my %DIR = (	1851	my %DIR = (
916	SDLK_KP8, [1, "north"],	1852	SDLK_KP8, [1, "north"],
917	SDLK_KP9, [2, "northeast"],	1853	SDLK_KP9, [2, "northeast"],
…		…
933		1869
934	my $mod = $ev->key_mod;	1870	my $mod = $ev->key_mod;
935	my $sym = $ev->key_sym;	1871	my $sym = $ev->key_sym;
936		1872
937	if ($sym == SDLK_KP5) {	1873	if ($sym == SDLK_KP5) {
938	$::CONN->send ("command stay fire");	1874	$::CONN->user_send ("command stay fire");
		1875	} elsif ($sym == SDLK_a) {
		1876	$::CONN->user_send ("command apply");
		1877	} elsif ($sym == SDLK_QUOTE) {
		1878	$self->emit ('activate_console');
		1879	} elsif ($sym == SDLK_SLASH) {
		1880	$self->emit ('activate_console' => '/');
939	} elsif (exists $DIR{$sym}) {	1881	} elsif (exists $DIR{$sym}) {
940	if ($mod & KMOD_SHIFT) {	1882	if ($mod & KMOD_SHIFT) {
941	$self->{shft}++;	1883	$self->{shft}++;
942	$::CONN->send ("command fire $DIR{$sym}[0]");	1884	$::CONN->user_send ("command fire $DIR{$sym}[0]");
943	} elsif ($mod & KMOD_CTRL) {	1885	} elsif ($mod & KMOD_CTRL) {
944	$self->{ctrl}++;	1886	$self->{ctrl}++;
945	$::CONN->send ("command run $DIR{$sym}[0]");	1887	$::CONN->user_send ("command run $DIR{$sym}[0]");
946	} else {	1888	} else {
947	$::CONN->send ("command $DIR{$sym}[1]");	1889	$::CONN->user_send ("command $DIR{$sym}[1]");
948	}	1890	}
949	}	1891	}
950	}	1892	}
951		1893
952	sub key_up {	1894	sub key_up {
…		…
954		1896
955	my $mod = $ev->key_mod;	1897	my $mod = $ev->key_mod;
956	my $sym = $ev->key_sym;	1898	my $sym = $ev->key_sym;
957		1899
958	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1900	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
959	$::CONN->send ("command fire_stop");	1901	$::CONN->user_send ("command fire_stop");
960	}	1902	}
961	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1903	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
962	$::CONN->send ("command run_stop");	1904	$::CONN->user_send ("command run_stop");
963	}	1905	}
964	}	1906	}
965		1907
966	#############################################################################	1908	#############################################################################
967		1909
968	package Crossfire::Client::Widget::Animator;	1910	package CFClient::UI::Animator;
969		1911
970	use SDL::OpenGL;	1912	use SDL::OpenGL;
971		1913
972	our @ISA = Crossfire::Client::Widget::Bin::;	1914	our @ISA = CFClient::UI::Bin::;
973		1915
974	sub moveto {	1916	sub moveto {
975	my ($self, $x, $y) = @_;	1917	my ($self, $x, $y) = @_;
976		1918
977	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1919	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978	$self->{speed} = 2;	1920	$self->{speed} = 0.001;
979	$self->{time} = 1;	1921	$self->{time} = 1;
980		1922
981	::animation_start $self;	1923	::animation_start $self;
982	}	1924	}
983		1925
…		…
1005	glPopMatrix;	1947	glPopMatrix;
1006	}	1948	}
1007		1949
1008	#############################################################################	1950	#############################################################################
1009		1951
1010	package Crossfire::Client::Widget::Toplevel;	1952	package CFClient::UI::Flopper;
1011		1953
		1954	our @ISA = CFClient::UI::Button::;
		1955
		1956	sub new {
		1957	my $class = shift;
		1958
		1959	my $self = $class->SUPER::new (
		1960	state => 0,
		1961	connect_activate => \&toggle_flopper,
		1962	@_
		1963	);
		1964
		1965	if ($self->{state}) {
		1966	$self->{state} = 0;
		1967	$self->toggle_flopper;
		1968	}
		1969
		1970	$self
		1971	}
		1972
		1973	sub toggle_flopper {
		1974	my ($self) = @_;
		1975
		1976	# TODO: use animation
		1977	if ($self->{state} = !$self->{state}) {
		1978	$CFClient::UI::ROOT->add ($self->{other});
		1979	$self->{other}->move ($self->coord2global (0, $self->{h}));
		1980	$self->emit ("open");
		1981	} else {
		1982	$CFClient::UI::ROOT->remove ($self->{other});
		1983	$self->emit ("close");
		1984	}
		1985
		1986	$self->emit (changed => $self->{state});
		1987	}
		1988
		1989	#############################################################################
		1990
		1991	package CFClient::UI::Root;
		1992
1012	our @ISA = Crossfire::Client::Widget::Container::;	1993	our @ISA = CFClient::UI::Container::;
		1994
		1995	use SDL::OpenGL;
1013		1996
1014	sub size_request {	1997	sub size_request {
1015	($::WIDTH, $::HEIGHT)	1998	($::WIDTH, $::HEIGHT)
1016	}	1999	}
1017		2000
1018	sub size_allocate {	2001	sub size_allocate {
1019	my ($self, $w, $h) = @_;	2002	my ($self, $x, $y, $w, $h) = @_;
1020		2003
1021	$self->SUPER::size_allocate ($w, $h);	2004	$self->_size_allocate ($x, $y, $w, $h);
1022		2005
1023	$_->size_allocate ($_->size_request)	2006	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1024	for @{$self->{children}};	2007	for @{$self->{children}};
1025	}	2008	}
1026		2009
		2010	sub _topleft {
		2011	my ($self, $x, $y) = @_;
		2012
		2013	($x, $y)
		2014	}
		2015
1027	sub update {	2016	sub update {
1028	my ($self) = @_;	2017	my ($self) = @_;
1029		2018
1030	$self->size_allocate ($self->size_request);	2019	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1031	::refresh ();	2020	::refresh ();
1032	}	2021	}
1033		2022
1034	sub add {	2023	sub add {
1035	my ($self, $widget) = @_;	2024	my ($self, $widget) = @_;
1036		2025
1037	$self->SUPER::add ($widget);	2026	$self->SUPER::add ($widget);
1038		2027
1039	$widget->size_allocate ($widget->size_request);	2028	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
		2029	}
		2030
		2031	sub on_refresh {
		2032	my ($self, $id, $cb) = @_;
		2033
		2034	$self->{refresh_hook}{$id} = $cb;
1040	}	2035	}
1041		2036
1042	sub draw {	2037	sub draw {
1043	my ($self) = @_;	2038	my ($self) = @_;
1044		2039
		2040	while (my $rcb = delete $self->{refresh_hook}) {
		2041	$_->() for values %$rcb;
		2042	}
		2043
		2044	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2045	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2046	glClear GL_COLOR_BUFFER_BIT;
		2047
		2048	glMatrixMode GL_PROJECTION;
		2049	glLoadIdentity;
		2050	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2051	glMatrixMode GL_MODELVIEW;
		2052	glLoadIdentity;
		2053
1045	$self->_draw;	2054	$self->_draw;
1046	}	2055	}
1047		2056
1048	#############################################################################	2057	#############################################################################
1049		2058
1050	package Crossfire::Client::Widget;	2059	package CFClient::UI;
1051		2060
1052	$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;	2061	$ROOT = new CFClient::UI::Root;
1053		2062
1054	1	2063	1
1055		2064

Diff Legend

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