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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.146 by elmex, Fri Apr 21 15:03:46 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 && $hover->{can_hover};	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_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	my $self = 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;
92		103
93	for (keys %$self) {	104	for (keys %$self) {
94	if (/^connect_(.*)$/) {	105	if (/^connect_(.*)$/) {
…		…
97	}	108	}
98		109
99	$self	110	$self
100	}	111	}
101		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);
		127	}
		128
102	sub move {	129	sub move {
103	my ($self, $x, $y, $z) = @_;	130	my ($self, $x, $y, $z) = @_;
		131
104	$self->{x} = $x;	132	$self->{x} = int $x;
105	$self->{y} = $y;	133	$self->{y} = int $y;
106	$self->{z} = $z if defined $z;	134	$self->{z} = $z if defined $z;
		135
		136	$self->update;
107	}	137	}
108		138
109	sub needs_redraw {	139	sub needs_redraw {
110	0	140	0
111	}	141	}
…		…
113	sub size_request {	143	sub size_request {
114	require Carp;	144	require Carp;
115	Carp::confess "size_request is abtract";	145	Carp::confess "size_request is abtract";
116	}	146	}
117		147
118	sub _size_allocate {	148	sub configure {
119	my ($self, $x, $y, $w, $h) = @_;	149	my ($self, $x, $y, $w, $h) = @_;
120		150
		151	if ($self->{aspect}) {
		152	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		153	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		154
		155	# use alignment to adjust x, y
		156
		157	$x += ($w - $w2) * 0.5;
		158	$y += ($h - $h2) * 0.5;
		159
		160	($w, $h) = ($w2, $h2);
		161	}
		162
		163	if ($self->{x} != $x \|\| $self->{y} != $y) {
121	$self->{x} = $x;	164	$self->{x} = $x;
122	$self->{y} = $y;	165	$self->{y} = $y;
		166	$self->update;
		167	}
123		168
124	return unless $self->{w} != $w \|\| $self->{h} != $h;	169	if ($self->{w} != $w \|\| $self->{h} != $h) {
125
126	$self->{w} = $w;	170	$self->{w} = $w;
127	$self->{h} = $h;	171	$self->{h} = $h;
128		172
		173	$self->size_allocate ($w, $h);
		174	$self->update;
129	1	175	}
130	}	176	}
131		177
132	sub size_allocate {	178	sub size_allocate {
		179	# nothing to be done
		180	}
		181
		182	# return top left coordinates
		183	sub _topleft {
133	my ($self, $x, $y, $w, $h) = @_;	184	my ($self, $x, $y) = @_;
134		185
135	$self->_size_allocate ($x, $y, $w, $h);	186	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136	}	187	}
137		188
138	# translate global coordinates to local coordinate system	189	# translate global coordinates to local coordinate system
139	sub translate {	190	sub coord2local {
140	my ($self, $x, $y) = @_;	191	my ($self, $x, $y) = @_;
141		192
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	193	my ($X, $Y) = $self->_topleft;
		194	($x - $X, $y - $Y)
		195	}
		196
		197	# translate local coordinates to global coordinate system
		198	sub coord2global {
		199	my ($self, $x, $y) = @_;
		200
		201	my ($X, $Y) = $self->_topleft;
		202	($x + $X, $y + $Y)
143	}	203	}
144		204
145	sub focus_in {	205	sub focus_in {
146	my ($self) = @_;	206	my ($self) = @_;
147		207
148	return if $FOCUS == $self;	208	return if $FOCUS == $self;
149	return unless $self->{can_focus};	209	return unless $self->{can_focus};
150		210
151	my $focus = $FOCUS; $FOCUS = $self;	211	my $focus = $FOCUS; $FOCUS = $self;
		212
		213	$self->emit (focus_in => $focus);
		214
152	$focus->update if $focus;	215	$focus->update if $focus;
153	$FOCUS->update;	216	$FOCUS->update;
154	}	217	}
155		218
156	sub focus_out {	219	sub focus_out {
157	my ($self) = @_;	220	my ($self) = @_;
158		221
159	return unless $FOCUS == $self;	222	return unless $FOCUS == $self;
160		223
161	my $focus = $FOCUS; undef $FOCUS;	224	my $focus = $FOCUS; undef $FOCUS;
		225
		226	$self->emit (focus_out => $focus);
		227
162	$focus->update if $focus; #?	228	$focus->update if $focus; #?
163	}	229	}
164		230
165	sub mouse_motion { }	231	sub mouse_motion { }
166	sub button_up { }	232	sub button_up { }
…		…
190	glPopMatrix;	256	glPopMatrix;
191		257
192	if ($self == $HOVER && $self->{can_hover}) {	258	if ($self == $HOVER && $self->{can_hover}) {
193	my ($x, $y) = @$self{qw(x y)};	259	my ($x, $y) = @$self{qw(x y)};
194		260
195	glColor 0, 0, 1, 0.2;	261	glColor 1, 0.8, 0.5, 0.2;
196	glEnable GL_BLEND;	262	glEnable GL_BLEND;
197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	263	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198	glBegin GL_QUADS;	264	glBegin GL_QUADS;
199	glVertex $x , $y;	265	glVertex $x , $y;
200	glVertex $x + $self->{w}, $y;	266	glVertex $x + $self->{w}, $y;
…		…
220		286
221	()	287	()
222	}	288	}
223		289
224	sub set_parent {	290	sub set_parent {
225	my ($self, $par) = @_;	291	my ($self, $parent) = @_;
226		292
227	$self->{parent} = $par;
228	Scalar::Util::weaken $self->{parent};	293	Scalar::Util::weaken ($self->{parent} = $parent);
229	}	294	}
230		295
231	sub get_parent {	296	sub check_size {
232	$_[0]->{parent}	297	my ($self) = @_;
		298
		299	my ($w, $h) = $self->size_request;
		300
		301	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
		302	$self->{req_w} = $w;
		303	$self->{req_h} = $h;
		304
		305	$self->{parent}->check_size
		306	if $self->{parent};
		307	}
233	}	308	}
234		309
235	sub update {	310	sub update {
236	my ($self) = @_;	311	my ($self) = @_;
237		312
…		…
240	}	315	}
241		316
242	sub connect {	317	sub connect {
243	my ($self, $signal, $cb) = @_;	318	my ($self, $signal, $cb) = @_;
244		319
245	push @{ $self->{cb}{$signal} }, $cb;	320	push @{ $self->{signal_cb}{$signal} }, $cb;
246	}	321	}
247		322
248	sub emit {	323	sub emit {
249	my ($self, $signal, @args) = @_;	324	my ($self, $signal, @args) = @_;
250		325
		326	for my $cb (@{$self->{signal_cb}{$signal} \|\| []}) {
251	$_->($self, @args)	327	$cb->($self, @args);
252	for @{$self->{cb}{$signal} \|\| []};	328	}
253	}	329	}
254		330
255	sub DESTROY {	331	sub DESTROY {
256	my ($self) = @_;	332	my ($self) = @_;
257		333
…		…
263	package CFClient::UI::DrawBG;	339	package CFClient::UI::DrawBG;
264		340
265	our @ISA = CFClient::UI::Base::;	341	our @ISA = CFClient::UI::Base::;
266		342
267	use strict;	343	use strict;
268	use SDL::OpenGL;	344	use CFClient::OpenGL;
269		345
270	sub new {	346	sub new {
271	my $class = shift;	347	my $class = shift;
272		348
273	# range [value, low, high, page]	349	# range [value, low, high, page]
…		…
326		402
327	$self	403	$self
328	}	404	}
329		405
330	sub add {	406	sub add {
331	my ($self, $chld) = @_;	407	my ($self, $child) = @_;
332		408
333	$chld->set_parent ($self);	409	$child->set_parent ($self);
		410
		411	use sort 'stable';
334		412
335	$self->{children} = [	413	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	414	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	415	@{$self->{children}}, $child
338	];	416	];
339		417
340	$self->{w} = $self->{h} = -1;	418	$child->check_size;
341	$self->update;
342	}	419	}
343		420
344	sub remove {	421	sub remove {
345	my ($self, $widget) = @_;	422	my ($self, $child) = @_;
346		423
		424	delete $child->{parent};
		425
347	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	426	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
348		427
349	$self->size_allocate (0, 0, $self->{w}, $self->{h});	428	$self->check_size;
350	}	429	}
351		430
352	sub find_widget {	431	sub find_widget {
353	my ($self, $x, $y) = @_;	432	my ($self, $x, $y) = @_;
354		433
…		…
384		463
385	$class->SUPER::new (children => [$child], %arg)	464	$class->SUPER::new (children => [$child], %arg)
386	}	465	}
387		466
388	sub add {	467	sub add {
389	my ($self, $widget) = @_;	468	my ($self, $child) = @_;
390		469
391	$self->{children} = [];	470	$self->{children} = [];
392		471
393	$self->SUPER::add ($widget);	472	$self->SUPER::add ($child);
394	}	473	}
395		474
396	sub remove {	475	sub remove {
397	my ($self, $widget) = @_;	476	my ($self, $widget) = @_;
398		477
…		…
407	sub size_request {	486	sub size_request {
408	$_[0]{children}[0]->size_request	487	$_[0]{children}[0]->size_request
409	}	488	}
410		489
411	sub size_allocate {	490	sub size_allocate {
412	my ($self, $x, $y, $w, $h) = @_;	491	my ($self, $w, $h) = @_;
413		492
414	$self->_size_allocate ($x, $y, $w, $h) or return;
415
416	$self->{children}[0]->size_allocate (0, 0, $w, $h);	493	$self->{children}[0]->configure (0, 0, $w, $h);
417	}	494	}
418		495
419	#############################################################################	496	#############################################################################
420		497
421	package CFClient::UI::Window;	498	package CFClient::UI::Window;
422		499
423	our @ISA = CFClient::UI::Bin::;	500	our @ISA = CFClient::UI::Bin::;
424		501
425	use SDL::OpenGL;	502	use CFClient::OpenGL;
426		503
427	sub new {	504	sub new {
428	my ($class, %arg) = @_;	505	my ($class, %arg) = @_;
429		506
430	my $self = $class->SUPER::new (%arg);	507	my $self = $class->SUPER::new (%arg);
…		…
447	$self->child->draw;	524	$self->child->draw;
448	};	525	};
449	}	526	}
450		527
451	sub size_allocate {	528	sub size_allocate {
452	my ($self, $x, $y, $w, $h) = @_;	529	my ($self, $w, $h) = @_;
453		530
454	$self->_size_allocate ($x, $y, $w, $h) or return;
455
456	$self->child->size_allocate (0, 0, $w, $h);	531	$self->child->configure (0, 0, $w, $h);
457		532
458	$self->render_chld;	533	$self->render_chld;
459	}	534	}
460		535
461	sub _draw {	536	sub _draw {
…		…
477	glDisable GL_TEXTURE_2D;	552	glDisable GL_TEXTURE_2D;
478	}	553	}
479		554
480	#############################################################################	555	#############################################################################
481		556
		557	package CFClient::UI::ViewPort;
		558
		559	our @ISA = CFClient::UI::Window::;
		560
		561	sub new { die }
		562
		563	sub size_request {
		564	my ($self) = @_;
		565
		566	@$self{qw(child_w child_h)} = $self->child->size_request;
		567	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		568
		569	@$self{qw(child_w child_h)}
		570	}
		571
		572	sub _draw {
		573	my ($self) = @_;
		574
		575	$self->{children}[1]->draw;
		576	}
		577
		578
		579	#############################################################################
		580
482	package CFClient::UI::Frame;	581	package CFClient::UI::Frame;
483		582
484	our @ISA = CFClient::UI::Bin::;	583	our @ISA = CFClient::UI::Bin::;
485		584
486	use SDL::OpenGL;	585	use CFClient::OpenGL;
487		586
488	sub size_request {	587	sub size_request {
489	my ($self) = @_;	588	my ($self) = @_;
490	my $chld = $self->child	589	my $chld = $self->child
491	or return (0, 0);	590	or return (0, 0);
…		…
496	}	595	}
497		596
498	sub size_allocate {	597	sub size_allocate {
499	my ($self, $x, $y, $w, $h) = @_;	598	my ($self, $x, $y, $w, $h) = @_;
500		599
501	$self->_size_allocate ($x, $y, $w, $h) or return;
502
503	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	600	$self->child->configure (2, 2, $w - 4, $h - 4);
504	}	601	}
505		602
506	sub _draw {	603	sub _draw {
507	my ($self) = @_;	604	my ($self) = @_;
508		605
…		…
525		622
526	package CFClient::UI::FancyFrame;	623	package CFClient::UI::FancyFrame;
527		624
528	our @ISA = CFClient::UI::Bin::;	625	our @ISA = CFClient::UI::Bin::;
529		626
530	use SDL::OpenGL;	627	use CFClient::OpenGL;
531		628
532	my @tex =	629	my @tex =
533	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	630	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
534	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	631	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
535		632
536	sub new {	633	sub new {
537	my $class = shift;	634	my $class = shift;
538		635
539	# TODO: user_x, user_y, overwrite moveto?	636	# TODO: user_x, user_y, overwrite moveto?
540		637
541	$class->SUPER::new (	638	my $self = $class->SUPER::new (
542	bg => [1, 1, 1, 1],	639	bg => [1, 1, 1, 1],
543	border_bg => [1, 1, 1, 1],	640	border_bg => [1, 1, 1, 1],
544	border => $::FONTSIZE * 0.8,	641	border => 0.8,
545	@_	642	@_
		643	);
		644
		645	$self->{title} &&= new CFClient::UI::Label
		646	align => 0,
		647	valign => 1,
		648	text => $self->{title},
		649	fontsize => 1;
		650
		651	$self
		652	}
		653
		654	sub border {
		655	int $_[0]{border} * $::FONTSIZE
		656	}
		657
		658	sub size_request {
		659	my ($self) = @_;
		660
		661	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		662
		663	my ($w, $h) = $self->SUPER::size_request;
		664
		665	(
		666	$w + $self->border * 2,
		667	$h + $self->border * 2,
546	)	668	)
547	}	669	}
548		670
549	sub size_request {
550	my ($self) = @_;
551
552	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
554	my ($w, $h) = $self->SUPER::size_request;
555
556	(
557	$w + $self->{border} * 2,
558	$h + $self->{border} * 2,
559	)
560	}
561
562	sub size_allocate {	671	sub size_allocate {
563	my ($self, $x, $y, $w, $h) = @_;	672	my ($self, $w, $h) = @_;
564		673
565	$self->_size_allocate ($x, $y, $w, $h) or return;
566
567	$h -= List::Util::max 0, $self->{border} * 2;	674	$h -= List::Util::max 0, $self->border * 2;
568	$w -= List::Util::max 0, $self->{border} * 2;	675	$w -= List::Util::max 0, $self->border * 2;
569		676
		677	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		678	if $self->{title};
		679
570	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	680	$self->child->configure ($self->border, $self->border, $w, $h);
571	}	681	}
572		682
573	sub button_down {	683	sub button_down {
574	my ($self, $ev, $x, $y) = @_;	684	my ($self, $ev, $x, $y) = @_;
575		685
		686	my $border = $self->border;
		687
576	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	688	if ($x < $self->{w} && $x >= $self->{w} - $border
577	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	689	&& $y < $self->{h} && $y >= $self->{h} - $border) {
578		690
579	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	691	my ($ox, $oy) = ($ev->{x}, $ev->{y});
580	my ($bw, $bh) = ($self->{w}, $self->{h});	692	my ($bw, $bh) = ($self->{w}, $self->{h});
581		693
582	$self->{motion} = sub {	694	$self->{motion} = sub {
583	my ($ev, $x, $y) = @_;	695	my ($ev, $x, $y) = @_;
584		696
585	($x, $y) = ($ev->motion_x, $ev->motion_y);	697	($x, $y) = ($ev->{x}, $ev->{y});
586		698
587	$self->{user_w} = $bw + $x - $ox;	699	$self->{user_w} = $bw + $x - $ox;
588	$self->{user_h} = $bh + $y - $oy;	700	$self->{user_h} = $bh + $y - $oy;
589	$self->update;	701	$self->check_size;
590	};	702	};
591		703
592	} elsif ($x >= 0 && $x < $self->{w}	704	} elsif ($x >= 0 && $x < $self->{w}
593	&& $y >= 0 && $y < $self->{border}) {	705	&& $y >= 0 && $y < $border) {
594		706
595	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	707	my ($ox, $oy) = ($ev->{x}, $ev->{y});
596	my ($bx, $by) = ($self->{x}, $self->{y});	708	my ($bx, $by) = ($self->{x}, $self->{y});
597		709
598	$self->{motion} = sub {	710	$self->{motion} = sub {
599	my ($ev, $x, $y) = @_;	711	my ($ev, $x, $y) = @_;
600		712
601	($x, $y) = ($ev->motion_x, $ev->motion_y);	713	($x, $y) = ($ev->{x}, $ev->{y});
602		714
603	$self->move ($bx + $x - $ox, $by + $y - $oy);	715	$self->move ($bx + $x - $ox, $by + $y - $oy);
604	$self->update;	716	$self->update;
605	};	717	};
606	}	718	}
…		…
627	glEnable GL_BLEND;	739	glEnable GL_BLEND;
628	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	740	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629	glEnable GL_TEXTURE_2D;	741	glEnable GL_TEXTURE_2D;
630	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	742	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631		743
		744	my $border = $self->border;
		745
632	glColor @{ $self->{border_bg} };	746	glColor @{ $self->{border_bg} };
633	$tex[1]->draw_quad (0, 0, $w, $self->{border});	747	$tex[1]->draw_quad (0, 0, $w, $border);
634	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	748	$tex[3]->draw_quad (0, $border, $border, $ch);
635	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	749	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
636	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	750	$tex[4]->draw_quad (0, $h - $border, $w, $border);
637		751
638	my $bg = $tex[0];	752	my $bg = $tex[0];
639		753
640	# TODO: repeat texture not scale	754	# TODO: repeat texture not scale
641	my $rep_x = $cw / $bg->{w};	755	my $rep_x = $cw / $bg->{w};
…		…
644	glColor @{ $self->{bg} };	758	glColor @{ $self->{bg} };
645		759
646	$bg->{s} = $rep_x;	760	$bg->{s} = $rep_x;
647	$bg->{t} = $rep_y;	761	$bg->{t} = $rep_y;
648	$bg->{wrap_mode} = 1;	762	$bg->{wrap_mode} = 1;
649	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	763	$bg->draw_quad ($border, $border, $cw, $ch);
650		764
651	glDisable GL_TEXTURE_2D;	765	glDisable GL_TEXTURE_2D;
652	glDisable GL_BLEND;	766	glDisable GL_BLEND;
653		767
		768	$self->{title}->draw if $self->{title};
654	$self->child->draw;	769	$self->child->draw;
655	}	770	}
656		771
657	#############################################################################	772	#############################################################################
658		773
…		…
660		775
661	our @ISA = CFClient::UI::Base::;	776	our @ISA = CFClient::UI::Base::;
662		777
663	use List::Util qw(max sum);	778	use List::Util qw(max sum);
664		779
665	use SDL::OpenGL;	780	use CFClient::OpenGL;
666		781
667	sub new {	782	sub new {
668	my $class = shift;	783	my $class = shift;
669		784
670	$class->SUPER::new (	785	$class->SUPER::new (
…		…
672	@_	787	@_
673	)	788	)
674	}	789	}
675		790
676	sub add {	791	sub add {
677	my ($self, $x, $y, $chld) = @_;	792	my ($self, $x, $y, $child) = @_;
678		793
		794	$child->set_parent ($self);
679	$self->{children}[$y][$x] = $chld;	795	$self->{children}[$y][$x] = $child;
680	$chld->set_parent ($self);
681		796
682	$self->{w} = $self->{h} = -1;	797	$child->check_size;
		798	}
		799
		800	# TODO: move to container class maybe? send childs a signal on removal?
		801	sub clear {
		802	my ($self) = @_;
		803
		804	delete $self->{children};
683	$self->update;	805	$self->update;
684	}	806	}
685		807
686	sub get_wh {	808	sub get_wh {
687	my ($self) = @_;	809	my ($self) = @_;
…		…
715	(sum @$hs),	837	(sum @$hs),
716	)	838	)
717	}	839	}
718		840
719	sub size_allocate {	841	sub size_allocate {
720	my ($self, $x, $y, $w, $h) = @_;	842	my ($self, $w, $h) = @_;
721
722	$self->_size_allocate ($x, $y, $w, $h) or return;
723		843
724	my ($ws, $hs) = $self->get_wh;	844	my ($ws, $hs) = $self->get_wh;
725		845
726	my $req_w = sum @$ws;	846	my $req_w = sum @$ws;
727	my $req_h = sum @$hs;	847	my $req_h = sum @$hs;
…		…
732	my $col_expand = (sum @col_expand) \|\| 1;	852	my $col_expand = (sum @col_expand) \|\| 1;
733		853
734	# linearly scale sizes	854	# linearly scale sizes
735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	855	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	856	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		857
		858	CFClient::UI::harmonize $ws;
		859	CFClient::UI::harmonize $hs;
737		860
738	my $y;	861	my $y;
739		862
740	for my $r (0 .. $#{$self->{children}}) {	863	for my $r (0 .. $#{$self->{children}}) {
741	my $row = $self->{children}[$r]	864	my $row = $self->{children}[$r]
…		…
746		869
747	for my $c (0 .. $#$row) {	870	for my $c (0 .. $#$row) {
748	my $col_w = $ws->[$c];	871	my $col_w = $ws->[$c];
749		872
750	if (my $widget = $row->[$c]) {	873	if (my $widget = $row->[$c]) {
751	$widget->size_allocate ($x, $y, $col_w, $row_h);	874	$widget->configure ($x, $y, $col_w, $row_h);
752	}	875	}
753		876
754	$x += $col_w;	877	$x += $col_w;
755	}	878	}
756		879
…		…
801	(List::Util::max map $_->[1], @alloc),	924	(List::Util::max map $_->[1], @alloc),
802	)	925	)
803	}	926	}
804		927
805	sub size_allocate {	928	sub size_allocate {
806	my ($self, $x, $y, $w, $h) = @_;	929	my ($self, $w, $h) = @_;
807
808	$self->_size_allocate ($x, $y, $w, $h);
809		930
810	($h, $w) = ($w, $h);	931	($h, $w) = ($w, $h);
811		932
812	my $children = $self->{children};	933	my $children = $self->{children};
813		934
…		…
829	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	950	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830	$h[$_] = $alloc_h;	951	$h[$_] = $alloc_h;
831	}	952	}
832	}	953	}
833		954
		955	CFClient::UI::harmonize \@h;
		956
834	my $y = 0;	957	my $y = 0;
835	for (0 .. $#$children) {	958	for (0 .. $#$children) {
836	my $child = $children->[$_];	959	my $child = $children->[$_];
837	my $h = int $h[$_];	960	my $h = $h[$_];
838	$child->size_allocate ($y, 0, $h, $w);	961	$child->configure ($y, 0, $h, $w);
839		962
840	$y += $h;	963	$y += $h;
841	}	964	}
		965
		966	1
842	}	967	}
843		968
844	#############################################################################	969	#############################################################################
845		970
846	package CFClient::UI::VBox;	971	package CFClient::UI::VBox;
…		…
859	(List::Util::sum map $_->[1], @alloc),	984	(List::Util::sum map $_->[1], @alloc),
860	)	985	)
861	}	986	}
862		987
863	sub size_allocate {	988	sub size_allocate {
864	my ($self, $x, $y, $w, $h) = @_;	989	my ($self, $w, $h) = @_;
865
866	$self->_size_allocate ($x, $y, $w, $h);
867		990
868	my $children = $self->{children};	991	my $children = $self->{children};
869		992
870	my @h = map +($_->size_request)[1], @$children;	993	my @h = map +($_->size_request)[1], @$children;
871		994
…		…
883		1006
884	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	1007	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885	}	1008	}
886	}	1009	}
887		1010
		1011	CFClient::UI::harmonize \@h;
		1012
888	my $y = 0;	1013	my $y = 0;
889	for (0 .. $#$children) {	1014	for (0 .. $#$children) {
890	my $child = $children->[$_];	1015	my $child = $children->[$_];
891	my $h = int $h[$_];	1016	my $h = $h[$_];
892	$child->size_allocate (0, $y, $w, $h);	1017	$child->configure (0, $y, $w, $h);
893		1018
894	$y += $h;	1019	$y += $h;
895	}	1020	}
		1021
		1022	1
896	}	1023	}
897		1024
898	#############################################################################	1025	#############################################################################
899		1026
900	package CFClient::UI::Label;	1027	package CFClient::UI::Label;
901		1028
902	our @ISA = CFClient::UI::Base::;	1029	our @ISA = CFClient::UI::Base::;
903		1030
904	use SDL::OpenGL;	1031	use CFClient::OpenGL;
905		1032
906	sub new {	1033	sub new {
907	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
908		1035
909	my $self = $class->SUPER::new (	1036	my $self = $class->SUPER::new (
910	fg => [1, 1, 1],	1037	fg => [1, 1, 1],
911	fontsize => $::FONTSIZE,	1038	fontsize => 1,
912	text => "",	1039	text => "",
913	align => -1,	1040	align => -1,
		1041	valign => -1,
914	padding => 2,	1042	padding => 2,
915	layout => new CFClient::Layout,	1043	layout => new CFClient::Layout,
916	%arg	1044	%arg
917	);	1045	);
918		1046
919	$self->set_text ($self->{text});	1047	if (exists $self->{template}) {
		1048	my $layout = new CFClient::Layout;
		1049	$layout->set_text (delete $self->{template});
		1050	$self->{template} = $layout;
		1051	}
		1052
		1053	$self->set_text (delete $self->{text}) if exists $self->{text};
		1054	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
920		1055
921	$self	1056	$self
922	}	1057	}
923		1058
924	sub escape_text {	1059	sub escape_text {
…		…
932	}	1067	}
933		1068
934	sub set_text {	1069	sub set_text {
935	my ($self, $text) = @_;	1070	my ($self, $text) = @_;
936		1071
937	$self->{text} = $text;
938	$self->{layout}->set_markup ($text);	1072	$self->{layout}->set_text ($text);
939		1073
940	delete $self->{texture};	1074	delete $self->{texture};
941	# $self->{w} = $self->{h} = -1;
942	$self->update;	1075	$self->update;
943	}	1076	}
944		1077
945	sub get_text {	1078	sub set_markup {
946	my ($self, $text) = @_;	1079	my ($self, $markup) = @_;
947		1080
948	$self->{text}	1081	$self->{layout}->set_markup ($markup);
		1082
		1083	delete $self->{texture};
		1084	$self->update;
949	}	1085	}
950		1086
951	sub size_request {	1087	sub size_request {
952	my ($self) = @_;	1088	my ($self) = @_;
953		1089
954	$self->{layout}->set_width;	1090	$self->{layout}->set_width;
955	$self->{layout}->set_height ($self->{fontsize});	1091	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1092
956	my ($w, $h) = $self->{layout}->size;	1093	my ($w, $h) = $self->{layout}->size;
		1094
		1095	if (exists $self->{template}) {
		1096	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1097
		1098	my ($w2, $h2) = $self->{template}->size;
		1099
		1100	$w = List::Util::max $w, $w2;
		1101	$h = List::Util::max $h, $h2;
		1102	}
957		1103
958	(	1104	(
959	$w + $self->{padding} * 2,	1105	$w + $self->{padding} * 2,
960	$h + $self->{padding} * 2,	1106	$h + $self->{padding} * 2,
961	)	1107	)
962	}	1108	}
963		1109
964	sub size_allocate {	1110	sub size_allocate {
965	my ($self, $x, $y, $w, $h) = @_;	1111	my ($self, $w, $h) = @_;
966
967	$self->_size_allocate ($x, $y, $w, $h) or return;
968		1112
969	delete $self->{texture};	1113	delete $self->{texture};
970	}	1114	}
971		1115
972	sub update {	1116	sub set_fontsize {
973	my ($self) = @_;	1117	my ($self, $fontsize) = @_;
974		1118
975	delete $self->{texture};	1119	$self->{fontsize} = $fontsize;
976	$self->SUPER::update;	1120	$self->update;
977	}	1121	}
978		1122
979	sub _draw {	1123	sub _draw {
980	my ($self) = @_;	1124	my ($self) = @_;
981		1125
982	my $tex = $self->{texture} \|\|= do {	1126	my $tex = $self->{texture} \|\|= do {
983	$self->{layout}->set_width ($self->{w});	1127	$self->{layout}->set_width ($self->{w});
984	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});	1128	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
985	new_from_layout CFClient::Texture $self->{layout}	1129	new_from_layout CFClient::Texture $self->{layout}
986	};	1130	};
987		1131
988	glEnable GL_BLEND;	1132	glEnable GL_BLEND;
989	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1133	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990	glEnable GL_TEXTURE_2D;	1134	glEnable GL_TEXTURE_2D;
991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1135	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
992		1136
993	glColor @{$self->{fg}};	1137	glColor @{$self->{fg}};
994		1138
995	my $x =	1139	$self->{ox} = int (
996	$self->{align} < 0 ? $self->{padding}	1140	$self->{align} < 0 ? $self->{padding}
997	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1141	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998	: ($self->{w} - $tex->{w}) * 0.5;	1142	: ($self->{w} - $tex->{w}) * 0.5
		1143	);
999		1144
1000	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1145	$self->{oy} = int (
		1146	$self->{valign} < 0 ? $self->{padding}
		1147	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1148	: ($self->{h} - $tex->{h}) * 0.5
		1149	);
		1150
		1151	$tex->draw_quad ($self->{ox}, $self->{oy});
1001		1152
1002	glDisable GL_TEXTURE_2D;	1153	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1154	glDisable GL_BLEND;
1004	}	1155	}
1005		1156
1006	#############################################################################	1157	#############################################################################
1007		1158
1008	package CFClient::UI::Entry;	1159	package CFClient::UI::EntryBase;
1009		1160
1010	our @ISA = CFClient::UI::Label::;	1161	our @ISA = CFClient::UI::Label::;
1011		1162
1012	use SDL;	1163	use CFClient::OpenGL;
1013	use SDL::OpenGL;
1014		1164
1015	sub new {	1165	sub new {
1016	my $class = shift;	1166	my $class = shift;
1017		1167
1018	$class->SUPER::new (	1168	$class->SUPER::new (
…		…
1020	bg => [0, 0, 0, 0.2],	1170	bg => [0, 0, 0, 0.2],
1021	active_bg => [1, 1, 1, 0.5],	1171	active_bg => [1, 1, 1, 0.5],
1022	active_fg => [0, 0, 0],	1172	active_fg => [0, 0, 0],
1023	can_hover => 1,	1173	can_hover => 1,
1024	can_focus => 1,	1174	can_focus => 1,
		1175	valign => 0,
1025	@_	1176	@_
1026	)	1177	)
1027	}	1178	}
1028		1179
1029	sub _set_text {	1180	sub _set_text {
1030	my ($self, $text) = @_;	1181	my ($self, $text) = @_;
1031		1182
1032	my $old_text = $self->{text};	1183	delete $self->{cur_h};
		1184
		1185	return if $self->{text} eq $text;
		1186
		1187	delete $self->{texture};
1033		1188
1034	$self->{last_activity} = $::NOW;	1189	$self->{last_activity} = $::NOW;
1035
1036	$self->{text} = $text;	1190	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});
1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039		1191
1040	$text =~ s/./*/g if $self->{hidden};	1192	$text =~ s/./*/g if $self->{hidden};
		1193	$self->{layout}->set_text ("$text ");
1041		1194
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1195	$self->emit (changed => $self->{text});
		1196	}
1043		1197
1044	$text = substr $text, 0, $self->{cursor};	1198	sub get_text {
1045	utf8::encode $text;	1199	$_[0]{text}
1046
1047	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050	if $old_text ne $self->{text};
1051	}	1200	}
1052		1201
1053	sub size_request {	1202	sub size_request {
1054	my ($self) = @_;	1203	my ($self) = @_;
1055		1204
…		…
1057		1206
1058	($w + 1, $h) # add 1 for cursor	1207	($w + 1, $h) # add 1 for cursor
1059	}	1208	}
1060		1209
1061	sub size_allocate {	1210	sub size_allocate {
1062	my ($self, $x, $y, $w, $h) = @_;	1211	my ($self, $w, $h) = @_;
1063
1064	$self->SUPER::size_allocate ($x, $y, $w, $h);
1065		1212
1066	$self->_set_text ($self->{text});	1213	$self->_set_text ($self->{text});
1067	}	1214	}
1068		1215
1069	sub set_text {	1216	sub set_text {
…		…
1075	}	1222	}
1076		1223
1077	sub key_down {	1224	sub key_down {
1078	my ($self, $ev) = @_;	1225	my ($self, $ev) = @_;
1079		1226
1080	my $mod = $ev->key_mod;	1227	my $mod = $ev->{mod};
1081	my $sym = $ev->key_sym;	1228	my $sym = $ev->{sym};
1082
1083	my $uni = $ev->key_unicode;	1229	my $uni = $ev->{unicode};
1084		1230
1085	my $text = $self->get_text;	1231	my $text = $self->get_text;
1086		1232
1087	if ($sym == SDLK_BACKSPACE) {	1233	if ($sym == 8) {
1088	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1234	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089	} elsif ($sym == SDLK_DELETE) {	1235	} elsif ($sym == 127) {
1090	substr $text, $self->{cursor}, 1, "";	1236	substr $text, $self->{cursor}, 1, "";
1091	} elsif ($sym == SDLK_LEFT) {	1237	} elsif ($sym == CFClient::SDLK_LEFT) {
1092	--$self->{cursor} if $self->{cursor};	1238	--$self->{cursor} if $self->{cursor};
1093	} elsif ($sym == SDLK_RIGHT) {	1239	} elsif ($sym == CFClient::SDLK_RIGHT) {
1094	++$self->{cursor} if $self->{cursor} < length $self->{text};	1240	++$self->{cursor} if $self->{cursor} < length $self->{text};
1095	} elsif ($sym == SDLK_HOME) {	1241	} elsif ($sym == CFClient::SDLK_HOME) {
1096	$self->{cursor} = 0;	1242	$self->{cursor} = 0;
1097	} elsif ($sym == SDLK_END) {	1243	} elsif ($sym == CFClient::SDLK_END) {
1098	$self->{cursor} = length $text;	1244	$self->{cursor} = length $text;
1099	} elsif ($sym == SDLK_ESCAPE) {	1245	} elsif ($sym == 27) {
1100	$self->emit ('escape');	1246	$self->emit ('escape');
1101	} elsif ($uni) {	1247	} elsif ($uni) {
1102	substr $text, $self->{cursor}++, 0, chr $uni;	1248	substr $text, $self->{cursor}++, 0, chr $uni;
1103	}	1249	}
1104		1250
…		…
1159		1305
1160	$self->SUPER::_draw;	1306	$self->SUPER::_draw;
1161		1307
1162	#TODO: force update every cursor change :(	1308	#TODO: force update every cursor change :(
1163	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1309	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1310
		1311	unless (exists $self->{cur_h}) {
		1312	my $text = substr $self->{text}, 0, $self->{cursor};
		1313	utf8::encode $text;
		1314
		1315	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1316	}
		1317
1164	glColor @{$self->{fg}};	1318	glColor @{$self->{fg}};
1165	glBegin GL_LINES;	1319	glBegin GL_LINES;
1166	glVertex $self->{cur_x}, $self->{cur_y};
1167	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1320	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1321	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1168	glEnd;	1322	glEnd;
1169	}	1323	}
1170	}	1324	}
1171		1325
1172	package CFClient::UI::LineEntry;	1326	package CFClient::UI::Entry;
1173		1327
1174	our @ISA = CFClient::UI::Entry::;	1328	our @ISA = CFClient::UI::EntryBase::;
1175		1329
1176	use SDL;	1330	use CFClient::OpenGL;
1177	use SDL::OpenGL;
1178		1331
1179	sub key_down {	1332	sub key_down {
1180	my ($self, $ev) = @_;	1333	my ($self, $ev) = @_;
1181		1334
1182	my $sym = $ev->key_sym;	1335	my $sym = $ev->{sym};
1183		1336
1184	if ($sym == SDLK_RETURN) {	1337	if ($sym == 13) {
1185	$self->emit (activate => $self->get_text);	1338	$self->emit (activate => $self->get_text);
1186	$self->update;	1339	$self->update;
1187		1340
1188	} else {	1341	} else {
1189	$self->SUPER::key_down ($ev);	1342	$self->SUPER::key_down ($ev);
…		…
1195		1348
1196	package CFClient::UI::Button;	1349	package CFClient::UI::Button;
1197		1350
1198	our @ISA = CFClient::UI::Label::;	1351	our @ISA = CFClient::UI::Label::;
1199		1352
1200	use SDL;	1353	use CFClient::OpenGL;
1201	use SDL::OpenGL;
1202		1354
1203	my @tex =	1355	my @tex =
1204	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1356	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1205	qw(b1_button_active.png);	1357	qw(b1_button_active.png);
1206		1358
1207	sub new {	1359	sub new {
1208	my $class = shift;	1360	my $class = shift;
1209		1361
1210	$class->SUPER::new (	1362	$class->SUPER::new (
1211	padding => 4,	1363	padding => 4,
1212	fg => [1, 1, 1],	1364	fg => [1, 1, 1],
1213	bg => [1, 1, 1, 0.2],	1365	bg => [1, 1, 1, 0.2],
1214	active_fg => [1, 1, 0],	1366	active_fg => [0, 0, 1],
1215	can_hover => 1,	1367	can_hover => 1,
		1368	align => 0,
		1369	valign => 0,
1216	@_	1370	@_
1217	)	1371	)
1218	}	1372	}
1219		1373
1220	sub button_up {	1374	sub button_up {
…		…
1228		1382
1229	sub _draw {	1383	sub _draw {
1230	my ($self) = @_;	1384	my ($self) = @_;
1231		1385
1232	local $self->{fg} = $self->{fg};	1386	local $self->{fg} = $self->{fg};
1233	my $tex = $tex[0];
1234
1235	glEnable GL_BLEND;
1236	glEnable GL_TEXTURE_2D;
1237	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238		1387
1239	if ($GRAB == $self) {	1388	if ($GRAB == $self) {
1240	$self->{fg} = $self->{active_fg};	1389	$self->{fg} = $self->{active_fg};
1241	}	1390	}
1242		1391
1243	glBindTexture GL_TEXTURE_2D, $tex->{name};	1392	glEnable GL_BLEND;
		1393	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1394	glEnable GL_TEXTURE_2D;
1244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1395	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1396	glColor 0, 0, 0, 1;
1245		1397
1246	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1398	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247		1399
1248	glDisable GL_TEXTURE_2D;	1400	glDisable GL_TEXTURE_2D;
1249	glDisable GL_BLEND;	1401	glDisable GL_BLEND;
1250		1402
1251	$self->SUPER::_draw;	1403	$self->SUPER::_draw;
…		…
1256	package CFClient::UI::CheckBox;	1408	package CFClient::UI::CheckBox;
1257		1409
1258	our @ISA = CFClient::UI::DrawBG::;	1410	our @ISA = CFClient::UI::DrawBG::;
1259		1411
1260	my @tex =	1412	my @tex =
1261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1413	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1262	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1414	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263		1415
1264	use SDL;	1416	use CFClient::OpenGL;
1265	use SDL::OpenGL;
1266		1417
1267	sub new {	1418	sub new {
1268	my $class = shift;	1419	my $class = shift;
1269		1420
1270	$class->SUPER::new (	1421	$class->SUPER::new (
…		…
1281	my ($self) = @_;	1432	my ($self) = @_;
1282		1433
1283	($self->{padding} * 2 + 6) x 2	1434	($self->{padding} * 2 + 6) x 2
1284	}	1435	}
1285		1436
1286	sub size_allocate {
1287	my ($self, $x, $y, $w, $h) = @_;
1288
1289	$self->_size_allocate ($x, $y, $w, $h);
1290	}
1291
1292	sub button_down {	1437	sub button_down {
1293	my ($self, $ev, $x, $y) = @_;	1438	my ($self, $ev, $x, $y) = @_;
1294		1439
1295	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1440	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1441	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1322	glDisable GL_BLEND;	1467	glDisable GL_BLEND;
1323	}	1468	}
1324		1469
1325	#############################################################################	1470	#############################################################################
1326		1471
		1472	package CFClient::UI::Image;
		1473
		1474	our @ISA = CFClient::UI::Base::;
		1475
		1476	use CFClient::OpenGL;
		1477	use Carp qw/confess/;
		1478
		1479	our %loaded_images;
		1480
		1481	sub new {
		1482	my $class = shift;
		1483
		1484	my $self = $class->SUPER::new (@_);
		1485
		1486	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1487
		1488	$loaded_images{$self->{image}} \|\|=
		1489	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1490
		1491	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1492
		1493	$self->{aspect} = $tex->{w} / $tex->{h};
		1494
		1495	$self
		1496	}
		1497
		1498	sub size_request {
		1499	my ($self) = @_;
		1500
		1501	($self->{tex}->{w}, $self->{tex}->{h})
		1502	}
		1503
		1504	sub _draw {
		1505	my ($self) = @_;
		1506
		1507	my $tex = $self->{tex};
		1508
		1509	my ($w, $h) = ($self->{w}, $self->{h});
		1510
		1511	if ($self->{rot90}) {
		1512	glRotate 90, 0, 0, 1;
		1513	glTranslate 0, -$self->{w}, 0;
		1514
		1515	($w, $h) = ($h, $w);
		1516	}
		1517
		1518	glEnable GL_BLEND;
		1519	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1520	glEnable GL_TEXTURE_2D;
		1521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1522
		1523	$tex->draw_quad (0, 0, $w, $h);
		1524
		1525	glDisable GL_BLEND;
		1526	glDisable GL_TEXTURE_2D;
		1527	}
		1528
		1529	#############################################################################
		1530
		1531	package CFClient::UI::VGauge;
		1532
		1533	our @ISA = CFClient::UI::Base::;
		1534
		1535	use CFClient::OpenGL;
		1536
		1537	my %tex = (
		1538	food => [
		1539	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1540	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1541	],
		1542	grace => [
		1543	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1544	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1545	],
		1546	hp => [
		1547	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1548	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1549	],
		1550	mana => [
		1551	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1552	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1553	],
		1554	);
		1555
		1556	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1557	sub new {
		1558	my $class = shift;
		1559
		1560	my $self = $class->SUPER::new (
		1561	type => 'food',
		1562	@_
		1563	);
		1564
		1565	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1566
		1567	$self
		1568	}
		1569
		1570	sub size_request {
		1571	my ($self) = @_;
		1572
		1573	#my $tex = $tex{$self->{type}}[0];
		1574	#@$tex{qw(w h)}
		1575	(0, 0)
		1576	}
		1577
		1578	sub set_max {
		1579	my ($self, $max) = @_;
		1580
		1581	$self->{max_val} = $max;
		1582	}
		1583
		1584	sub set_value {
		1585	my ($self, $val, $max) = @_;
		1586
		1587	$self->set_max ($max)
		1588	if defined $max;
		1589
		1590	$max = $self->{max_val};
		1591	$self->{val} = $val;
		1592
		1593	$self->update;
		1594	}
		1595
		1596	sub _draw {
		1597	my ($self) = @_;
		1598
		1599	my $tex = $tex{$self->{type}};
		1600
		1601	my ($w, $h) = ($self->{w}, $self->{h});
		1602
		1603	if ($self->{vertical}) {
		1604	glRotate 90, 0, 0, 1;
		1605	glTranslate 0, -$self->{w}, 0;
		1606
		1607	($w, $h) = ($h, $w);
		1608	}
		1609
		1610	my $ycut = $self->{val} / ($self->{max_val} \|\| 1);
		1611	$ycut = 1 if $self->{val} > $self->{max_val};
		1612
		1613	my $t1 = $tex->[0];
		1614	my $t2 = $tex->[1];
		1615
		1616	glEnable GL_BLEND;
		1617	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1618	glEnable GL_TEXTURE_2D;
		1619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1620
		1621	my $h1 = $self->{h} - $ycut * $self->{h};
		1622	my $h2 = $ycut * $self->{h};
		1623
		1624	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1625	glBegin GL_QUADS;
		1626	glTexCoord 0 , 0; glVertex 0 , 0;
		1627	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
		1628	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
		1629	glTexCoord $t1->{s}, 0; glVertex $w, 0;
		1630	glEnd;
		1631
		1632	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1633	glBegin GL_QUADS;
		1634	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
		1635	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
		1636	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
		1637	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
		1638	glEnd;
		1639
		1640	glDisable GL_BLEND;
		1641	glDisable GL_TEXTURE_2D;
		1642	}
		1643
		1644	#############################################################################
		1645
		1646	package CFClient::UI::Gauge;
		1647
		1648	our @ISA = CFClient::UI::VBox::;
		1649
		1650	sub new {
		1651	my ($class, %arg) = shift;
		1652
		1653	my $self = $class->SUPER::new (
		1654	@_,
		1655	);
		1656
		1657	$self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
		1658	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
		1659	$self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
		1660
		1661	$self
		1662	}
		1663
		1664	sub set_fontsize {
		1665	my ($self, $fsize) = @_;
		1666
		1667	$self->{value}->set_fontsize ($fsize);
		1668	$self->{max} ->set_fontsize ($fsize);
		1669	$self->update;
		1670	}
		1671
		1672	sub set_value {
		1673	my ($self, $val, $max) = @_;
		1674
		1675	$self->set_max ($max)
		1676	if defined $max;
		1677
		1678	$self->{gauge}->set_value ($val, $max);
		1679	$self->{value}->set_text ($val);
		1680	}
		1681
		1682	sub set_max {
		1683	my ($self, $max) = @_;
		1684
		1685	$self->{gauge}->set_max ($max);
		1686	$self->{max}->set_text ($max);
		1687	}
		1688
		1689	#############################################################################
		1690
1327	package CFClient::UI::Slider;	1691	package CFClient::UI::Slider;
1328		1692
1329	use strict;	1693	use strict;
1330		1694
1331	use SDL::OpenGL;	1695	use CFClient::OpenGL;
1332		1696
1333	our @ISA = CFClient::UI::DrawBG::;	1697	our @ISA = CFClient::UI::DrawBG::;
1334		1698
1335	my @tex =	1699	my @tex =
1336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1700	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1346	# TODO: calculations are off	1710	# TODO: calculations are off
1347	my $self = $class->SUPER::new (	1711	my $self = $class->SUPER::new (
1348	fg => [1, 1, 1],	1712	fg => [1, 1, 1],
1349	active_fg => [0, 0, 0],	1713	active_fg => [0, 0, 0],
1350	range => [0, 0, 100, 10],	1714	range => [0, 0, 100, 10],
1351	req_w => 40,	1715	req_w => 20,
1352	req_h => 13,	1716	req_h => 20,
1353	vertical => 0,	1717	vertical => 0,
1354	can_hover => 1,	1718	can_hover => 1,
1355	inner_pad => 5,	1719	inner_pad => 5,
1356	@_	1720	@_
1357	);	1721	);
…		…
1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1788	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1789	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426		1790
1427	my ($value, $lo, $hi, $page) = @{$self->{range}};	1791	my ($value, $lo, $hi, $page) = @{$self->{range}};
1428		1792
		1793	$hi = $value + 1 if $lo == $hi;
		1794
1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1795	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1796	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431		1797
1432	$page = int $page * $inner_w / ($hi - $lo);	1798	$page = int $page * $inner_w / ($hi - $lo);
1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1799	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1459		1825
1460	package CFClient::UI::TextView;	1826	package CFClient::UI::TextView;
1461		1827
1462	our @ISA = CFClient::UI::HBox::;	1828	our @ISA = CFClient::UI::HBox::;
1463		1829
1464	use SDL::OpenGL;	1830	use CFClient::OpenGL;
1465		1831
1466	sub new {	1832	sub new {
1467	my $class = shift;	1833	my $class = shift;
1468		1834
1469	my $self = $class->SUPER::new (	1835	my $self = $class->SUPER::new (
1470	req_w => $::WIDTH / 6,
1471	req_h => $::HEIGHT / 6,
1472	fontsize => $::FONTSIZE,	1836	fontsize => 1,
1473	@_,	1837	@_,
1474		1838
1475	layout => (new CFClient::Layout),	1839	layout => (new CFClient::Layout),
1476	par => [],	1840	par => [],
1477	height => 0,	1841	height => 0,
…		…
1479	(new CFClient::UI::Empty expand => 1),	1843	(new CFClient::UI::Empty expand => 1),
1480	(new CFClient::UI::Slider vertical => 1),	1844	(new CFClient::UI::Slider vertical => 1),
1481	],	1845	],
1482	);	1846	);
1483		1847
		1848	$self->{children}[1]->connect (changed => sub {
		1849	$self->update;
		1850	});
		1851
1484	$self	1852	$self
		1853	}
		1854
		1855	sub set_fontsize {
		1856	my ($self, $fontsize) = @_;
		1857
		1858	$self->{fontsize} = $fontsize;
		1859	$self->reflow;
1485	}	1860	}
1486		1861
1487	sub text_height {	1862	sub text_height {
1488	my ($self, $text) = @_;	1863	my ($self, $text) = @_;
1489		1864
1490	my $layout = $self->{layout};	1865	my $layout = $self->{layout};
1491		1866
1492	$layout->set_height ($self->{fontsize});	1867	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1493	$layout->set_width ($self->{w});	1868	$layout->set_width ($self->{w});
1494	$layout->set_text ($text);	1869	$layout->set_text ($text);
1495		1870
1496	($layout->size)[1]	1871	($layout->size)[1]
1497	}	1872	}
1498		1873
1499	sub reflow {	1874	sub reflow {
1500	my ($self) = @_;	1875	my ($self) = @_;
1501		1876
1502	my $height = 0;	1877	$self->{need_reflow}++;
1503		1878	$self->update;
1504	for (@{$self->{par}}) {
1505	$height += $_->[0] = $self->text_height ($_->[2]);
1506	}
1507
1508	$self->{height} = $height;
1509
1510	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511	}
1512
1513	sub size_request {
1514	my ($self) = @_;
1515
1516	($self->{req_w}, $self->{req_h})
1517	}	1879	}
1518		1880
1519	sub size_allocate {	1881	sub size_allocate {
1520	my ($self, $x, $y, $w, $h) = @_;	1882	my ($self, $w, $h) = @_;
1521		1883
1522	$self->SUPER::size_allocate ($x, $y, $w, $h);	1884	$self->SUPER::size_allocate ($w, $h);
1523		1885
1524	$self->{layout}->set_height ($self->{fontsize});	1886	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1525	$self->{layout}->set_width ($self->{w});	1887	$self->{layout}->set_width ($self->{children}[0]{w});
1526		1888
1527	$self->reflow;	1889	$self->reflow;
1528	$self->update;
1529	}	1890	}
1530		1891
1531	sub add_paragraph {	1892	sub add_paragraph {
1532	my ($self, $color, $text) = @_;	1893	my ($self, $color, $text) = @_;
1533		1894
…		…
1548		1909
1549	$self->SUPER::update;	1910	$self->SUPER::update;
1550		1911
1551	return unless $self->{h} > 0;	1912	return unless $self->{h} > 0;
1552		1913
		1914	delete $self->{texture};
		1915
		1916	$ROOT->on_refresh ($self, sub {
		1917	if (delete $self->{need_reflow}) {
		1918	my $height = 0;
		1919
		1920	$height += $_->[0] = $self->text_height ($_->[2])
		1921	for @{$self->{par}};
		1922
		1923	$self->{height} = $height;
		1924
		1925	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1926
		1927	delete $self->{texture};
		1928	}
		1929
1553	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1930	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554	glClearColor 0, 0, 0, 1;	1931	glClearColor 0, 0, 0, 1;
1555	glClear GL_COLOR_BUFFER_BIT;	1932	glClear GL_COLOR_BUFFER_BIT;
1556		1933
1557	my $y0 = $self->{height} - $self->{h};
1558	my $y1 = $self->{height};
1559
1560	glEnable GL_BLEND;	1934	glEnable GL_BLEND;
1561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1935	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562	glEnable GL_TEXTURE_2D;	1936	glEnable GL_TEXTURE_2D;
1563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564		1938
		1939	my $top = int $self->{children}[1]{range}[0];
		1940
		1941	my $y0 = $top;
		1942	my $y1 = $top + $self->{h};
		1943
1565	my $y = 0;	1944	my $y = 0;
1566		1945
1567	my $layout = $self->{layout};	1946	my $layout = $self->{layout};
1568		1947
1569	for my $par (@{$self->{par}}) {	1948	for my $par (@{$self->{par}}) {
1570	my $h = $par->[0];	1949	my $h = $par->[0];
1571		1950
1572	if ($y0 < $y + $h && $y < $y1) {	1951	if ($y0 < $y + $h && $y < $y1) {
1573	$layout->set_text ($par->[2]);	1952	$layout->set_text ($par->[2]);
1574		1953
1575	glColor @{ $par->[1] };	1954	glColor @{ $par->[1] };
1576	my ($W, $H) = $layout->size;	1955	my ($W, $H) = $layout->size;
1577	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1956	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1957	}
		1958
		1959	$y += $h;
1578	}	1960	}
1579		1961
1580	$y += $h;
1581	}
1582
1583	glDisable GL_TEXTURE_2D;	1962	glDisable GL_TEXTURE_2D;
1584	glDisable GL_BLEND;	1963	glDisable GL_BLEND;
		1964	};
1585	};	1965	});
1586	}	1966	}
1587		1967
1588	sub _draw {	1968	sub _draw {
1589	my ($self) = @_;	1969	my ($self) = @_;
1590		1970
…		…
1593	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1973	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	1974	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595	glDisable GL_TEXTURE_2D;	1975	glDisable GL_TEXTURE_2D;
1596	}	1976	}
1597		1977
1598	}	1978	$self->{children}[1]->draw;
1599		1979
1600	#############################################################################
1601
1602	package CFClient::UI::MapWidget;
1603
1604	use strict;
1605
1606	use List::Util qw(min max);
1607
1608	use SDL;
1609	use SDL::OpenGL;
1610
1611	our @ISA = CFClient::UI::Base::;
1612
1613	sub new {
1614	my $class = shift;
1615
1616	$class->SUPER::new (
1617	z => -1,
1618	can_focus => 1,
1619	list => (glGenLists 1),
1620	@_
1621	)
1622	}
1623
1624	sub key_down {
1625	print "MAPKEYDOWN\n";
1626	}
1627
1628	sub key_up {
1629	}
1630
1631	sub size_request {
1632	(
1633	1 + 32 * int $::WIDTH / 32,
1634	1 + 32 * int $::HEIGHT / 32,
1635	)
1636	}
1637
1638	sub update {
1639	my ($self) = @_;
1640
1641	$self->{need_update} = 1;
1642	$self->SUPER::update;
1643	}
1644
1645	sub draw {
1646	my ($self) = @_;
1647
1648	$self->{need_update}++;#d#
1649	if (delete $self->{need_update}) {
1650	glNewList $self->{list}, GL_COMPILE;
1651
1652	my $sw = int $::WIDTH / 32;
1653	my $sh = int $::HEIGHT / 32;
1654
1655	if ($::MAP) {
1656	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1657
1658	if ($::CFG->{fow_enable}) {
1659	if ($::CFG->{fow_smooth}) { # smooth fog of war
1660	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1661	glConvolutionFilter2D
1662	GL_CONVOLUTION_2D,
1663	GL_ALPHA,
1664	3, 3,
1665	GL_ALPHA, GL_FLOAT,
1666	pack "f*",
1667	0.1, 0.1, 0.1,
1668	0.1, 0.2, 0.1,
1669	0.1, 0.1, 0.1,
1670	;
1671	glEnable GL_CONVOLUTION_2D;
1672	}
1673
1674	my $tex = new CFClient::Texture
1675	w => $w,
1676	h => $h,
1677	data => $data,
1678	internalformat => GL_ALPHA,
1679	format => GL_ALPHA;
1680
1681	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682
1683	glEnable GL_BLEND;
1684	glEnable GL_TEXTURE_2D;
1685	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686
1687	glColor +($::CFG->{fow_intensity}) x 3, 1;
1688	$tex->draw_quad (0, 0, $w * 32, $h * 32);
1689
1690	glDisable GL_TEXTURE_2D;
1691	glDisable GL_BLEND;
1692	}
1693	}
1694
1695	glEndList;
1696	}
1697
1698	glCallList $self->{list};
1699
1700	if ($FOCUS != $self) {
1701	glColor 64/255, 64/255, 64/255;
1702	glLogicOp GL_AND;
1703	glEnable GL_COLOR_LOGIC_OP;
1704	glBegin GL_QUADS;
1705	glVertex 0, 0;
1706	glVertex 0, $::HEIGHT;
1707	glVertex $::WIDTH, $::HEIGHT;
1708	glVertex $::WIDTH, 0;
1709	glEnd;
1710	glDisable GL_COLOR_LOGIC_OP;
1711	}
1712	}
1713
1714	my %DIR = (
1715	SDLK_KP8, [1, "north"],
1716	SDLK_KP9, [2, "northeast"],
1717	SDLK_KP6, [3, "east"],
1718	SDLK_KP3, [4, "southeast"],
1719	SDLK_KP2, [5, "south"],
1720	SDLK_KP1, [6, "southwest"],
1721	SDLK_KP4, [7, "west"],
1722	SDLK_KP7, [8, "northwest"],
1723
1724	SDLK_UP, [1, "north"],
1725	SDLK_RIGHT, [3, "east"],
1726	SDLK_DOWN, [5, "south"],
1727	SDLK_LEFT, [7, "west"],
1728	);
1729
1730	sub key_down {
1731	my ($self, $ev) = @_;
1732
1733	my $mod = $ev->key_mod;
1734	my $sym = $ev->key_sym;
1735
1736	if ($sym == SDLK_KP5) {
1737	$::CONN->user_send ("command stay fire");
1738	} elsif ($sym == SDLK_a) {
1739	$::CONN->user_send ("command apply");
1740	} elsif ($sym == SDLK_QUOTE) {
1741	$self->emit ('activate_console');
1742	} elsif ($sym == SDLK_SLASH) {
1743	$self->emit ('activate_console' => '/');
1744	} elsif (exists $DIR{$sym}) {
1745	if ($mod & KMOD_SHIFT) {
1746	$self->{shft}++;
1747	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1748	} elsif ($mod & KMOD_CTRL) {
1749	$self->{ctrl}++;
1750	$::CONN->user_send ("command run $DIR{$sym}[0]");
1751	} else {
1752	$::CONN->user_send ("command $DIR{$sym}[1]");
1753	}
1754	}
1755	}
1756
1757	sub key_up {
1758	my ($self, $ev) = @_;
1759
1760	my $mod = $ev->key_mod;
1761	my $sym = $ev->key_sym;
1762
1763	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1764	$::CONN->user_send ("command fire_stop");
1765	}
1766	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1767	$::CONN->user_send ("command run_stop");
1768	}
1769	}	1980	}
1770		1981
1771	#############################################################################	1982	#############################################################################
1772		1983
1773	package CFClient::UI::Animator;	1984	package CFClient::UI::Animator;
1774		1985
1775	use SDL::OpenGL;	1986	use CFClient::OpenGL;
1776		1987
1777	our @ISA = CFClient::UI::Bin::;	1988	our @ISA = CFClient::UI::Bin::;
1778		1989
1779	sub moveto {	1990	sub moveto {
1780	my ($self, $x, $y) = @_;	1991	my ($self, $x, $y) = @_;
…		…
1836	sub toggle_flopper {	2047	sub toggle_flopper {
1837	my ($self) = @_;	2048	my ($self) = @_;
1838		2049
1839	# TODO: use animation	2050	# TODO: use animation
1840	if ($self->{state} = !$self->{state}) {	2051	if ($self->{state} = !$self->{state}) {
1841	$CFClient::UI::TOPLEVEL->add ($self->{other});	2052	$CFClient::UI::ROOT->add ($self->{other});
1842	$self->{other}->move (	2053	$self->{other}->move ($self->coord2global (0, $self->{h}));
1843	($::WIDTH - $self->{other}{w}) * 0.5,	2054	$self->emit ("open");
1844	($::HEIGHT - $self->{other}{h}) * 0.5,
1845	);
1846	} else {	2055	} else {
1847	$CFClient::UI::TOPLEVEL->remove ($self->{other});	2056	$CFClient::UI::ROOT->remove ($self->{other});
		2057	$self->emit ("close");
1848	}	2058	}
1849	}
1850		2059
1851	#############################################################################	2060	$self->emit (changed => $self->{state});
		2061	}
1852		2062
		2063	#############################################################################
		2064
1853	package CFClient::UI::Toplevel;	2065	package CFClient::UI::Root;
1854		2066
1855	our @ISA = CFClient::UI::Container::;	2067	our @ISA = CFClient::UI::Container::;
		2068
		2069	use CFClient::OpenGL;
		2070
		2071	sub check_size {
		2072	my ($self) = @_;
		2073
		2074	$self->configure (0, 0, $::WITH, $::HEIGHT);
		2075	}
1856		2076
1857	sub size_request {	2077	sub size_request {
1858	($::WIDTH, $::HEIGHT)	2078	($::WIDTH, $::HEIGHT)
1859	}	2079	}
1860		2080
1861	sub size_allocate {	2081	sub configure {
1862	my ($self, $x, $y, $w, $h) = @_;	2082	my ($self, $x, $y, $w, $h) = @_;
1863		2083
1864	$self->_size_allocate ($x, $y, $w, $h);	2084	$self->SUPER::configure ($x, $y, $w, $h);
1865		2085
1866	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2086	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1867	for @{$self->{children}};	2087	for @{$self->{children}};
1868	}	2088	}
1869		2089
1870	sub translate {	2090	sub _topleft {
1871	my ($self, $x, $y) = @_;	2091	my ($self, $x, $y) = @_;
1872		2092
1873	($x, $y)	2093	($x, $y)
1874	}	2094	}
1875		2095
1876	sub update {	2096	sub update {
1877	my ($self) = @_;	2097	my ($self) = @_;
1878		2098
1879	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2099	$self->check_size;
1880	::refresh ();	2100	::refresh ();
1881	}	2101	}
1882		2102
1883	sub add {	2103	sub add {
1884	my ($self, $widget) = @_;	2104	my ($self, $child) = @_;
1885		2105
		2106	# integerize window positions
		2107	$child->{x} = int $child->{x};
		2108	$child->{y} = int $child->{y};
		2109
1886	$self->SUPER::add ($widget);	2110	$self->SUPER::add ($child);
		2111	}
1887		2112
1888	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2113	sub on_refresh {
		2114	my ($self, $id, $cb) = @_;
		2115
		2116	$self->{refresh_hook}{$id} = $cb;
1889	}	2117	}
1890		2118
1891	sub draw {	2119	sub draw {
1892	my ($self) = @_;	2120	my ($self) = @_;
1893		2121
		2122	while (my $rcb = delete $self->{refresh_hook}) {
		2123	$_->() for values %$rcb;
		2124	}
		2125
		2126	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2127	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2128	glClear GL_COLOR_BUFFER_BIT;
		2129
		2130	glMatrixMode GL_PROJECTION;
		2131	glLoadIdentity;
		2132	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2133	glMatrixMode GL_MODELVIEW;
		2134	glLoadIdentity;
		2135
1894	$self->_draw;	2136	$self->_draw;
1895	}	2137	}
1896		2138
1897	#############################################################################	2139	#############################################################################
1898		2140
1899	package CFClient::UI;	2141	package CFClient::UI;
1900		2142
1901	$TOPLEVEL = new CFClient::UI::Toplevel;	2143	$ROOT = new CFClient::UI::Root;
1902		2144
1903	1	2145	1
1904		2146

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs. Revision 1.146 by elmex, Fri Apr 21 15:03:46 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.146 by elmex, Fri Apr 21 15:03:46 2006 UTC