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.133 by root, Tue Apr 18 21:39:31 2006 UTC vs.
Revision 1.193 by root, Wed May 10 21:12:26 2006 UTC

…		…
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 $ROOT;	12	our $ROOT;
		13	our $TOOLTIP;
13	our $BUTTON_STATE;	14	our $BUTTON_STATE;
		15
		16	sub check_tooltip {
		17	if (!$GRAB) {
		18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		19	if (length $widget->{tooltip}) {
		20
		21	if ($TOOLTIP->{owner} != $widget) {
		22	$TOOLTIP->{owner} = $widget;
		23
		24	my $tip = $widget->{tooltip};
		25
		26	$tip = $tip->($widget) if CODE:: eq ref $tip;
		27
		28	$TOOLTIP->set_markup ($widget->{tooltip});
		29
		30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	}
14		49
15	# class methods for events	50	# class methods for events
16	sub feed_sdl_key_down_event {	51	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		53	if $FOCUS;
18	}	54	}
19		55
20	sub feed_sdl_key_up_event {	56	sub feed_sdl_key_up_event {
21	$FOCUS->key_up ($_[0]) if $FOCUS;	57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		58	if $FOCUS;
22	}	59	}
23		60
24	sub feed_sdl_button_down_event {	61	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	62	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	63	my ($x, $y) = ($ev->{x}, $ev->{y});
27		64
28	if (!$BUTTON_STATE) {	65	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	66	my $widget = $ROOT->find_widget ($x, $y);
30		67
31	$GRAB = $widget;	68	$GRAB = $widget;
32	$GRAB->update if $GRAB;	69	$GRAB->update if $GRAB;
33	}
34		70
		71	check_tooltip;
		72	}
		73
35	$BUTTON_STATE |= 1 << ($ev->button - 1);	74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		75
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	76	if ($GRAB) {
		77	($x, $y) = $GRAB->coord2local ($x, $y);
		78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		79	}
38	}	80	}
39		81
40	sub feed_sdl_button_up_event {	82	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	83	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	84	my ($x, $y) = ($ev->{x}, $ev->{y});
43		85
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		87
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		89
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	90	if ($GRAB) {
		91	($x, $y) = $GRAB->coord2local ($x, $y);
		92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		93	}
49		94
50	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	97	$grab->update if $grab;
53	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
		99
		100	check_tooltip;
54	}	101	}
55	}	102	}
56		103
57	sub feed_sdl_motion_event {	104	sub feed_sdl_motion_event {
58	my ($ev) = @_;	105	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	106	my ($x, $y) = ($ev->{x}, $ev->{y});
60		107
61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	108	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		109
63	if ($widget != $HOVER) {	110	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	111	my $hover = $HOVER; $HOVER = $widget;
65		112
66	$hover->update if $hover && $hover->{can_hover};	113	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}
69		115
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	116	check_tooltip;
		117	}
		118
		119	if ($HOVER) {
		120	($x, $y) = $HOVER->coord2local ($x, $y);
		121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		122	}
71	}	123	}
72		124
73	# convert position array to integers	125	# convert position array to integers
74	sub harmonize {	126	sub harmonize {
75	my ($vals) = @_;	127	my ($vals) = @_;
…		…
87		139
88	package CFClient::UI::Base;	140	package CFClient::UI::Base;
89		141
90	use strict;	142	use strict;
91		143
92	use SDL::OpenGL;	144	use CFClient::OpenGL;
93		145
94	sub new {	146	sub new {
95	my $class = shift;	147	my $class = shift;
96		148
97	my $self = bless {	149	my $self = bless {
98	x => 0,	150	x => 0,
99	y => 0,	151	y => 0,
100	z => 0,	152	z => 0,
101	w => -1,	153	can_events => 1,
102	h => -1,
103	@_	154	@_
104	}, $class;	155	}, $class;
105		156
106	for (keys %$self) {	157	for (keys %$self) {
107	if (/^connect_(.*)$/) {	158	if (/^connect_(.*)$/) {
…		…
110	}	161	}
111		162
112	$self	163	$self
113	}	164	}
114		165
		166	sub destroy {
		167	my ($self) = @_;
		168
		169	$self->hide;
		170	%$self = ();
		171	}
		172
		173	sub show {
		174	my ($self) = @_;
		175
		176	return if $self->{parent};
		177
		178	$CFClient::UI::ROOT->add ($self);
		179	}
		180
		181	sub hide {
		182	my ($self) = @_;
		183
		184	undef $GRAB if $GRAB == $self;
		185	undef $HOVER if $HOVER == $self;
		186
		187	$self->{parent}->remove ($self)
		188	if $self->{parent};
		189	}
		190
115	sub move {	191	sub move {
116	my ($self, $x, $y, $z) = @_;	192	my ($self, $x, $y, $z) = @_;
117		193
118	$self->{x} = int $x;	194	$self->{x} = int $x;
119	$self->{y} = int $y;	195	$self->{y} = int $y;
120	$self->{z} = $z if defined $z;	196	$self->{z} = $z if defined $z;
121		197
122	$self->update;	198	$self->update;
123	}	199	}
124		200
125	sub needs_redraw {	201	sub set_size {
126	0	202	my ($self, $w, $h) = @_;
		203
		204	$self->{user_w} = $w;
		205	$self->{user_h} = $h;
		206
		207	$self->check_size;
127	}	208	}
128		209
129	sub size_request {	210	sub size_request {
130	require Carp;	211	require Carp;
131	Carp::confess "size_request is abtract";	212	Carp::confess "size_request is abstract";
132	}	213	}
133		214
134	sub configure {	215	sub configure {
135	my ($self, $x, $y, $w, $h) = @_;	216	my ($self, $x, $y, $w, $h) = @_;
136		217
		218	if ($self->{aspect}) {
		219	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		220	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		221
		222	# use alignment to adjust x, y
		223
		224	$x += int +($w - $w2) * 0.5;
		225	$y += int +($h - $h2) * 0.5;
		226
		227	($w, $h) = ($w2, $h2);
		228	}
		229
		230	if ($self->{x} != $x || $self->{y} != $y) {
137	$self->{x} = $x;	231	$self->{x} = $x;
138	$self->{y} = $y;	232	$self->{y} = $y;
		233	$self->update;
		234	}
139		235
140	return unless $self->{w} != $w || $self->{h} != $h;	236	if ($self->{w} != $w || $self->{h} != $h) {
141		237	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
142	$self->{w} = $w;	238	}
143	$self->{h} = $h;
144
145	$self->size_allocate ($w, $h);
146	}	239	}
147		240
148	sub size_allocate {	241	sub size_allocate {
149	# nothing to be done	242	# nothing to be done
150	}	243	}
151		244
152	# return top left coordinates	245	sub children {
153	sub _topleft {	246	}
		247
		248	# call when resolution changes etc.
		249	sub reconfigure {
		250	my ($self) = @_;
		251
		252	$_->reconfigure
		253	for $self->children;
		254
		255	$self->check_size;
		256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		257	$self->update;
		258	}
		259
		260	sub set_max_size {
154	my ($self, $x, $y) = @_;	261	my ($self, $w, $h) = @_;
155		262
156	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	263	delete $self->{max_w}; $self->{max_w} = $w if $w;
		264	delete $self->{max_h}; $self->{max_h} = $h if $h;
157	}	265	}
158		266
159	# translate global coordinates to local coordinate system	267	# translate global coordinates to local coordinate system
160	sub coord2local {	268	sub coord2local {
161	my ($self, $x, $y) = @_;	269	my ($self, $x, $y) = @_;
162		270
163	my ($X, $Y) = $self->_topleft;	271	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
164	($x - $X, $y - $Y)
165	}	272	}
166		273
167	# translate local coordinates to global coordinate system	274	# translate local coordinates to global coordinate system
168	sub coord2global {	275	sub coord2global {
169	my ($self, $x, $y) = @_;	276	my ($self, $x, $y) = @_;
170		277
171	my ($X, $Y) = $self->_topleft;	278	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
172	($x + $X, $y + $Y)
173	}	279	}
174		280
175	sub focus_in {	281	sub focus_in {
176	my ($self) = @_;	282	my ($self) = @_;
177		283
…		…
237	glVertex $x + $self->{w}, $y + $self->{h};	343	glVertex $x + $self->{w}, $y + $self->{h};
238	glVertex $x , $y + $self->{h};	344	glVertex $x , $y + $self->{h};
239	glEnd;	345	glEnd;
240	glDisable GL_BLEND;	346	glDisable GL_BLEND;
241	}	347	}
		348
		349	if ($ENV{PCLIENT_DEBUG}) {
		350	glPushMatrix;
		351	glColor 1, 1, 0, 1;
		352	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		353	glBegin GL_LINE_LOOP;
		354	glVertex 0 , 0;
		355	glVertex $self->{w}, 0;
		356	glVertex $self->{w}, $self->{h};
		357	glVertex 0 , $self->{h};
		358	glEnd;
		359	glPopMatrix;
		360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		361	}
242	}	362	}
243		363
244	sub _draw {	364	sub _draw {
245	my ($self) = @_;	365	my ($self) = @_;
246		366
247	warn "no draw defined for $self\n";	367	warn "no draw defined for $self\n";
248	}	368	}
249		369
250	sub find_widget {	370	sub find_widget {
251	my ($self, $x, $y) = @_;	371	my ($self, $x, $y) = @_;
		372
		373	return () unless $self->{can_events};
252		374
253	return $self	375	return $self
254	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	376	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	377	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
256		378
…		…
259		381
260	sub set_parent {	382	sub set_parent {
261	my ($self, $parent) = @_;	383	my ($self, $parent) = @_;
262		384
263	Scalar::Util::weaken ($self->{parent} = $parent);	385	Scalar::Util::weaken ($self->{parent} = $parent);
		386
		387	$self->check_size
		388	unless exists $self->{req_w};
264	}	389	}
265		390
266	sub check_size {	391	sub check_size {
267	my ($self) = @_;	392	my ($self) = @_;
268		393
269	my ($w, $h) = $self->size_request;	394	$CFClient::UI::ROOT->{check_size}{$self} = $self;
270
271	if ($w != $self->{req_w} || $h != $self->{req_h}) {
272	$self->{req_w} = $w;
273	$self->{req_h} = $h;
274
275	$self->{parent}->check_size
276	if $self->{parent};
277
278	$self->size_allocate ($w, $h);
279	$self->update;
280	}
281	}	395	}
282		396
283	sub update {	397	sub update {
284	my ($self) = @_;	398	my ($self) = @_;
285		399
…		…
294	}	408	}
295		409
296	sub emit {	410	sub emit {
297	my ($self, $signal, @args) = @_;	411	my ($self, $signal, @args) = @_;
298		412
299	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	413	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300	$cb->($self, @args);
301	}
302	}	414	}
303		415
304	sub DESTROY {	416	sub DESTROY {
305	my ($self) = @_;	417	my ($self) = @_;
306		418
…		…
312	package CFClient::UI::DrawBG;	424	package CFClient::UI::DrawBG;
313		425
314	our @ISA = CFClient::UI::Base::;	426	our @ISA = CFClient::UI::Base::;
315		427
316	use strict;	428	use strict;
317	use SDL::OpenGL;	429	use CFClient::OpenGL;
318		430
319	sub new {	431	sub new {
320	my $class = shift;	432	my $class = shift;
321		433
322	# range [value, low, high, page]	434	# range [value, low, high, page]
…		…
351		463
352	package CFClient::UI::Empty;	464	package CFClient::UI::Empty;
353		465
354	our @ISA = CFClient::UI::Base::;	466	our @ISA = CFClient::UI::Base::;
355		467
		468	sub new {
		469	my ($class, %arg) = @_;
		470	$class->SUPER::new (can_events => 0, %arg);
		471	}
		472
356	sub size_request {	473	sub size_request {
357	(0, 0)	474	(0, 0)
358	}	475	}
359		476
360	sub draw { }	477	sub draw { }
…		…
368	sub new {	485	sub new {
369	my ($class, %arg) = @_;	486	my ($class, %arg) = @_;
370		487
371	my $children = delete $arg{children} || [];	488	my $children = delete $arg{children} || [];
372		489
373	my $self = $class->SUPER::new (children => [], %arg);	490	my $self = $class->SUPER::new (
		491	children => [],
		492	can_events => 0,
		493	%arg,
		494	);
374	$self->add ($_) for @$children;	495	$self->add ($_) for @$children;
375		496
376	$self	497	$self
377	}	498	}
378		499
379	sub add {	500	sub add {
380	my ($self, $child) = @_;	501	my ($self, @widgets) = @_;
381		502
382	$child->set_parent ($self);	503	$_->set_parent ($self)
		504	for @widgets;
383		505
384	use sort 'stable';	506	use sort 'stable';
385		507
386	$self->{children} = [	508	$self->{children} = [
387	sort { $a->{z} <=> $b->{z} }	509	sort { $a->{z} <=> $b->{z} }
388	@{$self->{children}}, $child	510	@{$self->{children}}, @widgets
389	];	511	];
390		512
391	$self->{w} = $self->{h} = -1;
392
393	$child->check_size;	513	$self->check_size;
		514	$self->update;
		515	}
		516
		517	sub children {
		518	@{ $_[0]{children} }
394	}	519	}
395		520
396	sub remove {	521	sub remove {
397	my ($self, $widget) = @_;	522	my ($self, $child) = @_;
398		523
		524	delete $child->{parent};
		525	$child->hide;
		526
399	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	527	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400		528
401	$self->check_size;	529	$self->check_size;
		530	$self->update;
		531	}
		532
		533	sub clear {
		534	my ($self) = @_;
		535
		536	my $children = delete $self->{children};
		537	$self->{children} = [];
		538
		539	for (@$children) {
		540	delete $_->{parent};
		541	$_->hide;
		542	}
		543
		544	$self->check_size;
		545	$self->update;
402	}	546	}
403		547
404	sub find_widget {	548	sub find_widget {
405	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
406		550
…		…
436		580
437	$class->SUPER::new (children => [$child], %arg)	581	$class->SUPER::new (children => [$child], %arg)
438	}	582	}
439		583
440	sub add {	584	sub add {
441	my ($self, $widget) = @_;	585	my ($self, $child) = @_;
442		586
443	$self->{children} = [];	587	$self->{children} = [];
444		588
445	$self->SUPER::add ($widget);	589	$self->SUPER::add ($child);
446	}	590	}
447		591
448	sub remove {	592	sub remove {
449	my ($self, $widget) = @_;	593	my ($self, $widget) = @_;
450		594
…		…
470		614
471	package CFClient::UI::Window;	615	package CFClient::UI::Window;
472		616
473	our @ISA = CFClient::UI::Bin::;	617	our @ISA = CFClient::UI::Bin::;
474		618
475	use SDL::OpenGL;	619	use CFClient::OpenGL;
476		620
477	sub new {	621	sub new {
478	my ($class, %arg) = @_;	622	my ($class, %arg) = @_;
479		623
480	my $self = $class->SUPER::new (%arg);	624	my $self = $class->SUPER::new (%arg);
481	}	625	}
482		626
483	sub update {	627	sub update {
484	my ($self) = @_;	628	my ($self) = @_;
485		629
486	# we want to do this delayed...	630	$ROOT->on_refresh ($self => sub { $self->render_child });
487	$self->render_chld;
488	$self->SUPER::update;	631	$self->SUPER::update;
489	}
490
491	sub render_chld {
492	my ($self) = @_;
493
494	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
495	glClearColor 0, 0, 0, 1;
496	glClear GL_COLOR_BUFFER_BIT;
497	$self->child->draw;
498	};
499	}	632	}
500		633
501	sub size_allocate {	634	sub size_allocate {
502	my ($self, $w, $h) = @_;	635	my ($self, $w, $h) = @_;
503		636
504	$self->child->configure (0, 0, $w, $h);	637	$self->SUPER::size_allocate ($w, $h);
		638	$self->update;
		639	}
505		640
		641	sub _render {
		642	$_[0]{children}[0]->draw;
		643	}
		644
		645	sub render_child {
		646	my ($self) = @_;
		647
		648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		649	glClearColor 0, 0, 0, 0;
		650	glClear GL_COLOR_BUFFER_BIT;
		651
506	$self->render_chld;	652	$self->_render;
		653	# glColorMask 1, 1, 1, 0;
		654	# glEnable GL_BLEND;
		655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		656	# glRasterPos 0, 0;
		657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		658	# glDisable GL_BLEND;
		659	# glColorMask 1, 1, 1, 1;
		660	};
507	}	661	}
508		662
509	sub _draw {	663	sub _draw {
510	my ($self) = @_;	664	my ($self) = @_;
511		665
512	my ($w, $h) = ($self->w, $self->h);	666	my ($w, $h) = ($self->w, $self->h);
513		667
514	my $tex = $self->{texture}	668	my $tex = $self->{texture}
515	or return;	669	or return;
		670
		671	glEnable GL_BLEND;
		672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		673	glEnable GL_TEXTURE_2D;
		674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		675	glColor 0, 0, 0, 1;
		676
		677	$tex->draw_quad (0, 0, $w, $h);
		678
		679	glDisable GL_BLEND;
		680	glDisable GL_TEXTURE_2D;
		681	}
		682
		683	#############################################################################
		684
		685	package CFClient::UI::ViewPort;
		686
		687	our @ISA = CFClient::UI::Window::;
		688
		689	sub size_request {
		690	my ($self) = @_;
		691
		692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
		694
		695	@$self{qw(child_w child_h)}
		696	}
		697
		698	sub size_allocate {
		699	my ($self, $w, $h) = @_;
		700
		701	$self->update;
		702	}
		703
		704	sub set_offset {
		705	my ($self, $x, $y) = @_;
		706
		707	$self->{view_x} = int $x;
		708	$self->{view_y} = int $y;
		709
		710	$self->update;
		711	}
		712
		713	# hmm, this does not work for topleft of $self... but we should not ask for that
		714	sub coord2local {
		715	my ($self, $x, $y) = @_;
		716
		717	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		718	}
		719
		720	sub coord2global {
		721	my ($self, $x, $y) = @_;
		722
		723	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		724	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		725
		726	$self->SUPER::coord2global ($x, $y)
		727	}
		728
		729	sub find_widget {
		730	my ($self, $x, $y) = @_;
		731
		732	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		733	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		734	) {
		735	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		736	} else {
		737	$self->CFClient::UI::Base::find_widget ($x, $y)
		738	}
		739	}
		740
		741	sub _render {
		742	my ($self) = @_;
		743
		744	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		745
		746	$self->SUPER::_render;
		747	}
		748
		749	#############################################################################
		750
		751	package CFClient::UI::ScrolledWindow;
		752
		753	our @ISA = CFClient::UI::HBox::;
		754
		755	sub new {
		756	my $class = shift;
		757
		758	my $self;
		759
		760	my $slider = new CFClient::UI::Slider
		761	vertical => 1,
		762	range => [0, 0, 1, 0.01], # HACK fix
		763	connect_changed => sub {
		764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		765	},
		766	;
		767
		768	$self = $class->SUPER::new (
		769	vp => (new CFClient::UI::ViewPort),
		770	slider => $slider,
		771	@_,
		772	);
		773
		774	$self->{vp}->add ($self->{scrolled});
		775	$self->add ($self->{vp});
		776	$self->add ($self->{slider});
		777
		778	$self
		779	}
		780
		781	#TODO# update range on size_allocate depeneing on child
		782	# update viewport offset on scroll
		783
		784	#############################################################################
		785
		786	package CFClient::UI::Frame;
		787
		788	our @ISA = CFClient::UI::Bin::;
		789
		790	use CFClient::OpenGL;
		791
		792	sub new {
		793	my $class = shift;
		794
		795	my $self = $class->SUPER::new (
		796	bg => [1, 1, 1, 1],
		797	border_bg => [1, 1, 1, 1],
		798	border => 0.8,
		799	@_
		800	);
		801
		802	$self
		803	}
		804
		805	sub _draw {
		806	my ($self) = @_;
		807
		808	my ($w, $h) = ($self->{w}, $self->{h});
516		809
517	glEnable GL_BLEND;	810	glEnable GL_BLEND;
518	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
519	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
521		814
522	$tex->draw_quad (0, 0, $w, $h);	815	# glBegin GL_QUADS;
		816	# glColor 0, 0, 0, 0;
		817	# glVertex 0 , 0;
		818	# glVertex 0 , $h;
		819	# glVertex $w, $h;
		820	# glVertex $w, 0;
		821	# glEnd;
523		822
		823
		824	$self->child->draw;
524	glDisable GL_BLEND;	825	glDisable GL_BLEND;
525	glDisable GL_TEXTURE_2D;	826	glDisable GL_TEXTURE_2D;
526	}	827	}
527		828
528	#############################################################################	829	#############################################################################
529		830
530	package CFClient::UI::ViewPort;
531
532	our @ISA = CFClient::UI::Window::;
533
534	sub new { die }
535
536	sub size_request {
537	my ($self) = @_;
538
539	@$self{qw(child_w child_h)} = $self->child->size_request;
540	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541
542	@$self{qw(child_w child_h)}
543	}
544
545	sub _draw {
546	my ($self) = @_;
547
548	$self->{children}[1]->draw;
549	}
550
551
552	#############################################################################
553
554	package CFClient::UI::Frame;	831	package CFClient::UI::FancyFrame;
555		832
556	our @ISA = CFClient::UI::Bin::;	833	our @ISA = CFClient::UI::Bin::;
557		834
558	use SDL::OpenGL;	835	use CFClient::OpenGL;
559
560	sub size_request {
561	my ($self) = @_;
562	my $chld = $self->child
563	or return (0, 0);
564
565	$chld->move (2, 2);
566
567	map { $_ + 4 } $chld->size_request;
568	}
569
570	sub size_allocate {
571	my ($self, $x, $y, $w, $h) = @_;
572
573	$self->child->configure (2, 2, $w - 4, $h - 4);
574	}
575
576	sub _draw {
577	my ($self) = @_;
578
579	my $chld = $self->child;
580
581	my ($w, $h) = $chld->size_request;
582
583	glBegin GL_QUADS;
584	glColor 0, 0, 0;
585	glVertex 0 , 0;
586	glVertex 0 , $h + 4;
587	glVertex $w + 4 , $h + 4;
588	glVertex $w + 4 , 0;
589	glEnd;
590
591	$chld->draw;
592	}
593
594	#############################################################################
595
596	package CFClient::UI::FancyFrame;
597
598	our @ISA = CFClient::UI::Bin::;
599
600	use SDL::OpenGL;
601		836
602	my @tex =	837	my @tex =
603	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	838	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
604	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	839	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605		840
606	sub new {	841	sub new {
607	my $class = shift;	842	my $class = shift;
608		843
609	# TODO: user_x, user_y, overwrite moveto?	844	# TODO: user_x, user_y, overwrite moveto?
610		845
611	$class->SUPER::new (	846	my $self = $class->SUPER::new (
612	bg => [1, 1, 1, 1],	847	bg => [1, 1, 1, 1],
613	border_bg => [1, 1, 1, 1],	848	border_bg => [1, 1, 1, 1],
614	border => int $::FONTSIZE * 0.8,	849	border => 0.6,
		850	can_events => 1,
615	@_	851	@_
616	)	852	);
		853
		854	$self->{title} &&= new CFClient::UI::Label
		855	align => 0,
		856	valign => 1,
		857	text => $self->{title},
		858	fontsize => $self->{border};
		859
		860	$self
		861	}
		862
		863	sub border {
		864	int $_[0]{border} * $::FONTSIZE
617	}	865	}
618		866
619	sub size_request {	867	sub size_request {
620	my ($self) = @_;	868	my ($self) = @_;
621		869
622	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624	my ($w, $h) = $self->SUPER::size_request;	870	my ($w, $h) = $self->SUPER::size_request;
625		871
626	(	872	(
627	$w + $self->{border} * 2,	873	$w + $self->border * 2,
628	$h + $self->{border} * 2,	874	$h + $self->border * 2,
629	)	875	)
630	}	876	}
631		877
632	sub size_allocate {	878	sub size_allocate {
633	my ($self, $w, $h) = @_;	879	my ($self, $w, $h) = @_;
634		880
635	$h -= List::Util::max 0, $self->{border} * 2;	881	$h -= List::Util::max 0, $self->border * 2;
636	$w -= List::Util::max 0, $self->{border} * 2;	882	$w -= List::Util::max 0, $self->border * 2;
637		883
		884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		885	if $self->{title};
		886
638	$self->child->configure ($self->{border}, $self->{border}, $w, $h);	887	$self->child->configure ($self->border, $self->border, $w, $h);
639	}	888	}
640		889
641	sub button_down {	890	sub button_down {
642	my ($self, $ev, $x, $y) = @_;	891	my ($self, $ev, $x, $y) = @_;
643		892
644	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	893	my ($w, $h) = @$self{qw(w h)};
645	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	894	my $border = $self->border;
646		895
		896	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
		897	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
		898
		899	if ($lr & $td) {
		900	my ($wx, $wy) = ($self->{x}, $self->{y});
647	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	901	my ($ox, $oy) = ($ev->{x}, $ev->{y});
648	my ($bw, $bh) = ($self->{w}, $self->{h});	902	my ($bw, $bh) = ($self->{w}, $self->{h});
		903
		904	my $mx = $x < $border;
		905	my $my = $y < $border;
649		906
650	$self->{motion} = sub {	907	$self->{motion} = sub {
651	my ($ev, $x, $y) = @_;	908	my ($ev, $x, $y) = @_;
652		909
653	($x, $y) = ($ev->motion_x, $ev->motion_y);	910	my $dx = $ev->{x} - $ox;
		911	my $dy = $ev->{y} - $oy;
654		912
655	$self->{user_w} = $bw + $x - $ox;	913	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
656	$self->{user_h} = $bh + $y - $oy;	914	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		915	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
657	$self->check_size;	916	$self->check_size;
658	};	917	};
659		918
660	} elsif ($x >= 0 && $x < $self->{w}	919	} elsif ($lr ^ $td) {
661	&& $y >= 0 && $y < $self->{border}) {
662
663	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	920	my ($ox, $oy) = ($ev->{x}, $ev->{y});
664	my ($bx, $by) = ($self->{x}, $self->{y});	921	my ($bx, $by) = ($self->{x}, $self->{y});
665		922
666	$self->{motion} = sub {	923	$self->{motion} = sub {
667	my ($ev, $x, $y) = @_;	924	my ($ev, $x, $y) = @_;
668		925
669	($x, $y) = ($ev->motion_x, $ev->motion_y);	926	($x, $y) = ($ev->{x}, $ev->{y});
670		927
671	$self->move ($bx + $x - $ox, $by + $y - $oy);	928	$self->move ($bx + $x - $ox, $by + $y - $oy);
672	$self->update;	929	$self->update;
673	};	930	};
674	}	931	}
…		…
695	glEnable GL_BLEND;	952	glEnable GL_BLEND;
696	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697	glEnable GL_TEXTURE_2D;	954	glEnable GL_TEXTURE_2D;
698	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699		956
		957	my $border = $self->border;
		958
700	glColor @{ $self->{border_bg} };	959	glColor @{ $self->{border_bg} };
701	$tex[1]->draw_quad (0, 0, $w, $self->{border});	960	$tex[1]->draw_quad (0, 0, $w, $border);
702	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	961	$tex[3]->draw_quad (0, $border, $border, $ch);
703	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	963	$tex[4]->draw_quad (0, $h - $border, $w, $border);
705		964
		965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
706	my $bg = $tex[0];	966	my $bg = $tex[0];
707		967
708	# TODO: repeat texture not scale	968	# TODO: repeat texture not scale
709	my $rep_x = $cw / $bg->{w};	969	my $rep_x = $cw / $bg->{w};
710	my $rep_y = $ch / $bg->{h};	970	my $rep_y = $ch / $bg->{h};
711		971
712	glColor @{ $self->{bg} };	972	glColor @{ $self->{bg} };
713		973
714	$bg->{s} = $rep_x;	974	$bg->{s} = $rep_x;
715	$bg->{t} = $rep_y;	975	$bg->{t} = $rep_y;
716	$bg->{wrap_mode} = 1;	976	$bg->{wrap_mode} = 1;
717	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	977	$bg->draw_quad ($border, $border, $cw, $ch);
718		978
719	glDisable GL_TEXTURE_2D;	979	glDisable GL_TEXTURE_2D;
720	glDisable GL_BLEND;	980	glDisable GL_BLEND;
		981	}
		982
		983	$self->{title}->draw if $self->{title};
721		984
722	$self->child->draw;	985	$self->child->draw;
723	}	986	}
724		987
725	#############################################################################	988	#############################################################################
…		…
728		991
729	our @ISA = CFClient::UI::Base::;	992	our @ISA = CFClient::UI::Base::;
730		993
731	use List::Util qw(max sum);	994	use List::Util qw(max sum);
732		995
733	use SDL::OpenGL;	996	use CFClient::OpenGL;
734		997
735	sub new {	998	sub new {
736	my $class = shift;	999	my $class = shift;
737		1000
738	$class->SUPER::new (	1001	$class->SUPER::new (
…		…
745	my ($self, $x, $y, $child) = @_;	1008	my ($self, $x, $y, $child) = @_;
746		1009
747	$child->set_parent ($self);	1010	$child->set_parent ($self);
748	$self->{children}[$y][$x] = $child;	1011	$self->{children}[$y][$x] = $child;
749		1012
750	$self->{w} = $self->{h} = -1;
751
752	$child->check_size;	1013	$child->check_size;
		1014	}
		1015
		1016	sub children {
		1017	grep $_, map @$_, grep $_, @{ $_[0]{children} }
753	}	1018	}
754		1019
755	# TODO: move to container class maybe? send childs a signal on removal?	1020	# TODO: move to container class maybe? send childs a signal on removal?
756	sub clear {	1021	sub clear {
757	my ($self) = @_;	1022	my ($self) = @_;
758		1023
		1024	my @children = $self->children;
759	delete $self->{children};	1025	delete $self->{children};
		1026
		1027	for (@children) {
		1028	delete $_->{parent};
		1029	$_->hide;
		1030	}
		1031
760	$self->update;	1032	$self->update;
761	}	1033	}
762		1034
763	sub get_wh {	1035	sub get_wh {
764	my ($self) = @_;	1036	my ($self) = @_;
…		…
770	or next;	1042	or next;
771		1043
772	for my $x (0 .. $#$row) {	1044	for my $x (0 .. $#$row) {
773	my $widget = $row->[$x]	1045	my $widget = $row->[$x]
774	or next;	1046	or next;
775	my ($w, $h) = $widget->size_request;	1047	my ($w, $h) = @$widget{qw(req_w req_h)};
776		1048
777	$w[$x] = max $w[$x], $w;	1049	$w[$x] = max $w[$x], $w;
778	$h[$y] = max $h[$y], $h;	1050	$h[$y] = max $h[$y], $h;
779	}	1051	}
780	}	1052	}
…		…
885		1157
886	($h, $w) = ($w, $h);	1158	($h, $w) = ($w, $h);
887		1159
888	my $children = $self->{children};	1160	my $children = $self->{children};
889		1161
890	my @h = map +($_->size_request)[0], @$children;	1162	my @h = map $_->{req_w}, @$children;
891		1163
892	my $req_h = List::Util::sum @h;	1164	my $req_h = List::Util::sum @h;
893		1165
894	if ($req_h > $h) {	1166	if ($req_h > $h) {
895	# ah well, not enough space	1167	# ah well, not enough space
…		…
941	}	1213	}
942		1214
943	sub size_allocate {	1215	sub size_allocate {
944	my ($self, $w, $h) = @_;	1216	my ($self, $w, $h) = @_;
945		1217
		1218	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1219
946	my $children = $self->{children};	1220	my $children = $self->{children};
947		1221
948	my @h = map +($_->size_request)[1], @$children;	1222	my @h = map $_->{req_h}, @$children;
949		1223
950	my $req_h = List::Util::sum @h;	1224	my $req_h = List::Util::sum @h;
951		1225
952	if ($req_h > $h) {	1226	if ($req_h > $h) {
953	# ah well, not enough space	1227	# ah well, not enough space
…		…
981		1255
982	package CFClient::UI::Label;	1256	package CFClient::UI::Label;
983		1257
984	our @ISA = CFClient::UI::Base::;	1258	our @ISA = CFClient::UI::Base::;
985		1259
986	use SDL::OpenGL;	1260	use CFClient::OpenGL;
987		1261
988	sub new {	1262	sub new {
989	my ($class, %arg) = @_;	1263	my ($class, %arg) = @_;
990		1264
991	my $self = $class->SUPER::new (	1265	my $self = $class->SUPER::new (
992	fg => [1, 1, 1],	1266	fg => [1, 1, 1],
993	fontsize => $::FONTSIZE,	1267	#font => default_font
		1268	fontsize => 1,
994	text => "",	1269	text => "",
995	align => -1,	1270	align => -1,
996	valign => -1,	1271	valign => -1,
997	padding => 2,	1272	padding => 2,
998	layout => new CFClient::Layout,	1273	layout => new CFClient::Layout,
		1274	can_events => 0,
999	%arg	1275	%arg
1000	);	1276	);
1001		1277
1002	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1278	if (exists $self->{template}) {
		1279	my $layout = new CFClient::Layout;
		1280	$layout->set_text (delete $self->{template});
		1281	$self->{template} = $layout;
		1282	}
1003		1283
1004	$self->set_text (delete $self->{text}) if exists $self->{text};	1284	$self->set_text (delete $self->{text}) if exists $self->{text};
1005	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1285	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006		1286
1007	$self	1287	$self
1008	}	1288	}
1009		1289
1010	sub escape_text {	1290	sub escape {
1011	local $_ = $_[1];	1291	local $_ = $_[1];
1012		1292
1013	s/&/&amp;/g;	1293	s/&/&amp;/g;
1014	s/>/&gt;/g;	1294	s/>/&gt;/g;
1015	s/</&lt;/g;	1295	s/</&lt;/g;
1016		1296
1017	$_[1]	1297	$_[1]
1018	}	1298	}
1019		1299
		1300	sub update {
		1301	my ($self) = @_;
		1302
		1303	delete $self->{texture};
		1304	$self->SUPER::update;
		1305	}
		1306
1020	sub set_text {	1307	sub set_text {
1021	my ($self, $text) = @_;	1308	my ($self, $text) = @_;
1022		1309
		1310	return if $self->{text} eq "T$text";
		1311	$self->{text} = "T$text";
		1312
1023	$self->{layout}->set_text ($text);	1313	$self->{layout}->set_text ($text);
1024		1314
1025	delete $self->{texture};
1026	$self->update;	1315	$self->update;
		1316	$self->check_size;
1027	}	1317	}
1028		1318
1029	sub set_markup {	1319	sub set_markup {
1030	my ($self, $markup) = @_;	1320	my ($self, $markup) = @_;
1031		1321
		1322	return if $self->{text} eq "M$markup";
		1323	$self->{text} = "M$markup";
		1324
1032	$self->{layout}->set_markup ($markup);	1325	$self->{layout}->set_markup ($markup);
1033		1326
1034	delete $self->{texture};
1035	$self->update;	1327	$self->update;
		1328	$self->check_size;
1036	}	1329	}
1037		1330
1038	sub size_request {	1331	sub size_request {
1039	my ($self) = @_;	1332	my ($self) = @_;
1040		1333
1041	$self->{layout}->set_width;	1334	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1335	$self->{layout}->set_width ($self->{max_w} || -1);
1042	$self->{layout}->set_height ($self->{fontsize});	1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043		1337
1044	my ($w, $h) = $self->{layout}->size;	1338	my ($w, $h) = $self->{layout}->size;
		1339
		1340	if (exists $self->{template}) {
		1341	$self->{template}->set_font ($self->{font}) if $self->{font};
		1342	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1343
		1344	my ($w2, $h2) = $self->{template}->size;
		1345
		1346	$w = List::Util::max $w, $w2;
		1347	$h = List::Util::max $h, $h2;
		1348	}
1045		1349
1046	(	1350	(
1047	$w + $self->{padding} * 2,	1351	$w + $self->{padding} * 2,
1048	$h + $self->{padding} * 2,	1352	$h + $self->{padding} * 2,
1049	)	1353	)
…		…
1053	my ($self, $w, $h) = @_;	1357	my ($self, $w, $h) = @_;
1054		1358
1055	delete $self->{texture};	1359	delete $self->{texture};
1056	}	1360	}
1057		1361
1058	sub update {	1362	sub set_fontsize {
1059	my ($self) = @_;	1363	my ($self, $fontsize) = @_;
1060		1364
		1365	$self->{fontsize} = $fontsize;
1061	delete $self->{texture};	1366	delete $self->{texture};
		1367
1062	$self->SUPER::update;	1368	$self->update;
		1369	$self->check_size;
1063	}	1370	}
1064		1371
1065	sub _draw {	1372	sub _draw {
1066	my ($self) = @_;	1373	my ($self) = @_;
1067		1374
1068	my $tex = $self->{texture} ||= do {	1375	my $tex = $self->{texture} ||= do {
		1376	$self->{layout}->set_font ($self->{font}) if $self->{font};
1069	$self->{layout}->set_width ($self->{w});	1377	$self->{layout}->set_width ($self->{w});
1070	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1378	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071	new_from_layout CFClient::Texture $self->{layout}	1379	new_from_layout CFClient::Texture $self->{layout}
1072	};	1380	};
1073		1381
1074	glEnable GL_BLEND;	1382	glEnable GL_BLEND;
1075	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1383	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1100		1408
1101	package CFClient::UI::EntryBase;	1409	package CFClient::UI::EntryBase;
1102		1410
1103	our @ISA = CFClient::UI::Label::;	1411	our @ISA = CFClient::UI::Label::;
1104		1412
1105	use SDL;	1413	use CFClient::OpenGL;
1106	use SDL::OpenGL;
1107		1414
1108	sub new {	1415	sub new {
1109	my $class = shift;	1416	my $class = shift;
1110		1417
1111	$class->SUPER::new (	1418	$class->SUPER::new (
1112	fg => [1, 1, 1],	1419	fg => [1, 1, 1],
1113	bg => [0, 0, 0, 0.2],	1420	bg => [0, 0, 0, 0.2],
1114	active_bg => [1, 1, 1, 0.5],	1421	active_bg => [1, 1, 1, 0.5],
1115	active_fg => [0, 0, 0],	1422	active_fg => [0, 0, 0],
1116	can_hover => 1,	1423	can_hover => 1,
1117	can_focus => 1,	1424	can_focus => 1,
1118	valign => 0,	1425	valign => 0,
		1426	can_events => 1,
1119	@_	1427	@_
1120	)	1428	)
1121	}	1429	}
1122		1430
1123	sub _set_text {	1431	sub _set_text {
…		…
1125		1433
1126	delete $self->{cur_h};	1434	delete $self->{cur_h};
1127		1435
1128	return if $self->{text} eq $text;	1436	return if $self->{text} eq $text;
1129		1437
		1438	delete $self->{texture};
		1439
1130	$self->{last_activity} = $::NOW;	1440	$self->{last_activity} = $::NOW;
1131	$self->{text} = $text;	1441	$self->{text} = $text;
1132		1442
1133	$text =~ s/./*/g if $self->{hidden};	1443	$text =~ s/./*/g if $self->{hidden};
1134	$self->{layout}->set_text ("$text ");	1444	$self->{layout}->set_text ("$text ");
…		…
1149	}	1459	}
1150		1460
1151	sub size_allocate {	1461	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1462	my ($self, $w, $h) = @_;
1153		1463
1154	$self->_set_text ($self->{text});	1464	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155	}	1465	}
1156		1466
1157	sub set_text {	1467	sub set_text {
1158	my ($self, $text) = @_;	1468	my ($self, $text) = @_;
1159		1469
…		…
1163	}	1473	}
1164		1474
1165	sub key_down {	1475	sub key_down {
1166	my ($self, $ev) = @_;	1476	my ($self, $ev) = @_;
1167		1477
1168	my $mod = $ev->key_mod;	1478	my $mod = $ev->{mod};
1169	my $sym = $ev->key_sym;	1479	my $sym = $ev->{sym};
1170
1171	my $uni = $ev->key_unicode;	1480	my $uni = $ev->{unicode};
1172		1481
1173	my $text = $self->get_text;	1482	my $text = $self->get_text;
1174		1483
1175	if ($sym == SDLK_BACKSPACE) {	1484	if ($sym == 8) {
1176	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1485	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177	} elsif ($sym == SDLK_DELETE) {	1486	} elsif ($sym == 127) {
1178	substr $text, $self->{cursor}, 1, "";	1487	substr $text, $self->{cursor}, 1, "";
1179	} elsif ($sym == SDLK_LEFT) {	1488	} elsif ($sym == CFClient::SDLK_LEFT) {
1180	--$self->{cursor} if $self->{cursor};	1489	--$self->{cursor} if $self->{cursor};
1181	} elsif ($sym == SDLK_RIGHT) {	1490	} elsif ($sym == CFClient::SDLK_RIGHT) {
1182	++$self->{cursor} if $self->{cursor} < length $self->{text};	1491	++$self->{cursor} if $self->{cursor} < length $self->{text};
1183	} elsif ($sym == SDLK_HOME) {	1492	} elsif ($sym == CFClient::SDLK_HOME) {
1184	$self->{cursor} = 0;	1493	$self->{cursor} = 0;
1185	} elsif ($sym == SDLK_END) {	1494	} elsif ($sym == CFClient::SDLK_END) {
1186	$self->{cursor} = length $text;	1495	$self->{cursor} = length $text;
1187	} elsif ($sym == SDLK_ESCAPE) {	1496	} elsif ($sym == 27) {
1188	$self->emit ('escape');	1497	$self->emit ('escape');
1189	} elsif ($uni) {	1498	} elsif ($uni) {
1190	substr $text, $self->{cursor}++, 0, chr $uni;	1499	substr $text, $self->{cursor}++, 0, chr $uni;
1191	}	1500	}
1192		1501
…		…
1267		1576
1268	package CFClient::UI::Entry;	1577	package CFClient::UI::Entry;
1269		1578
1270	our @ISA = CFClient::UI::EntryBase::;	1579	our @ISA = CFClient::UI::EntryBase::;
1271		1580
1272	use SDL;	1581	use CFClient::OpenGL;
1273	use SDL::OpenGL;
1274		1582
1275	sub key_down {	1583	sub key_down {
1276	my ($self, $ev) = @_;	1584	my ($self, $ev) = @_;
1277		1585
1278	my $sym = $ev->key_sym;	1586	my $sym = $ev->{sym};
1279		1587
1280	if ($sym == SDLK_RETURN) {	1588	if ($sym == 13) {
		1589	unshift @{$self->{history}},
		1590	my $txt = $self->get_text;
		1591	$self->{history_pointer} = -1;
		1592	$self->{history_saveback} = '';
1281	$self->emit (activate => $self->get_text);	1593	$self->emit (activate => $txt);
1282	$self->update;	1594	$self->update;
		1595
		1596	} elsif ($sym == CFClient::SDLK_UP) {
		1597	if ($self->{history_pointer} < 0) {
		1598	$self->{history_saveback} = $self->get_text;
		1599	}
		1600	if (@{$self->{history} || []} > 0) {
		1601	$self->{history_pointer}++;
		1602	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1603	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1604	}
		1605	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1606	}
		1607
		1608	} elsif ($sym == CFClient::SDLK_DOWN) {
		1609	$self->{history_pointer}--;
		1610	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1611
		1612	if ($self->{history_pointer} >= 0) {
		1613	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1614	} else {
		1615	$self->set_text ($self->{history_saveback});
		1616	}
1283		1617
1284	} else {	1618	} else {
1285	$self->SUPER::key_down ($ev);	1619	$self->SUPER::key_down ($ev);
1286	}	1620	}
1287		1621
…		…
1291		1625
1292	package CFClient::UI::Button;	1626	package CFClient::UI::Button;
1293		1627
1294	our @ISA = CFClient::UI::Label::;	1628	our @ISA = CFClient::UI::Label::;
1295		1629
1296	use SDL;	1630	use CFClient::OpenGL;
1297	use SDL::OpenGL;
1298		1631
1299	my @tex =	1632	my @tex =
1300	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1633	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301	qw(b1_button_active.png);	1634	qw(b1_button_active.png);
1302		1635
1303	sub new {	1636	sub new {
1304	my $class = shift;	1637	my $class = shift;
1305		1638
1306	$class->SUPER::new (	1639	$class->SUPER::new (
1307	padding => 4,	1640	padding => 4,
1308	fg => [1, 1, 1],	1641	fg => [1, 1, 1],
1309	bg => [1, 1, 1, 0.2],	1642	bg => [1, 1, 1, 0.2],
1310	active_fg => [0, 0, 1],	1643	active_fg => [0, 0, 1],
1311	can_hover => 1,	1644	can_hover => 1,
1312	align => 0,	1645	align => 0,
1313	valign => 0,	1646	valign => 0,
		1647	can_events => 1,
1314	@_	1648	@_
1315	)	1649	)
1316	}	1650	}
1317		1651
1318	sub button_up {	1652	sub button_up {
…		…
1352	package CFClient::UI::CheckBox;	1686	package CFClient::UI::CheckBox;
1353		1687
1354	our @ISA = CFClient::UI::DrawBG::;	1688	our @ISA = CFClient::UI::DrawBG::;
1355		1689
1356	my @tex =	1690	my @tex =
1357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1691	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1692	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359		1693
1360	use SDL;	1694	use CFClient::OpenGL;
1361	use SDL::OpenGL;
1362		1695
1363	sub new {	1696	sub new {
1364	my $class = shift;	1697	my $class = shift;
1365		1698
1366	$class->SUPER::new (	1699	$class->SUPER::new (
…		…
1412	glDisable GL_BLEND;	1745	glDisable GL_BLEND;
1413	}	1746	}
1414		1747
1415	#############################################################################	1748	#############################################################################
1416		1749
1417	package CFClient::UI::VGauge;	1750	package CFClient::UI::Image;
1418		1751
1419	our @ISA = CFClient::UI::Base::;	1752	our @ISA = CFClient::UI::Base::;
1420		1753
1421	use SDL::OpenGL;	1754	use CFClient::OpenGL;
		1755	use Carp qw/confess/;
1422		1756
1423	my %tex = (	1757	our %loaded_images;
1424	food => [
1425	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427	],
1428	grace => [
1429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431	],
1432	hp => [
1433	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435	],
1436	mana => [
1437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439	],
1440	);
1441		1758
1442	# eg. VGauge->new (gauge => 'food'), default gauge: food
1443	sub new {	1759	sub new {
1444	my $class = shift;	1760	my $class = shift;
1445		1761
1446	my $self = $class->SUPER::new (gauge => 'food', @_);	1762	my $self = $class->SUPER::new (can_events => 0, @_);
		1763
		1764	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1765
		1766	$loaded_images{$self->{image}} ||=
		1767	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1768
		1769	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1770
		1771	Scalar::Util::weaken $loaded_images{$self->{image}};
		1772
		1773	$self->{aspect} = $tex->{w} / $tex->{h};
1447		1774
1448	$self	1775	$self
1449	}	1776	}
1450		1777
1451	sub size_request {	1778	sub size_request {
1452	my ($self) = @_;	1779	my ($self) = @_;
1453		1780
1454	my $tex = $tex{$self->{gauge}}[0];	1781	($self->{tex}->{w}, $self->{tex}->{h})
1455
1456	@$tex{qw(w h)}
1457	}
1458
1459	sub set_max {
1460	my ($self, $max) = @_;
1461
1462	$self->{max_val} = $max;
1463	}
1464
1465	sub set_value {
1466	my ($self, $val, $max) = @_;
1467
1468	$self->set_max ($max)
1469	if defined $max;
1470
1471	$max = $self->{max_val};
1472	$self->{val} = $val;
1473
1474	$self->update;
1475	}	1782	}
1476		1783
1477	sub _draw {	1784	sub _draw {
1478	my ($self) = @_;	1785	my ($self) = @_;
1479		1786
1480	my $tex = $tex{$self->{gauge}};	1787	my $tex = $self->{tex};
1481		1788
1482	my ($w, $h) = ($self->{w}, $self->{h});	1789	my ($w, $h) = ($self->{w}, $self->{h});
1483		1790
1484	my $ycut = $self->{val} / ($self->{max_val} || 1);	1791	if ($self->{rot90}) {
1485	$ycut = 1 if $self->{val} > $self->{max_val};	1792	glRotate 90, 0, 0, 1;
		1793	glTranslate 0, -$self->{w}, 0;
1486		1794
1487	my $t1 = $tex->[0];	1795	($w, $h) = ($h, $w);
1488	my $t2 = $tex->[1];	1796	}
1489		1797
1490	glEnable GL_BLEND;	1798	glEnable GL_BLEND;
1491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1799	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492	glEnable GL_TEXTURE_2D;	1800	glEnable GL_TEXTURE_2D;
1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494		1802
		1803	$tex->draw_quad (0, 0, $w, $h);
		1804
		1805	glDisable GL_BLEND;
		1806	glDisable GL_TEXTURE_2D;
		1807	}
		1808
		1809	#############################################################################
		1810
		1811	package CFClient::UI::VGauge;
		1812
		1813	our @ISA = CFClient::UI::Base::;
		1814
		1815	use List::Util qw(min max);
		1816
		1817	use CFClient::OpenGL;
		1818
		1819	my %tex = (
		1820	food => [
		1821	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1822	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1823	],
		1824	grace => [
		1825	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1826	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1827	],
		1828	hp => [
		1829	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1830	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1831	],
		1832	mana => [
		1833	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1834	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1835	],
		1836	);
		1837
		1838	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1839	sub new {
		1840	my $class = shift;
		1841
		1842	my $self = $class->SUPER::new (
		1843	type => 'food',
		1844	@_
		1845	);
		1846
		1847	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1848
		1849	$self
		1850	}
		1851
		1852	sub size_request {
		1853	my ($self) = @_;
		1854
		1855	#my $tex = $tex{$self->{type}}[0];
		1856	#@$tex{qw(w h)}
		1857	(0, 0)
		1858	}
		1859
		1860	sub set_max {
		1861	my ($self, $max) = @_;
		1862
		1863	return if $self->{max_val} == $max;
		1864
		1865	$self->{max_val} = $max;
		1866	$self->update;
		1867	}
		1868
		1869	sub set_value {
		1870	my ($self, $val, $max) = @_;
		1871
		1872	$self->set_max ($max)
		1873	if defined $max;
		1874
		1875	return if $self->{val} == $val;
		1876
		1877	$self->{val} = $val;
		1878	$self->update;
		1879	}
		1880
		1881	sub _draw {
		1882	my ($self) = @_;
		1883
		1884	my $tex = $tex{$self->{type}};
		1885	my ($t1, $t2, $t3) = @$tex;
		1886
		1887	my ($w, $h) = ($self->{w}, $self->{h});
		1888
		1889	if ($self->{vertical}) {
		1890	glRotate 90, 0, 0, 1;
		1891	glTranslate 0, -$self->{w}, 0;
		1892
		1893	($w, $h) = ($h, $w);
		1894	}
		1895
		1896	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1897
		1898	my $ycut1 = max 0, min 1, $ycut;
		1899	my $ycut2 = max 0, min 1, $ycut - 1;
		1900
1495	my $h1 = $self->{h} - $ycut * $self->{h};	1901	my $h1 = $self->{h} * (1 - $ycut1);
1496	my $h2 = $ycut * $self->{h};	1902	my $h2 = $self->{h} * (1 - $ycut2);
1497		1903
1498	my $yp = 0;	1904	glEnable GL_BLEND;
		1905	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1906	glEnable GL_TEXTURE_2D;
		1907	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499		1908
1500	glBindTexture GL_TEXTURE_2D, $t1->{name};	1909	glBindTexture GL_TEXTURE_2D, $t1->{name};
1501	glBegin GL_QUADS;	1910	glBegin GL_QUADS;
1502	glTexCoord 0 , 0; glVertex 0 , $yp;	1911	glTexCoord 0 , 0; glVertex 0 , 0;
1503	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;	1912	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;	1913	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;	1914	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506	glEnd;	1915	glEnd;
1507		1916
1508	$yp += $h1;	1917	my $ycut1 = List::Util::min 1, $ycut;
1509
1510	glBindTexture GL_TEXTURE_2D, $t2->{name};	1918	glBindTexture GL_TEXTURE_2D, $t2->{name};
1511	glBegin GL_QUADS;	1919	glBegin GL_QUADS;
1512	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;	1920	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;	1921	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1514	glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;	1922	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1923	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516	glEnd;	1924	glEnd;
		1925
		1926	if ($t3) {
		1927	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1928	glBegin GL_QUADS;
		1929	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1930	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1931	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1932	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1933	glEnd;
		1934	}
1517		1935
1518	glDisable GL_BLEND;	1936	glDisable GL_BLEND;
1519	glDisable GL_TEXTURE_2D;	1937	glDisable GL_TEXTURE_2D;
1520	}	1938	}
1521		1939
1522	#############################################################################	1940	#############################################################################
1523		1941
		1942	package CFClient::UI::Gauge;
		1943
		1944	our @ISA = CFClient::UI::VBox::;
		1945
		1946	sub new {
		1947	my ($class, %arg) = @_;
		1948
		1949	my $self = $class->SUPER::new (
		1950	tooltip => $arg{type},
		1951	can_hover => 1,
		1952	can_events => 1,
		1953	%arg,
		1954	);
		1955
		1956	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
		1957	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
		1958	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
		1959
		1960	$self
		1961	}
		1962
		1963	sub set_fontsize {
		1964	my ($self, $fsize) = @_;
		1965
		1966	$self->{value}->set_fontsize ($fsize);
		1967	$self->{max} ->set_fontsize ($fsize);
		1968	}
		1969
		1970	sub set_max {
		1971	my ($self, $max) = @_;
		1972
		1973	$self->{gauge}->set_max ($max);
		1974	$self->{max}->set_text ($max);
		1975	}
		1976
		1977	sub set_value {
		1978	my ($self, $val, $max) = @_;
		1979
		1980	$self->set_max ($max)
		1981	if defined $max;
		1982
		1983	$self->{gauge}->set_value ($val, $max);
		1984	$self->{value}->set_text ($val);
		1985	}
		1986
		1987	#############################################################################
		1988
1524	package CFClient::UI::Slider;	1989	package CFClient::UI::Slider;
1525		1990
1526	use strict;	1991	use strict;
1527		1992
1528	use SDL::OpenGL;	1993	use CFClient::OpenGL;
1529		1994
1530	our @ISA = CFClient::UI::DrawBG::;	1995	our @ISA = CFClient::UI::DrawBG::;
1531		1996
1532	my @tex =	1997	my @tex =
1533	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1998	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1543	# TODO: calculations are off	2008	# TODO: calculations are off
1544	my $self = $class->SUPER::new (	2009	my $self = $class->SUPER::new (
1545	fg => [1, 1, 1],	2010	fg => [1, 1, 1],
1546	active_fg => [0, 0, 0],	2011	active_fg => [0, 0, 0],
1547	range => [0, 0, 100, 10],	2012	range => [0, 0, 100, 10],
1548	req_w => 40,	2013	req_w => $::WIDTH / 80,
1549	req_h => 13,	2014	req_h => $::WIDTH / 80,
1550	vertical => 0,	2015	vertical => 0,
1551	can_hover => 1,	2016	can_hover => 1,
1552	inner_pad => 5,	2017	inner_pad => 5,
1553	@_	2018	@_
1554	);	2019	);
…		…
1658		2123
1659	package CFClient::UI::TextView;	2124	package CFClient::UI::TextView;
1660		2125
1661	our @ISA = CFClient::UI::HBox::;	2126	our @ISA = CFClient::UI::HBox::;
1662		2127
1663	use SDL::OpenGL;	2128	use CFClient::OpenGL;
1664		2129
1665	sub new {	2130	sub new {
1666	my $class = shift;	2131	my $class = shift;
1667		2132
1668	my $self = $class->SUPER::new (	2133	my $self = $class->SUPER::new (
1669	req_w => $::WIDTH / 6,	2134	fontsize => 1,
1670	req_h => $::HEIGHT / 6,	2135	can_events => 0,
1671	fontsize => $::FONTSIZE,	2136	#font => default_font
1672	@_,	2137	@_,
1673		2138
1674	layout => (new CFClient::Layout),	2139	layout => (new CFClient::Layout),
1675	par => [],	2140	par => [],
1676	height => 0,	2141	height => 0,
1677	children => [	2142	children => [
1678	(new CFClient::UI::Empty expand => 1),	2143	(new CFClient::UI::Empty expand => 1),
1679	(new CFClient::UI::Slider vertical => 1),	2144	(new CFClient::UI::Slider vertical => 1),
1680	],	2145	],
1681	);	2146	);
1682		2147
1683	$self->{children}[1]->connect (changed => sub {	2148	$self->{children}[1]->connect (changed => sub { $self->update });
1684	$self->update;
1685	});
1686		2149
1687	$self	2150	$self
1688	}	2151	}
1689		2152
1690	sub set_fontsize {	2153	sub set_fontsize {
…		…
1697	sub text_height {	2160	sub text_height {
1698	my ($self, $text) = @_;	2161	my ($self, $text) = @_;
1699		2162
1700	my $layout = $self->{layout};	2163	my $layout = $self->{layout};
1701		2164
1702	$layout->set_height ($self->{fontsize});	2165	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703	$layout->set_width ($self->{w});	2166	$layout->set_width ($self->{children}[0]{w});
1704	$layout->set_text ($text);	2167	$layout->set_text ($text);
1705		2168
1706	($layout->size)[1]	2169	($layout->size)[1]
1707	}	2170	}
1708		2171
…		…
1711		2174
1712	$self->{need_reflow}++;	2175	$self->{need_reflow}++;
1713	$self->update;	2176	$self->update;
1714	}	2177	}
1715		2178
1716	sub size_request {
1717	my ($self) = @_;
1718
1719	($self->{req_w}, $self->{req_h})
1720	}
1721
1722	sub size_allocate {	2179	sub size_allocate {
1723	my ($self, $w, $h) = @_;	2180	my ($self, $w, $h) = @_;
1724		2181
		2182	$self->SUPER::size_allocate ($w, $h);
		2183
		2184	$self->{layout}->set_font ($self->{font}) if $self->{font};
1725	$self->{layout}->set_height ($self->{fontsize});	2185	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726	$self->{layout}->set_width ($self->{w});	2186	$self->{layout}->set_width ($self->{children}[0]{w});
1727		2187
1728	$self->reflow;	2188	$self->reflow;
1729	$self->update;
1730	}	2189	}
1731		2190
1732	sub add_paragraph {	2191	sub add_paragraph {
1733	my ($self, $color, $text) = @_;	2192	my ($self, $color, $text) = @_;
1734		2193
…		…
1765	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2224	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1766		2225
1767	delete $self->{texture};	2226	delete $self->{texture};
1768	}	2227	}
1769		2228
1770	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2229	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1771	glClearColor 0, 0, 0, 1;	2230	glClearColor 0, 0, 0, 0;
1772	glClear GL_COLOR_BUFFER_BIT;	2231	glClear GL_COLOR_BUFFER_BIT;
1773		2232
1774	glEnable GL_BLEND;	2233	glEnable GL_BLEND;
1775	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2234	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1776	glEnable GL_TEXTURE_2D;	2235	glEnable GL_TEXTURE_2D;
…		…
1783		2242
1784	my $y = 0;	2243	my $y = 0;
1785		2244
1786	my $layout = $self->{layout};	2245	my $layout = $self->{layout};
1787		2246
		2247	$layout->set_font ($self->{font}) if $self->{font};
		2248
1788	for my $par (@{$self->{par}}) {	2249	for my $par (@{$self->{par}}) {
1789	my $h = $par->[0];	2250	my $h = $par->[0];
1790		2251
1791	if ($y0 < $y + $h && $y < $y1) {	2252	if ($y0 < $y + $h && $y < $y1) {
1792	$layout->set_text ($par->[2]);	2253	$layout->set_text ($par->[2]);
…		…
1806	}	2267	}
1807		2268
1808	sub _draw {	2269	sub _draw {
1809	my ($self) = @_;	2270	my ($self) = @_;
1810		2271
1811	if ($self->{texture}) {	2272	glEnable GL_BLEND;
		2273	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1812	glEnable GL_TEXTURE_2D;	2274	glEnable GL_TEXTURE_2D;
1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2275	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2276	glColor 1, 1, 1, 1;
1814	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2277	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1815	glDisable GL_TEXTURE_2D;	2278	glDisable GL_TEXTURE_2D;
1816	}	2279	glDisable GL_BLEND;
1817		2280
1818	$self->{children}[1]->draw;	2281	$self->{children}[1]->draw;
1819		2282
1820	}	2283	}
1821		2284
1822	#############################################################################	2285	#############################################################################
1823		2286
1824	package CFClient::UI::MapWidget;
1825
1826	use strict;
1827
1828	use List::Util qw(min max);
1829
1830	use SDL;
1831	use SDL::OpenGL;
1832
1833	our @ISA = CFClient::UI::Base::;
1834
1835	sub new {
1836	my $class = shift;
1837
1838	$class->SUPER::new (
1839	z => -1,
1840	can_focus => 1,
1841	list => (glGenLists 1),
1842	@_
1843	)
1844	}
1845
1846	sub key_down {
1847	print "MAPKEYDOWN\n";
1848	}
1849
1850	sub key_up {
1851	}
1852
1853	sub button_down {
1854	my ($self, $ev, $x, $y) = @_;
1855
1856	$self->focus_in;
1857
1858	if ($ev->button == 2) {
1859	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862	$self->{motion} = sub {
1863	my ($ev, $x, $y) = @_;
1864
1865	($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867	$::CFG->{map_shift_x} = $bw + $x - $ox;
1868	$::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870	$self->update;
1871	};
1872	}
1873	}
1874
1875	sub button_up {
1876	my ($self, $ev, $x, $y) = @_;
1877
1878	delete $self->{motion};
1879	}
1880
1881	sub mouse_motion {
1882	my ($self, $ev, $x, $y) = @_;
1883
1884	$self->{motion}->($ev, $x, $y) if $self->{motion};
1885	}
1886
1887	sub size_request {
1888	(
1889	1 + 32 * int $::WIDTH / 32,
1890	1 + 32 * int $::HEIGHT / 32,
1891	)
1892	}
1893
1894	sub update {
1895	my ($self) = @_;
1896
1897	$self->{need_update} = 1;
1898	$self->SUPER::update;
1899	}
1900
1901	sub draw {
1902	my ($self) = @_;
1903
1904	if (delete $self->{need_update}) {
1905	glNewList $self->{list}, GL_COMPILE;
1906
1907	if ($::MAP) {
1908	my $sw = int $::WIDTH / 32;
1909	my $sh = int $::HEIGHT / 32;
1910
1911	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914	glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918	if ($::CFG->{fow_enable}) {
1919	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921	glConvolutionFilter2D (
1922	GL_CONVOLUTION_2D,
1923	GL_ALPHA,
1924	3, 3,
1925	GL_ALPHA, GL_FLOAT,
1926	pack "f*",
1927	0.1, 0.1, 0.1,
1928	0.1, 0.2, 0.1,
1929	0.1, 0.1, 0.1,
1930	);
1931	glEnable GL_CONVOLUTION_2D;
1932	}
1933
1934	$self->{fow_texture} = new CFClient::Texture
1935	w => $w,
1936	h => $h,
1937	data => $data,
1938	internalformat => GL_ALPHA,
1939	format => GL_ALPHA;
1940
1941	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943	glEnable GL_BLEND;
1944	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945	glEnable GL_TEXTURE_2D;
1946	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948	glColor +($::CFG->{fow_intensity}) x 3, 1;
1949	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951	glDisable GL_TEXTURE_2D;
1952	glDisable GL_BLEND;
1953	}
1954
1955	# HACK BEGIN
1956	{
1957	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958	my ($w, $h) = (250, 250);
1959
1960	glEnable GL_BLEND;
1961	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962	glEnable GL_TEXTURE_2D;
1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965	$self->{mapmap_texture} =
1966	new CFClient::Texture
1967	w => $w,
1968	h => $h,
1969	data => $::MAP->mapmap ($w, $h),
1970	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972	$self->{mapmap_texture}->draw_quad (100, 100);
1973
1974	glDisable GL_TEXTURE_2D;
1975	glDisable GL_BLEND;
1976	}
1977	# HACK END
1978	}
1979
1980	glEndList;
1981	}
1982
1983	glPushMatrix;
1984	glCallList $self->{list};
1985	glPopMatrix;
1986
1987	if ($FOCUS != $self) {
1988	glColor 64/255, 64/255, 64/255;
1989	glLogicOp GL_AND;
1990	glEnable GL_COLOR_LOGIC_OP;
1991	glBegin GL_QUADS;
1992	glVertex 0, 0;
1993	glVertex 0, $::HEIGHT;
1994	glVertex $::WIDTH, $::HEIGHT;
1995	glVertex $::WIDTH, 0;
1996	glEnd;
1997	glDisable GL_COLOR_LOGIC_OP;
1998	}
1999	}
2000
2001	my %DIR = (
2002	SDLK_KP8, [1, "north"],
2003	SDLK_KP9, [2, "northeast"],
2004	SDLK_KP6, [3, "east"],
2005	SDLK_KP3, [4, "southeast"],
2006	SDLK_KP2, [5, "south"],
2007	SDLK_KP1, [6, "southwest"],
2008	SDLK_KP4, [7, "west"],
2009	SDLK_KP7, [8, "northwest"],
2010
2011	SDLK_UP, [1, "north"],
2012	SDLK_RIGHT, [3, "east"],
2013	SDLK_DOWN, [5, "south"],
2014	SDLK_LEFT, [7, "west"],
2015	);
2016
2017	sub key_down {
2018	my ($self, $ev) = @_;
2019
2020	my $mod = $ev->key_mod;
2021	my $sym = $ev->key_sym;
2022
2023	if ($sym == SDLK_KP5) {
2024	$::CONN->user_send ("stay fire");
2025	} elsif ($sym == SDLK_a) {
2026	$::CONN->user_send ("apply");
2027	} elsif ($sym == SDLK_QUOTE) {
2028	$self->emit ('activate_console');
2029	} elsif ($sym == SDLK_SLASH) {
2030	$self->emit ('activate_console' => '/');
2031	} elsif (exists $DIR{$sym}) {
2032	if ($mod & KMOD_SHIFT) {
2033	$self->{shft}++;
2034	$::CONN->user_send ("fire $DIR{$sym}[0]");
2035	} elsif ($mod & KMOD_CTRL) {
2036	$self->{ctrl}++;
2037	$::CONN->user_send ("run $DIR{$sym}[0]");
2038	} else {
2039	$::CONN->user_send ("$DIR{$sym}[1]");
2040	}
2041	}
2042	}
2043
2044	sub key_up {
2045	my ($self, $ev) = @_;
2046
2047	my $mod = $ev->key_mod;
2048	my $sym = $ev->key_sym;
2049
2050	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051	$::CONN->user_send ("fire_stop");
2052	}
2053	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054	$::CONN->user_send ("run_stop");
2055	}
2056	}
2057
2058	#############################################################################
2059
2060	package CFClient::UI::Animator;	2287	package CFClient::UI::Animator;
2061		2288
2062	use SDL::OpenGL;	2289	use CFClient::OpenGL;
2063		2290
2064	our @ISA = CFClient::UI::Bin::;	2291	our @ISA = CFClient::UI::Bin::;
2065		2292
2066	sub moveto {	2293	sub moveto {
2067	my ($self, $x, $y) = @_;	2294	my ($self, $x, $y) = @_;
…		…
2105		2332
2106	sub new {	2333	sub new {
2107	my $class = shift;	2334	my $class = shift;
2108		2335
2109	my $self = $class->SUPER::new (	2336	my $self = $class->SUPER::new (
2110	state => 0,	2337	state => 0,
2111	connect_activate => \&toggle_flopper,	2338	connect_activate => \&toggle_flopper,
2112	@_	2339	@_
2113	);	2340	);
2114		2341
2115	if ($self->{state}) {	2342	if ($self->{state}) {
…		…
2136	$self->emit (changed => $self->{state});	2363	$self->emit (changed => $self->{state});
2137	}	2364	}
2138		2365
2139	#############################################################################	2366	#############################################################################
2140		2367
		2368	package CFClient::UI::Tooltip;
		2369
		2370	our @ISA = CFClient::UI::Bin::;
		2371
		2372	use CFClient::OpenGL;
		2373
		2374	sub new {
		2375	my $class = shift;
		2376
		2377	$class->SUPER::new (
		2378	@_,
		2379	can_events => 0,
		2380	)
		2381	}
		2382
		2383	sub set_markup {
		2384	my ($self, $text) = @_;
		2385
		2386	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2387	$self->{label}->set_markup ($text);
		2388	$self->add ($self->{label});
		2389	}
		2390
		2391	sub size_request {
		2392	my ($self) = @_;
		2393
		2394	$self->child->set_max_size ($::WIDTH * 0.3);
		2395
		2396	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2397
		2398	($w + 4, $h + 4)
		2399	}
		2400
		2401	sub size_allocate {
		2402	my ($self, $w, $h) = @_;
		2403
		2404	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2405	}
		2406
		2407	sub _draw {
		2408	my ($self) = @_;
		2409
		2410	glPushMatrix;
		2411	glTranslate 0.375, 0.375;
		2412
		2413	my ($w, $h) = @$self{qw(w h)};
		2414
		2415	glColor 1, 0.8, 0.4;
		2416	glBegin GL_QUADS;
		2417	glVertex 0 , 0;
		2418	glVertex 0 , $h;
		2419	glVertex $w, $h;
		2420	glVertex $w, 0;
		2421	glEnd;
		2422
		2423	glColor 0, 0, 0;
		2424	glBegin GL_LINE_LOOP;
		2425	glVertex 0 , 0;
		2426	glVertex 0 , $h;
		2427	glVertex $w, $h;
		2428	glVertex $w, 0;
		2429	glEnd;
		2430
		2431	glPopMatrix;
		2432
		2433	glTranslate 2, 2;
		2434	$self->SUPER::_draw;
		2435	}
		2436
		2437	#############################################################################
		2438
		2439	package CFClient::UI::Face;
		2440
		2441	our @ISA = CFClient::UI::Base::;
		2442
		2443	use CFClient::OpenGL;
		2444
		2445	sub new {
		2446	my $class = shift;
		2447
		2448	$class->SUPER::new (
		2449	aspect => 1,
		2450	@_,
		2451	)
		2452	}
		2453
		2454	sub size_request {
		2455	(32, 8)
		2456	}
		2457
		2458	sub _draw {
		2459	my ($self) = @_;
		2460
		2461	return unless $::CONN;#d# manage and cache textures differently
		2462	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2463
		2464	# TODO animation
		2465	if ($tex) {
		2466	glEnable GL_BLEND;
		2467	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2468	glEnable GL_TEXTURE_2D;
		2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2470	glColor 1, 1, 1, 1;
		2471	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2472	glDisable GL_TEXTURE_2D;
		2473	glDisable GL_BLEND;
		2474	}
		2475	}
		2476
		2477	#############################################################################
		2478
		2479	package CFClient::UI::InventoryItem;
		2480
		2481	our @ISA = CFClient::UI::HBox::;
		2482
		2483	sub new {
		2484	my $class = shift;
		2485
		2486	my %args = @_;
		2487
		2488	my $item = delete $args{item};
		2489
		2490	my $desc = $item->{nrof} < 2
		2491	? $item->{name}
		2492	: "$item->{nrof} $item->{name_pl}";
		2493
		2494
		2495	my $self = $class->SUPER::new (
		2496	can_hover => 1,
		2497	can_events => 1,
		2498	tooltip => (CFClient::UI::Label->escape ($desc)
		2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2500	connect_button_down => sub {
		2501	my ($self, $ev, $x, $y) = @_;
		2502
		2503	# todo: maybe put examine on 1? but should just be a tooltip :(
		2504	if ($ev->{button} == 1) {
		2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2506	} elsif ($ev->{button} == 2) {
		2507	$::CONN->send ("apply $item->{tag}");
		2508	} elsif ($ev->{button} == 3) {
		2509	CFClient::UI::Menu->new (
		2510	items => [
		2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2512	[
		2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2514	sub { $::CONN->send ("lock $item->{tag}") },
		2515	],
		2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2519	],
		2520	)->popup ($ev);
		2521	}
		2522
		2523	1
		2524	},
		2525	%args
		2526	);
		2527
		2528	$self->add (new CFClient::UI::Face
		2529	can_events => 0,
		2530	face => $item->{face},
		2531	anim => $item->{anim},
		2532	animspeed => $item->{animspeed},
		2533	);
		2534
		2535	$self->add (new CFClient::UI::Label
		2536	can_events => 0,
		2537	text => $desc,
		2538	);
		2539
		2540	$self
		2541	}
		2542
		2543	#############################################################################
		2544
		2545	package CFClient::UI::Inventory;
		2546
		2547	our @ISA = CFClient::UI::ScrolledWindow::;
		2548
		2549	sub new {
		2550	my $class = shift;
		2551
		2552	my $self = $class->SUPER::new (
		2553	scrolled => (new CFClient::UI::VBox),
		2554	@_,
		2555	);
		2556
		2557	$self
		2558	}
		2559
		2560	sub set_items {
		2561	my ($self, $items) = @_;
		2562
		2563	$self->{scrolled}->clear;
		2564	return unless $items;
		2565
		2566	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2567
		2568	$self->{real_items} = \@items;
		2569
		2570	for my $item (@items) {
		2571	my $desc = $item->{nrof} < 2
		2572	? $item->{name}
		2573	: "$item->{nrof} $item->{name_pl}";
		2574
		2575	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
		2576	}
		2577
		2578	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2579	}
		2580
		2581	sub size_request {
		2582	my ($self) = @_;
		2583	($self->{req_w}, $self->{req_h});
		2584	}
		2585
		2586	#############################################################################
		2587
		2588	package CFClient::UI::Menu;
		2589
		2590	our @ISA = CFClient::UI::FancyFrame::;
		2591
		2592	use CFClient::OpenGL;
		2593
		2594	sub new {
		2595	my $class = shift;
		2596
		2597	my $self = $class->SUPER::new (
		2598	items => [],
		2599	z => 100,
		2600	@_,
		2601	);
		2602
		2603	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2604
		2605	for my $item (@{ $self->{items} }) {
		2606	my ($widget, $cb) = @$item;
		2607
		2608	# handle various types of items, only text for now
		2609	if (!ref $widget) {
		2610	$widget = new CFClient::UI::Label
		2611	can_hover => 1,
		2612	can_events => 1,
		2613	text => $widget;
		2614	}
		2615
		2616	$self->{item}{$widget} = $item;
		2617
		2618	$self->{vbox}->add ($widget);
		2619	}
		2620
		2621	$self
		2622	}
		2623
		2624	# popup given the event (must be a mouse button down event currently)
		2625	sub popup {
		2626	my ($self, $ev) = @_;
		2627
		2628	$self->emit ("popdown");
		2629
		2630	# maybe save $GRAB? must be careful about events...
		2631	$GRAB = $self;
		2632	$self->{button} = $ev->{button};
		2633
		2634	$self->show;
		2635	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2636	}
		2637
		2638	sub mouse_motion {
		2639	my ($self, $ev, $x, $y) = @_;
		2640
		2641	# TODO: should use vbox->find_widget or so
		2642	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2643	$self->{hover} = $self->{item}{$HOVER};
		2644	}
		2645
		2646	sub button_up {
		2647	my ($self, $ev, $x, $y) = @_;
		2648
		2649	if ($ev->{button} == $self->{button}) {
		2650	undef $GRAB;
		2651	$self->hide;
		2652
		2653	$self->emit ("popdown");
		2654	$self->{hover}[1]->() if $self->{hover};
		2655	}
		2656	}
		2657
		2658	#############################################################################
		2659
2141	package CFClient::UI::Root;	2660	package CFClient::UI::Root;
2142		2661
2143	our @ISA = CFClient::UI::Container::;	2662	our @ISA = CFClient::UI::Container::;
2144		2663
2145	use SDL::OpenGL;	2664	use CFClient::OpenGL;
2146		2665
2147	sub check_size {	2666	sub new {
2148	my ($self) = @_;	2667	my $class = shift;
2149		2668
2150	$self->configure (0, 0, $::WITH, $::HEIGHT);	2669	$class->SUPER::new (
2151	}	2670	@_,
2152		2671	)
2153	sub size_request {
2154	($::WIDTH, $::HEIGHT)
2155	}	2672	}
2156		2673
2157	sub configure {	2674	sub configure {
2158	my ($self, $x, $y, $w, $h) = @_;	2675	my ($self, $x, $y, $w, $h) = @_;
2159		2676
2160	$self->SUPER::configure ($x, $y, $w, $h);	2677	$self->{w} = $w;
2161		2678	$self->{h} = $h;
2162	$_->configure ($_->{x}, $_->{y}, $_->size_request)
2163	for @{$self->{children}};
2164	}	2679	}
2165		2680
2166	sub _topleft {	2681	sub check_size {
		2682	my ($self) = @_;
		2683
		2684	$self->size_allocate ($self->{w}, $self->{h})
		2685	if $self->{w};
		2686	}
		2687
		2688	sub size_request {
		2689	my ($self) = @_;
		2690
		2691	($self->{w}, $self->{h})
		2692	}
		2693
		2694	sub size_allocate {
		2695	my ($self, $w, $h) = @_;
		2696
		2697	my $old_w = $self->{old_w};
		2698	my $old_h = $self->{old_h};
		2699
		2700	if ($old_w && $old_h) {
		2701	for my $child ($self->children) {
		2702	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2703	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2704	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2705	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2706	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2707	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2708	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2709	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2710	}
		2711	}
		2712
		2713	for my $child ($self->children) {
		2714	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2715
		2716	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2717	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2718	$child->configure ($X, $Y, $W, $H);
		2719	}
		2720
		2721	$self->{old_w} = $w;
		2722	$self->{old_h} = $h;
		2723	}
		2724
		2725	sub coord2local {
2167	my ($self, $x, $y) = @_;	2726	my ($self, $x, $y) = @_;
2168		2727
2169	($x, $y)	2728	($x, $y)
2170	}	2729	}
2171		2730
		2731	sub coord2global {
		2732	my ($self, $x, $y) = @_;
		2733
		2734	($x, $y)
		2735	}
		2736
2172	sub update {	2737	sub update {
2173	my ($self) = @_;	2738	my ($self) = @_;
2174		2739
2175	$self->check_size;	2740	$self->check_size;
2176	::refresh ();	2741	$::WANT_REFRESH++;
2177	}	2742	}
2178		2743
2179	sub add {	2744	sub add {
2180	my ($self, $child) = @_;	2745	my ($self, $child) = @_;
2181		2746
		2747	# integerise window positions
		2748	$child->{x} = int $child->{x};
		2749	$child->{y} = int $child->{y};
		2750
2182	$self->SUPER::add ($child);	2751	$self->SUPER::add ($child);
2183	}	2752	}
2184		2753
2185	sub on_refresh {	2754	sub on_refresh {
2186	my ($self, $id, $cb) = @_;	2755	my ($self, $id, $cb) = @_;
2187		2756
2188	$self->{refresh_hook}{$id} = $cb;	2757	$self->{refresh_hook}{$id} = $cb;
2189	}	2758	}
2190		2759
2191	sub draw {	2760	sub draw {
2192	my ($self) = @_;	2761	my ($self) = @_;
2193		2762
		2763	if ($self->{check_size}) {
		2764	my @queue = ([], []);
		2765
		2766	for (;;) {
		2767	if ($self->{check_size}) {
		2768	# heuristic: check containers last
		2769	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2770	for values %{delete $self->{check_size}}
		2771	}
		2772
		2773	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2774
		2775	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2776	? @$widget{qw(user_w user_h)}
		2777	: $widget->size_request;
		2778
		2779	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
		2780	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2781
		2782	$widget->{req_w} = $w;
		2783	$widget->{req_h} = $h;
		2784
		2785	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
		2786
		2787	$widget->{parent}->check_size
		2788	if $widget->{parent};
		2789	}
		2790	}
		2791	}
		2792
		2793	while ($self->{size_alloc}) {
		2794	for (values %{delete $self->{size_alloc}}) {
		2795	my ($widget, $w, $h) = @$_;
		2796
		2797	$w = 0 if $w < 0;
		2798	$h = 0 if $h < 0;
		2799
		2800	$widget->{w} = $w;
		2801	$widget->{h} = $h;
		2802	$widget->size_allocate ($w, $h);
		2803	$widget->emit (size_allocate => $w, $h);
		2804	}
		2805	}
		2806
2194	while (my $rcb = delete $self->{refresh_hook}) {	2807	while ($self->{refresh_hook}) {
2195	$_->() for values %$rcb;	2808	$_->()
		2809	for values %{delete $self->{refresh_hook}};
2196	}	2810	}
2197		2811
2198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2812	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2813	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2200	glClear GL_COLOR_BUFFER_BIT;	2814	glClear GL_COLOR_BUFFER_BIT;
…		…
2211	#############################################################################	2825	#############################################################################
2212		2826
2213	package CFClient::UI;	2827	package CFClient::UI;
2214		2828
2215	$ROOT = new CFClient::UI::Root;	2829	$ROOT = new CFClient::UI::Root;
		2830	$TOOLTIP = new CFClient::UI::Tooltip;
2216		2831
2217	1	2832	1
2218		2833

Diff Legend

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