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.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.140 by root, Thu Apr 20 04:20:52 2006 UTC

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

Diff Legend

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