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.123 by root, Mon Apr 17 19:50:22 2006 UTC vs.
Revision 1.157 by root, Sun Apr 23 21:47:32 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 (exists $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_text ($widget->{tooltip});
		29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
		30	$TOOLTIP->show;
		31	}
		32
		33	return;
		34	}
		35	}
		36	}
		37
		38	$TOOLTIP->hide;
		39	delete $TOOLTIP->{owner};
		40	}
14		41
15	# class methods for events	42	# class methods for events
16	sub feed_sdl_key_down_event {	43	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	44	$FOCUS->key_down ($_[0]) if $FOCUS;
18	}	45	}
…		…
21	$FOCUS->key_up ($_[0]) if $FOCUS;	48	$FOCUS->key_up ($_[0]) if $FOCUS;
22	}	49	}
23		50
24	sub feed_sdl_button_down_event {	51	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	52	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	53	my ($x, $y) = ($ev->{x}, $ev->{y});
27		54
28	if (!$BUTTON_STATE) {	55	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	56	my $widget = $ROOT->find_widget ($x, $y);
30		57
31	$GRAB = $widget;	58	$GRAB = $widget;
32	$GRAB->update if $GRAB;	59	$GRAB->update if $GRAB;
33	}
34		60
		61	check_tooltip;
		62	}
		63
35	$BUTTON_STATE |= 1 << ($ev->button - 1);	64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		65
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	67	}
39		68
40	sub feed_sdl_button_up_event {	69	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	70	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	71	my ($x, $y) = ($ev->{x}, $ev->{y});
43		72
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		74
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		76
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		78
50	if (!$BUTTON_STATE) {	79	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	80	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	81	$grab->update if $grab;
53	$GRAB->update if $GRAB;	82	$GRAB->update if $GRAB;
		83
		84	check_tooltip;
54	}	85	}
55	}	86	}
56		87
57	sub feed_sdl_motion_event {	88	sub feed_sdl_motion_event {
58	my ($ev) = @_;	89	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	90	my ($x, $y) = ($ev->{x}, $ev->{y});
60		91
61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	92	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		93
63	if ($widget != $HOVER) {	94	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	95	my $hover = $HOVER; $HOVER = $widget;
65		96
66	$hover->update if $hover && $hover->{can_hover};	97	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	98	$HOVER->update if $HOVER && $HOVER->{can_hover};
		99
		100	check_tooltip;
68	}	101	}
69		102
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71	}	104	}
72		105
…		…
87		120
88	package CFClient::UI::Base;	121	package CFClient::UI::Base;
89		122
90	use strict;	123	use strict;
91		124
92	use SDL::OpenGL;	125	use CFClient::OpenGL;
93		126
94	sub new {	127	sub new {
95	my $class = shift;	128	my $class = shift;
96		129
97	my $self = bless {	130	my $self = bless {
98	x => 0,	131	x => 0,
99	y => 0,	132	y => 0,
100	z => 0,	133	z => 0,
101	w => -1,	134	can_events => 1,
102	h => -1,
103	@_	135	@_
104	}, $class;	136	}, $class;
105		137
106	for (keys %$self) {	138	for (keys %$self) {
107	if (/^connect_(.*)$/) {	139	if (/^connect_(.*)$/) {
…		…
110	}	142	}
111		143
112	$self	144	$self
113	}	145	}
114		146
		147	sub show {
		148	my ($self) = @_;
		149
		150	return if $self->{parent};
		151
		152	$CFClient::UI::ROOT->add ($self);
		153	}
		154
		155	sub hide {
		156	my ($self) = @_;
		157
		158	return unless $self->{parent};
		159
		160	$self->{parent}->remove ($self);
		161	}
		162
115	sub move {	163	sub move {
116	my ($self, $x, $y, $z) = @_;	164	my ($self, $x, $y, $z) = @_;
		165
117	$self->{x} = int $x;	166	$self->{x} = int $x;
118	$self->{y} = int $y;	167	$self->{y} = int $y;
119	$self->{z} = $z if defined $z;	168	$self->{z} = $z if defined $z;
		169
		170	$self->update;
120	}	171	}
121		172
122	sub needs_redraw {	173	sub needs_redraw {
123	0	174	0
124	}	175	}
125		176
126	sub size_request {	177	sub size_request {
127	require Carp;	178	require Carp;
128	Carp::confess "size_request is abtract";	179	Carp::confess "size_request is abstract";
129	}	180	}
130		181
131	sub _size_allocate {	182	sub configure {
132	my ($self, $x, $y, $w, $h) = @_;	183	my ($self, $x, $y, $w, $h) = @_;
133		184
		185	if ($self->{aspect}) {
		186	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		187	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		188
		189	# use alignment to adjust x, y
		190
		191	$x += int +($w - $w2) * 0.5;
		192	$y += int +($h - $h2) * 0.5;
		193
		194	($w, $h) = ($w2, $h2);
		195	}
		196
		197	if ($self->{x} != $x || $self->{y} != $y) {
134	$self->{x} = $x;	198	$self->{x} = $x;
135	$self->{y} = $y;	199	$self->{y} = $y;
		200	$self->update;
		201	}
136		202
137	return unless $self->{w} != $w || $self->{h} != $h;	203	if ($self->{w} != $w || $self->{h} != $h) {
138
139	$self->{w} = $w;	204	$self->{w} = $w;
140	$self->{h} = $h;	205	$self->{h} = $h;
141		206
		207	$self->size_allocate ($w, $h);
		208	$self->update;
142	1	209	}
143	}	210	}
144		211
145	sub size_allocate {	212	sub size_allocate {
		213	# nothing to be done
		214	}
		215
		216	sub set_max_size {
146	my ($self, $x, $y, $w, $h) = @_;	217	my ($self, $w, $h) = @_;
147		218
148	$self->_size_allocate ($x, $y, $w, $h);	219	delete $self->{max_w}; $self->{max_w} = $w if $w;
		220	delete $self->{max_h}; $self->{max_h} = $h if $h;
149	}	221	}
150		222
151	# return top left coordinates	223	# return top left coordinates
152	sub _topleft {	224	sub _topleft {
153	my ($self, $x, $y) = @_;	225	my ($self, $x, $y) = @_;
…		…
247	}	319	}
248		320
249	sub find_widget {	321	sub find_widget {
250	my ($self, $x, $y) = @_;	322	my ($self, $x, $y) = @_;
251		323
		324	return () unless $self->{can_events};
		325
252	return $self	326	return $self
253	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	327	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	328	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
255		329
256	()	330	()
…		…
260	my ($self, $parent) = @_;	334	my ($self, $parent) = @_;
261		335
262	Scalar::Util::weaken ($self->{parent} = $parent);	336	Scalar::Util::weaken ($self->{parent} = $parent);
263	}	337	}
264		338
		339	sub check_size {
		340	my ($self) = @_;
		341
		342	return unless $self->{parent};
		343
		344	my ($w, $h) = $self->size_request;
		345
		346	if ($w != $self->{req_w} || $h != $self->{req_h}) {
		347	$self->{req_w} = $w;
		348	$self->{req_h} = $h;
		349
		350	$self->{parent}->check_size;
		351	}
		352	}
		353
265	sub update {	354	sub update {
266	my ($self) = @_;	355	my ($self) = @_;
267		356
268	$self->{parent}->update	357	$self->{parent}->update
269	if $self->{parent};	358	if $self->{parent};
270	}	359	}
271		360
272	sub connect {	361	sub connect {
273	my ($self, $signal, $cb) = @_;	362	my ($self, $signal, $cb) = @_;
274		363
275	push @{ $self->{cb}{$signal} }, $cb;	364	push @{ $self->{signal_cb}{$signal} }, $cb;
276	}	365	}
277		366
278	sub emit {	367	sub emit {
279	my ($self, $signal, @args) = @_;	368	my ($self, $signal, @args) = @_;
280		369
		370	for my $cb (@{$self->{signal_cb}{$signal} || []}) {
281	$_->($self, @args)	371	$cb->($self, @args);
282	for @{$self->{cb}{$signal} || []};	372	}
283	}	373	}
284		374
285	sub DESTROY {	375	sub DESTROY {
286	my ($self) = @_;	376	my ($self) = @_;
287		377
…		…
293	package CFClient::UI::DrawBG;	383	package CFClient::UI::DrawBG;
294		384
295	our @ISA = CFClient::UI::Base::;	385	our @ISA = CFClient::UI::Base::;
296		386
297	use strict;	387	use strict;
298	use SDL::OpenGL;	388	use CFClient::OpenGL;
299		389
300	sub new {	390	sub new {
301	my $class = shift;	391	my $class = shift;
302		392
303	# range [value, low, high, page]	393	# range [value, low, high, page]
…		…
332		422
333	package CFClient::UI::Empty;	423	package CFClient::UI::Empty;
334		424
335	our @ISA = CFClient::UI::Base::;	425	our @ISA = CFClient::UI::Base::;
336		426
		427	sub new {
		428	my ($class, %arg) = @_;
		429	$class->SUPER::new (can_events => 0, %arg);
		430	}
		431
337	sub size_request {	432	sub size_request {
338	(0, 0)	433	(0, 0)
339	}	434	}
340		435
341	sub draw { }	436	sub draw { }
…		…
349	sub new {	444	sub new {
350	my ($class, %arg) = @_;	445	my ($class, %arg) = @_;
351		446
352	my $children = delete $arg{children} || [];	447	my $children = delete $arg{children} || [];
353		448
354	my $self = $class->SUPER::new (children => [], %arg);	449	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
355	$self->add ($_) for @$children;	450	$self->add ($_) for @$children;
356		451
357	$self	452	$self
358	}	453	}
359		454
…		…
367	$self->{children} = [	462	$self->{children} = [
368	sort { $a->{z} <=> $b->{z} }	463	sort { $a->{z} <=> $b->{z} }
369	@{$self->{children}}, $child	464	@{$self->{children}}, $child
370	];	465	];
371		466
372	$self->{w} = $self->{h} = -1;	467	$child->check_size;
		468	}
		469
		470	sub remove {
		471	my ($self, $child) = @_;
		472
		473	delete $child->{parent};
		474
		475	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		476
		477	$self->check_size;
373	$self->update;	478	$self->update;
374	}
375
376	sub remove {
377	my ($self, $widget) = @_;
378
379	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
380
381	$self->size_allocate (0, 0, $self->{w}, $self->{h});
382	}	479	}
383		480
384	sub find_widget {	481	sub find_widget {
385	my ($self, $x, $y) = @_;	482	my ($self, $x, $y) = @_;
386		483
…		…
416		513
417	$class->SUPER::new (children => [$child], %arg)	514	$class->SUPER::new (children => [$child], %arg)
418	}	515	}
419		516
420	sub add {	517	sub add {
421	my ($self, $widget) = @_;	518	my ($self, $child) = @_;
422		519
423	$self->{children} = [];	520	$self->{children} = [];
424		521
425	$self->SUPER::add ($widget);	522	$self->SUPER::add ($child);
426	}	523	}
427		524
428	sub remove {	525	sub remove {
429	my ($self, $widget) = @_;	526	my ($self, $widget) = @_;
430		527
…		…
439	sub size_request {	536	sub size_request {
440	$_[0]{children}[0]->size_request	537	$_[0]{children}[0]->size_request
441	}	538	}
442		539
443	sub size_allocate {	540	sub size_allocate {
444	my ($self, $x, $y, $w, $h) = @_;	541	my ($self, $w, $h) = @_;
445		542
446	$self->_size_allocate ($x, $y, $w, $h) or return;
447
448	$self->{children}[0]->size_allocate (0, 0, $w, $h);	543	$self->{children}[0]->configure (0, 0, $w, $h);
449	}	544	}
450		545
451	#############################################################################	546	#############################################################################
452		547
453	package CFClient::UI::Window;	548	package CFClient::UI::Window;
454		549
455	our @ISA = CFClient::UI::Bin::;	550	our @ISA = CFClient::UI::Bin::;
456		551
457	use SDL::OpenGL;	552	use CFClient::OpenGL;
458		553
459	sub new {	554	sub new {
460	my ($class, %arg) = @_;	555	my ($class, %arg) = @_;
461		556
462	my $self = $class->SUPER::new (%arg);	557	my $self = $class->SUPER::new (%arg);
…		…
479	$self->child->draw;	574	$self->child->draw;
480	};	575	};
481	}	576	}
482		577
483	sub size_allocate {	578	sub size_allocate {
484	my ($self, $x, $y, $w, $h) = @_;	579	my ($self, $w, $h) = @_;
485		580
486	$self->_size_allocate ($x, $y, $w, $h) or return;
487
488	$self->child->size_allocate (0, 0, $w, $h);	581	$self->child->configure (0, 0, $w, $h);
489		582
490	$self->render_chld;	583	$self->render_chld;
491	}	584	}
492		585
493	sub _draw {	586	sub _draw {
…		…
509	glDisable GL_TEXTURE_2D;	602	glDisable GL_TEXTURE_2D;
510	}	603	}
511		604
512	#############################################################################	605	#############################################################################
513		606
		607	package CFClient::UI::ViewPort;
		608
		609	our @ISA = CFClient::UI::Window::;
		610
		611	sub new { die }
		612
		613	sub size_request {
		614	my ($self) = @_;
		615
		616	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		617	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		618
		619	@$self{qw(child_w child_h)}
		620	}
		621
		622	sub _draw {
		623	my ($self) = @_;
		624
		625	$self->{children}[1]->draw;
		626	}
		627
		628
		629	#############################################################################
		630
514	package CFClient::UI::Frame;	631	package CFClient::UI::Frame;
515		632
516	our @ISA = CFClient::UI::Bin::;	633	our @ISA = CFClient::UI::Bin::;
517		634
518	use SDL::OpenGL;	635	use CFClient::OpenGL;
519
520	sub size_request {
521	my ($self) = @_;
522	my $chld = $self->child
523	or return (0, 0);
524
525	$chld->move (2, 2);
526
527	map { $_ + 4 } $chld->size_request;
528	}
529
530	sub size_allocate {
531	my ($self, $x, $y, $w, $h) = @_;
532
533	$self->_size_allocate ($x, $y, $w, $h) or return;
534
535	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
536	}
537
538	sub _draw {
539	my ($self) = @_;
540
541	my $chld = $self->child;
542
543	my ($w, $h) = $chld->size_request;
544
545	glBegin GL_QUADS;
546	glColor 0, 0, 0;
547	glVertex 0 , 0;
548	glVertex 0 , $h + 4;
549	glVertex $w + 4 , $h + 4;
550	glVertex $w + 4 , 0;
551	glEnd;
552
553	$chld->draw;
554	}
555
556	#############################################################################
557
558	package CFClient::UI::FancyFrame;
559
560	our @ISA = CFClient::UI::Bin::;
561
562	use SDL::OpenGL;
563
564	my @tex =
565	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
566	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
567		636
568	sub new {	637	sub new {
569	my $class = shift;	638	my $class = shift;
570		639
571	# TODO: user_x, user_y, overwrite moveto?
572
573	$class->SUPER::new (	640	my $self = $class->SUPER::new (
574	bg => [1, 1, 1, 1],	641	bg => [1, 1, 1, 1],
575	border_bg => [1, 1, 1, 1],	642	border_bg => [1, 1, 1, 1],
576	border => int $::FONTSIZE * 0.8,	643	border => 0.8,
577	@_	644	@_
		645	);
		646
		647	$self
		648	}
		649
		650	sub set_size {
		651	my ($self, $w, $h) = @_;
		652	$self->{req_w} = $w;
		653	$self->{req_h} = $h;
		654	$self->check_size;
		655	}
		656
		657	sub size_request {
		658	my ($self) = @_;
		659	($self->{req_w}, $self->{req_h})
		660	}
		661
		662	sub size_allocate {
		663	my ($self, $w, $h) = @_;
		664	$self->{w} = $w;
		665	$self->{h} = $h;
		666	$self->child->configure (0, 0, $w, $h);
		667	}
		668
		669	sub _draw {
		670	my ($self) = @_;
		671
		672	my ($w, $h) = ($self->{w}, $self->{h});
		673
		674	glEnable GL_BLEND;
		675	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		676	glEnable GL_TEXTURE_2D;
		677	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		678
		679	# glBegin GL_QUADS;
		680	# glColor 0, 0, 0, 0;
		681	# glVertex 0 , 0;
		682	# glVertex 0 , $h;
		683	# glVertex $w, $h;
		684	# glVertex $w, 0;
		685	# glEnd;
		686
		687
		688	$self->child->draw;
		689	glDisable GL_BLEND;
		690	glDisable GL_TEXTURE_2D;
		691	}
		692
		693	#############################################################################
		694
		695	package CFClient::UI::FancyFrame;
		696
		697	our @ISA = CFClient::UI::Bin::;
		698
		699	use CFClient::OpenGL;
		700
		701	my @tex =
		702	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		703	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		704
		705	sub new {
		706	my $class = shift;
		707
		708	# TODO: user_x, user_y, overwrite moveto?
		709
		710	my $self = $class->SUPER::new (
		711	bg => [1, 1, 1, 1],
		712	border_bg => [1, 1, 1, 1],
		713	border => 0.8,
		714	can_events => 1,
		715	@_
		716	);
		717
		718	$self->{title} &&= new CFClient::UI::Label
		719	align => 0,
		720	valign => 1,
		721	text => $self->{title},
		722	fontsize => 1;
		723
		724	$self
		725	}
		726
		727	sub border {
		728	int $_[0]{border} * $::FONTSIZE
		729	}
		730
		731	sub size_request {
		732	my ($self) = @_;
		733
		734	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		735
		736	my ($w, $h) = $self->SUPER::size_request;
		737
		738	(
		739	$w + $self->border * 2,
		740	$h + $self->border * 2,
578	)	741	)
579	}	742	}
580		743
581	sub size_request {
582	my ($self) = @_;
583
584	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
586	my ($w, $h) = $self->SUPER::size_request;
587
588	(
589	$w + $self->{border} * 2,
590	$h + $self->{border} * 2,
591	)
592	}
593
594	sub size_allocate {	744	sub size_allocate {
595	my ($self, $x, $y, $w, $h) = @_;	745	my ($self, $w, $h) = @_;
596		746
597	$self->_size_allocate ($x, $y, $w, $h) or return;
598
599	$h -= List::Util::max 0, $self->{border} * 2;	747	$h -= List::Util::max 0, $self->border * 2;
600	$w -= List::Util::max 0, $self->{border} * 2;	748	$w -= List::Util::max 0, $self->border * 2;
601		749
		750	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		751	if $self->{title};
		752
602	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	753	$self->child->configure ($self->border, $self->border, $w, $h);
603	}	754	}
604		755
605	sub button_down {	756	sub button_down {
606	my ($self, $ev, $x, $y) = @_;	757	my ($self, $ev, $x, $y) = @_;
607		758
		759	my $border = $self->border;
		760
608	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	761	if ($x < $self->{w} && $x >= $self->{w} - $border
609	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	762	&& $y < $self->{h} && $y >= $self->{h} - $border) {
610		763
611	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	764	my ($ox, $oy) = ($ev->{x}, $ev->{y});
612	my ($bw, $bh) = ($self->{w}, $self->{h});	765	my ($bw, $bh) = ($self->{w}, $self->{h});
613		766
614	$self->{motion} = sub {	767	$self->{motion} = sub {
615	my ($ev, $x, $y) = @_;	768	my ($ev, $x, $y) = @_;
616		769
617	($x, $y) = ($ev->motion_x, $ev->motion_y);	770	($x, $y) = ($ev->{x}, $ev->{y});
618		771
619	$self->{user_w} = $bw + $x - $ox;	772	$self->{user_w} = $bw + $x - $ox;
620	$self->{user_h} = $bh + $y - $oy;	773	$self->{user_h} = $bh + $y - $oy;
621	$self->update;	774	$self->check_size;
622	};	775	};
623		776
624	} elsif ($x >= 0 && $x < $self->{w}	777	} elsif ($x >= 0 && $x < $self->{w}
625	&& $y >= 0 && $y < $self->{border}) {	778	&& $y >= 0 && $y < $border) {
626		779
627	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	780	my ($ox, $oy) = ($ev->{x}, $ev->{y});
628	my ($bx, $by) = ($self->{x}, $self->{y});	781	my ($bx, $by) = ($self->{x}, $self->{y});
629		782
630	$self->{motion} = sub {	783	$self->{motion} = sub {
631	my ($ev, $x, $y) = @_;	784	my ($ev, $x, $y) = @_;
632		785
633	($x, $y) = ($ev->motion_x, $ev->motion_y);	786	($x, $y) = ($ev->{x}, $ev->{y});
634		787
635	$self->move ($bx + $x - $ox, $by + $y - $oy);	788	$self->move ($bx + $x - $ox, $by + $y - $oy);
636	$self->update;	789	$self->update;
637	};	790	};
638	}	791	}
…		…
659	glEnable GL_BLEND;	812	glEnable GL_BLEND;
660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	813	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661	glEnable GL_TEXTURE_2D;	814	glEnable GL_TEXTURE_2D;
662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663		816
		817	my $border = $self->border;
		818
664	glColor @{ $self->{border_bg} };	819	glColor @{ $self->{border_bg} };
665	$tex[1]->draw_quad (0, 0, $w, $self->{border});	820	$tex[1]->draw_quad (0, 0, $w, $border);
666	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	821	$tex[3]->draw_quad (0, $border, $border, $ch);
667	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	822	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
668	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	823	$tex[4]->draw_quad (0, $h - $border, $w, $border);
669		824
670	my $bg = $tex[0];	825	my $bg = $tex[0];
671		826
672	# TODO: repeat texture not scale	827	# TODO: repeat texture not scale
673	my $rep_x = $cw / $bg->{w};	828	my $rep_x = $cw / $bg->{w};
…		…
676	glColor @{ $self->{bg} };	831	glColor @{ $self->{bg} };
677		832
678	$bg->{s} = $rep_x;	833	$bg->{s} = $rep_x;
679	$bg->{t} = $rep_y;	834	$bg->{t} = $rep_y;
680	$bg->{wrap_mode} = 1;	835	$bg->{wrap_mode} = 1;
681	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	836	$bg->draw_quad ($border, $border, $cw, $ch);
682		837
683	glDisable GL_TEXTURE_2D;	838	glDisable GL_TEXTURE_2D;
684	glDisable GL_BLEND;	839	glDisable GL_BLEND;
685		840
		841	$self->{title}->draw if $self->{title};
686	$self->child->draw;	842	$self->child->draw;
687	}	843	}
688		844
689	#############################################################################	845	#############################################################################
690		846
…		…
692		848
693	our @ISA = CFClient::UI::Base::;	849	our @ISA = CFClient::UI::Base::;
694		850
695	use List::Util qw(max sum);	851	use List::Util qw(max sum);
696		852
697	use SDL::OpenGL;	853	use CFClient::OpenGL;
698		854
699	sub new {	855	sub new {
700	my $class = shift;	856	my $class = shift;
701		857
702	$class->SUPER::new (	858	$class->SUPER::new (
…		…
709	my ($self, $x, $y, $child) = @_;	865	my ($self, $x, $y, $child) = @_;
710		866
711	$child->set_parent ($self);	867	$child->set_parent ($self);
712	$self->{children}[$y][$x] = $child;	868	$self->{children}[$y][$x] = $child;
713		869
714	$self->{w} = $self->{h} = -1;	870	$child->check_size;
715	$self->update;
716	}	871	}
717		872
718	# TODO: move to container class maybe? send childs a signal on removal?	873	# TODO: move to container class maybe? send childs a signal on removal?
719	sub clear {	874	sub clear {
720	my ($self) = @_;	875	my ($self) = @_;
…		…
733	or next;	888	or next;
734		889
735	for my $x (0 .. $#$row) {	890	for my $x (0 .. $#$row) {
736	my $widget = $row->[$x]	891	my $widget = $row->[$x]
737	or next;	892	or next;
738	my ($w, $h) = $widget->size_request;	893	my ($w, $h) = @$widget{qw(req_w req_h)};
739		894
740	$w[$x] = max $w[$x], $w;	895	$w[$x] = max $w[$x], $w;
741	$h[$y] = max $h[$y], $h;	896	$h[$y] = max $h[$y], $h;
742	}	897	}
743	}	898	}
…		…
755	(sum @$hs),	910	(sum @$hs),
756	)	911	)
757	}	912	}
758		913
759	sub size_allocate {	914	sub size_allocate {
760	my ($self, $x, $y, $w, $h) = @_;	915	my ($self, $w, $h) = @_;
761
762	$self->_size_allocate ($x, $y, $w, $h) or return;
763		916
764	my ($ws, $hs) = $self->get_wh;	917	my ($ws, $hs) = $self->get_wh;
765		918
766	my $req_w = sum @$ws;	919	my $req_w = sum @$ws;
767	my $req_h = sum @$hs;	920	my $req_h = sum @$hs;
…		…
789		942
790	for my $c (0 .. $#$row) {	943	for my $c (0 .. $#$row) {
791	my $col_w = $ws->[$c];	944	my $col_w = $ws->[$c];
792		945
793	if (my $widget = $row->[$c]) {	946	if (my $widget = $row->[$c]) {
794	$widget->size_allocate ($x, $y, $col_w, $row_h);	947	$widget->configure ($x, $y, $col_w, $row_h);
795	}	948	}
796		949
797	$x += $col_w;	950	$x += $col_w;
798	}	951	}
799		952
…		…
844	(List::Util::max map $_->[1], @alloc),	997	(List::Util::max map $_->[1], @alloc),
845	)	998	)
846	}	999	}
847		1000
848	sub size_allocate {	1001	sub size_allocate {
849	my ($self, $x, $y, $w, $h) = @_;	1002	my ($self, $w, $h) = @_;
850
851	$self->_size_allocate ($x, $y, $w, $h);
852		1003
853	($h, $w) = ($w, $h);	1004	($h, $w) = ($w, $h);
854		1005
855	my $children = $self->{children};	1006	my $children = $self->{children};
856		1007
857	my @h = map +($_->size_request)[0], @$children;	1008	my @h = map $_->{req_w}, @$children;
858		1009
859	my $req_h = List::Util::sum @h;	1010	my $req_h = List::Util::sum @h;
860		1011
861	if ($req_h > $h) {	1012	if ($req_h > $h) {
862	# ah well, not enough space	1013	# ah well, not enough space
…		…
878		1029
879	my $y = 0;	1030	my $y = 0;
880	for (0 .. $#$children) {	1031	for (0 .. $#$children) {
881	my $child = $children->[$_];	1032	my $child = $children->[$_];
882	my $h = $h[$_];	1033	my $h = $h[$_];
883	$child->size_allocate ($y, 0, $h, $w);	1034	$child->configure ($y, 0, $h, $w);
884		1035
885	$y += $h;	1036	$y += $h;
886	}	1037	}
		1038
		1039	1
887	}	1040	}
888		1041
889	#############################################################################	1042	#############################################################################
890		1043
891	package CFClient::UI::VBox;	1044	package CFClient::UI::VBox;
…		…
904	(List::Util::sum map $_->[1], @alloc),	1057	(List::Util::sum map $_->[1], @alloc),
905	)	1058	)
906	}	1059	}
907		1060
908	sub size_allocate {	1061	sub size_allocate {
909	my ($self, $x, $y, $w, $h) = @_;	1062	my ($self, $w, $h) = @_;
910
911	$self->_size_allocate ($x, $y, $w, $h);
912		1063
913	my $children = $self->{children};	1064	my $children = $self->{children};
914		1065
915	my @h = map +($_->size_request)[1], @$children;	1066	my @h = map $_->{req_h}, @$children;
916		1067
917	my $req_h = List::Util::sum @h;	1068	my $req_h = List::Util::sum @h;
918		1069
919	if ($req_h > $h) {	1070	if ($req_h > $h) {
920	# ah well, not enough space	1071	# ah well, not enough space
…		…
934		1085
935	my $y = 0;	1086	my $y = 0;
936	for (0 .. $#$children) {	1087	for (0 .. $#$children) {
937	my $child = $children->[$_];	1088	my $child = $children->[$_];
938	my $h = $h[$_];	1089	my $h = $h[$_];
939	$child->size_allocate (0, $y, $w, $h);	1090	$child->configure (0, $y, $w, $h);
940		1091
941	$y += $h;	1092	$y += $h;
942	}	1093	}
		1094
		1095	1
943	}	1096	}
944		1097
945	#############################################################################	1098	#############################################################################
946		1099
947	package CFClient::UI::Label;	1100	package CFClient::UI::Label;
948		1101
949	our @ISA = CFClient::UI::Base::;	1102	our @ISA = CFClient::UI::Base::;
950		1103
951	use SDL::OpenGL;	1104	use CFClient::OpenGL;
952		1105
953	sub new {	1106	sub new {
954	my ($class, %arg) = @_;	1107	my ($class, %arg) = @_;
955		1108
956	my $self = $class->SUPER::new (	1109	my $self = $class->SUPER::new (
957	fg => [1, 1, 1],	1110	fg => [1, 1, 1],
		1111	#font => default_font
958	fontsize => $::FONTSIZE,	1112	fontsize => 1,
959	text => "",	1113	text => "",
960	align => -1,	1114	align => -1,
961	valign => -1,	1115	valign => -1,
962	padding => 2,	1116	padding => 2,
963	layout => new CFClient::Layout,	1117	layout => new CFClient::Layout,
		1118	can_events => 0,
964	%arg	1119	%arg
965	);	1120	);
966		1121
967	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1122	if (exists $self->{template}) {
		1123	my $layout = new CFClient::Layout;
		1124	$layout->set_text (delete $self->{template});
		1125	$self->{template} = $layout;
		1126	}
968		1127
969	$self->set_text (delete $self->{text}) if exists $self->{text};	1128	$self->set_text (delete $self->{text}) if exists $self->{text};
970	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1129	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
971		1130
972	$self	1131	$self
…		…
986	my ($self, $text) = @_;	1145	my ($self, $text) = @_;
987		1146
988	$self->{layout}->set_text ($text);	1147	$self->{layout}->set_text ($text);
989		1148
990	delete $self->{texture};	1149	delete $self->{texture};
		1150	$self->check_size;
991	$self->update;	1151	$self->update;
992	}	1152	}
993		1153
994	sub set_markup {	1154	sub set_markup {
995	my ($self, $markup) = @_;	1155	my ($self, $markup) = @_;
996		1156
997	$self->{layout}->set_markup ($markup);	1157	$self->{layout}->set_markup ($markup);
998		1158
999	delete $self->{texture};	1159	delete $self->{texture};
		1160	$self->check_size;
1000	$self->update;	1161	$self->update;
1001	}	1162	}
1002		1163
1003	sub size_request {	1164	sub size_request {
1004	my ($self) = @_;	1165	my ($self) = @_;
1005		1166
1006	$self->{layout}->set_width;	1167	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1168	$self->{layout}->set_width ($self->{max_w} || -1);
1007	$self->{layout}->set_height ($self->{fontsize});	1169	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1008		1170
1009	my ($w, $h) = $self->{layout}->size;	1171	my ($w, $h) = $self->{layout}->size;
		1172
		1173	if (exists $self->{template}) {
		1174	$self->{template}->set_font ($self->{font}) if $self->{font};
		1175	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1176
		1177	my ($w2, $h2) = $self->{template}->size;
		1178
		1179	$w = List::Util::max $w, $w2;
		1180	$h = List::Util::max $h, $h2;
		1181	}
1010		1182
1011	(	1183	(
1012	$w + $self->{padding} * 2,	1184	$w + $self->{padding} * 2,
1013	$h + $self->{padding} * 2,	1185	$h + $self->{padding} * 2,
1014	)	1186	)
1015	}	1187	}
1016		1188
1017	sub size_allocate {	1189	sub size_allocate {
1018	my ($self, $x, $y, $w, $h) = @_;	1190	my ($self, $w, $h) = @_;
1019
1020	$self->_size_allocate ($x, $y, $w, $h) or return;
1021		1191
1022	delete $self->{texture};	1192	delete $self->{texture};
1023	}	1193	}
1024		1194
1025	sub update {	1195	sub set_fontsize {
1026	my ($self) = @_;	1196	my ($self, $fontsize) = @_;
1027		1197
		1198	$self->{fontsize} = $fontsize;
1028	delete $self->{texture};	1199	delete $self->{texture};
		1200	$self->check_size;
1029	$self->SUPER::update;	1201	$self->update;
1030	}	1202	}
1031		1203
1032	sub _draw {	1204	sub _draw {
1033	my ($self) = @_;	1205	my ($self) = @_;
1034		1206
1035	my $tex = $self->{texture} ||= do {	1207	my $tex = $self->{texture} ||= do {
		1208	$self->{layout}->set_font ($self->{font}) if $self->{font};
1036	$self->{layout}->set_width ($self->{w});	1209	$self->{layout}->set_width ($self->{w});
1037	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1210	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1038	new_from_layout CFClient::Texture $self->{layout}	1211	new_from_layout CFClient::Texture $self->{layout}
1039	};	1212	};
1040		1213
1041	glEnable GL_BLEND;	1214	glEnable GL_BLEND;
1042	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1215	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1067		1240
1068	package CFClient::UI::EntryBase;	1241	package CFClient::UI::EntryBase;
1069		1242
1070	our @ISA = CFClient::UI::Label::;	1243	our @ISA = CFClient::UI::Label::;
1071		1244
1072	use SDL;	1245	use CFClient::OpenGL;
1073	use SDL::OpenGL;
1074		1246
1075	sub new {	1247	sub new {
1076	my $class = shift;	1248	my $class = shift;
1077		1249
1078	$class->SUPER::new (	1250	$class->SUPER::new (
…		…
1081	active_bg => [1, 1, 1, 0.5],	1253	active_bg => [1, 1, 1, 0.5],
1082	active_fg => [0, 0, 0],	1254	active_fg => [0, 0, 0],
1083	can_hover => 1,	1255	can_hover => 1,
1084	can_focus => 1,	1256	can_focus => 1,
1085	valign => 0,	1257	valign => 0,
		1258	can_events => 1,
1086	@_	1259	@_
1087	)	1260	)
1088	}	1261	}
1089		1262
1090	sub _set_text {	1263	sub _set_text {
…		…
1092		1265
1093	delete $self->{cur_h};	1266	delete $self->{cur_h};
1094		1267
1095	return if $self->{text} eq $text;	1268	return if $self->{text} eq $text;
1096		1269
		1270	delete $self->{texture};
		1271
1097	$self->{last_activity} = $::NOW;	1272	$self->{last_activity} = $::NOW;
1098	$self->{text} = $text;	1273	$self->{text} = $text;
1099		1274
1100	$text =~ s/./*/g if $self->{hidden};	1275	$text =~ s/./*/g if $self->{hidden};
1101	$self->{layout}->set_text ("$text ");	1276	$self->{layout}->set_text ("$text ");
…		…
1114		1289
1115	($w + 1, $h) # add 1 for cursor	1290	($w + 1, $h) # add 1 for cursor
1116	}	1291	}
1117		1292
1118	sub size_allocate {	1293	sub size_allocate {
1119	my ($self, $x, $y, $w, $h) = @_;	1294	my ($self, $w, $h) = @_;
1120		1295
1121	$self->SUPER::size_allocate ($x, $y, $w, $h);	1296	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1122
1123	$self->_set_text ($self->{text});
1124	}	1297	}
1125		1298
1126	sub set_text {	1299	sub set_text {
1127	my ($self, $text) = @_;	1300	my ($self, $text) = @_;
1128		1301
…		…
1132	}	1305	}
1133		1306
1134	sub key_down {	1307	sub key_down {
1135	my ($self, $ev) = @_;	1308	my ($self, $ev) = @_;
1136		1309
1137	my $mod = $ev->key_mod;	1310	my $mod = $ev->{mod};
1138	my $sym = $ev->key_sym;	1311	my $sym = $ev->{sym};
1139
1140	my $uni = $ev->key_unicode;	1312	my $uni = $ev->{unicode};
1141		1313
1142	my $text = $self->get_text;	1314	my $text = $self->get_text;
1143		1315
1144	if ($sym == SDLK_BACKSPACE) {	1316	if ($sym == 8) {
1145	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1317	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1146	} elsif ($sym == SDLK_DELETE) {	1318	} elsif ($sym == 127) {
1147	substr $text, $self->{cursor}, 1, "";	1319	substr $text, $self->{cursor}, 1, "";
1148	} elsif ($sym == SDLK_LEFT) {	1320	} elsif ($sym == CFClient::SDLK_LEFT) {
1149	--$self->{cursor} if $self->{cursor};	1321	--$self->{cursor} if $self->{cursor};
1150	} elsif ($sym == SDLK_RIGHT) {	1322	} elsif ($sym == CFClient::SDLK_RIGHT) {
1151	++$self->{cursor} if $self->{cursor} < length $self->{text};	1323	++$self->{cursor} if $self->{cursor} < length $self->{text};
1152	} elsif ($sym == SDLK_HOME) {	1324	} elsif ($sym == CFClient::SDLK_HOME) {
1153	$self->{cursor} = 0;	1325	$self->{cursor} = 0;
1154	} elsif ($sym == SDLK_END) {	1326	} elsif ($sym == CFClient::SDLK_END) {
1155	$self->{cursor} = length $text;	1327	$self->{cursor} = length $text;
1156	} elsif ($sym == SDLK_ESCAPE) {	1328	} elsif ($sym == 27) {
1157	$self->emit ('escape');	1329	$self->emit ('escape');
1158	} elsif ($uni) {	1330	} elsif ($uni) {
1159	substr $text, $self->{cursor}++, 0, chr $uni;	1331	substr $text, $self->{cursor}++, 0, chr $uni;
1160	}	1332	}
1161		1333
…		…
1236		1408
1237	package CFClient::UI::Entry;	1409	package CFClient::UI::Entry;
1238		1410
1239	our @ISA = CFClient::UI::EntryBase::;	1411	our @ISA = CFClient::UI::EntryBase::;
1240		1412
1241	use SDL;	1413	use CFClient::OpenGL;
1242	use SDL::OpenGL;
1243		1414
1244	sub key_down {	1415	sub key_down {
1245	my ($self, $ev) = @_;	1416	my ($self, $ev) = @_;
1246		1417
1247	my $sym = $ev->key_sym;	1418	my $sym = $ev->{sym};
1248		1419
1249	if ($sym == SDLK_RETURN) {	1420	if ($sym == 13) {
1250	$self->emit (activate => $self->get_text);	1421	$self->emit (activate => $self->get_text);
1251	$self->update;	1422	$self->update;
1252		1423
1253	} else {	1424	} else {
1254	$self->SUPER::key_down ($ev);	1425	$self->SUPER::key_down ($ev);
…		…
1260		1431
1261	package CFClient::UI::Button;	1432	package CFClient::UI::Button;
1262		1433
1263	our @ISA = CFClient::UI::Label::;	1434	our @ISA = CFClient::UI::Label::;
1264		1435
1265	use SDL;	1436	use CFClient::OpenGL;
1266	use SDL::OpenGL;
1267		1437
1268	my @tex =	1438	my @tex =
1269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1439	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1270	qw(b1_button_active.png);	1440	qw(b1_button_active.png);
1271		1441
1272	sub new {	1442	sub new {
1273	my $class = shift;	1443	my $class = shift;
1274		1444
…		…
1276	padding => 4,	1446	padding => 4,
1277	fg => [1, 1, 1],	1447	fg => [1, 1, 1],
1278	bg => [1, 1, 1, 0.2],	1448	bg => [1, 1, 1, 0.2],
1279	active_fg => [0, 0, 1],	1449	active_fg => [0, 0, 1],
1280	can_hover => 1,	1450	can_hover => 1,
		1451	align => 0,
		1452	valign => 0,
		1453	can_events => 1,
1281	@_	1454	@_
1282	)	1455	)
1283	}	1456	}
1284		1457
1285	sub button_up {	1458	sub button_up {
…		…
1319	package CFClient::UI::CheckBox;	1492	package CFClient::UI::CheckBox;
1320		1493
1321	our @ISA = CFClient::UI::DrawBG::;	1494	our @ISA = CFClient::UI::DrawBG::;
1322		1495
1323	my @tex =	1496	my @tex =
1324	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1497	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1325	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1498	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1326		1499
1327	use SDL;	1500	use CFClient::OpenGL;
1328	use SDL::OpenGL;
1329		1501
1330	sub new {	1502	sub new {
1331	my $class = shift;	1503	my $class = shift;
1332		1504
1333	$class->SUPER::new (	1505	$class->SUPER::new (
…		…
1344	my ($self) = @_;	1516	my ($self) = @_;
1345		1517
1346	($self->{padding} * 2 + 6) x 2	1518	($self->{padding} * 2 + 6) x 2
1347	}	1519	}
1348		1520
1349	sub size_allocate {
1350	my ($self, $x, $y, $w, $h) = @_;
1351
1352	$self->_size_allocate ($x, $y, $w, $h);
1353	}
1354
1355	sub button_down {	1521	sub button_down {
1356	my ($self, $ev, $x, $y) = @_;	1522	my ($self, $ev, $x, $y) = @_;
1357		1523
1358	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1524	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1359	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1525	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1385	glDisable GL_BLEND;	1551	glDisable GL_BLEND;
1386	}	1552	}
1387		1553
1388	#############################################################################	1554	#############################################################################
1389		1555
		1556	package CFClient::UI::Image;
		1557
		1558	our @ISA = CFClient::UI::Base::;
		1559
		1560	use CFClient::OpenGL;
		1561	use Carp qw/confess/;
		1562
		1563	our %loaded_images;
		1564
		1565	sub new {
		1566	my $class = shift;
		1567
		1568	my $self = $class->SUPER::new (can_events => 0, @_);
		1569
		1570	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1571
		1572	$loaded_images{$self->{image}} ||=
		1573	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1574
		1575	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1576
		1577	Scalar::Util::weaken $loaded_images{$self->{image}};
		1578
		1579	$self->{aspect} = $tex->{w} / $tex->{h};
		1580
		1581	$self
		1582	}
		1583
		1584	sub size_request {
		1585	my ($self) = @_;
		1586
		1587	($self->{tex}->{w}, $self->{tex}->{h})
		1588	}
		1589
		1590	sub _draw {
		1591	my ($self) = @_;
		1592
		1593	my $tex = $self->{tex};
		1594
		1595	my ($w, $h) = ($self->{w}, $self->{h});
		1596
		1597	if ($self->{rot90}) {
		1598	glRotate 90, 0, 0, 1;
		1599	glTranslate 0, -$self->{w}, 0;
		1600
		1601	($w, $h) = ($h, $w);
		1602	}
		1603
		1604	glEnable GL_BLEND;
		1605	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1606	glEnable GL_TEXTURE_2D;
		1607	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1608
		1609	$tex->draw_quad (0, 0, $w, $h);
		1610
		1611	glDisable GL_BLEND;
		1612	glDisable GL_TEXTURE_2D;
		1613	}
		1614
		1615	#############################################################################
		1616
		1617	package CFClient::UI::VGauge;
		1618
		1619	our @ISA = CFClient::UI::Base::;
		1620
		1621	use CFClient::OpenGL;
		1622
		1623	my %tex = (
		1624	food => [
		1625	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1626	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1627	],
		1628	grace => [
		1629	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1630	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1631	],
		1632	hp => [
		1633	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1634	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1635	],
		1636	mana => [
		1637	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1638	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1639	],
		1640	);
		1641
		1642	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1643	sub new {
		1644	my $class = shift;
		1645
		1646	my $self = $class->SUPER::new (
		1647	type => 'food',
		1648	@_
		1649	);
		1650
		1651	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1652
		1653	$self
		1654	}
		1655
		1656	sub size_request {
		1657	my ($self) = @_;
		1658
		1659	#my $tex = $tex{$self->{type}}[0];
		1660	#@$tex{qw(w h)}
		1661	(0, 0)
		1662	}
		1663
		1664	sub set_max {
		1665	my ($self, $max) = @_;
		1666
		1667	$self->{max_val} = $max;
		1668	}
		1669
		1670	sub set_value {
		1671	my ($self, $val, $max) = @_;
		1672
		1673	$self->set_max ($max)
		1674	if defined $max;
		1675
		1676	$max = $self->{max_val};
		1677	$self->{val} = $val;
		1678
		1679	$self->update;
		1680	}
		1681
		1682	sub _draw {
		1683	my ($self) = @_;
		1684
		1685	my $tex = $tex{$self->{type}};
		1686
		1687	my ($w, $h) = ($self->{w}, $self->{h});
		1688
		1689	if ($self->{vertical}) {
		1690	glRotate 90, 0, 0, 1;
		1691	glTranslate 0, -$self->{w}, 0;
		1692
		1693	($w, $h) = ($h, $w);
		1694	}
		1695
		1696	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1697	$ycut = 1 if $self->{val} > $self->{max_val};
		1698
		1699	my $t1 = $tex->[0];
		1700	my $t2 = $tex->[1];
		1701
		1702	glEnable GL_BLEND;
		1703	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1704	glEnable GL_TEXTURE_2D;
		1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1706
		1707	my $h1 = $self->{h} - $ycut * $self->{h};
		1708	my $h2 = $ycut * $self->{h};
		1709
		1710	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1711	glBegin GL_QUADS;
		1712	glTexCoord 0 , 0; glVertex 0 , 0;
		1713	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
		1714	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
		1715	glTexCoord $t1->{s}, 0; glVertex $w, 0;
		1716	glEnd;
		1717
		1718	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1719	glBegin GL_QUADS;
		1720	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
		1721	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
		1722	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
		1723	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
		1724	glEnd;
		1725
		1726	glDisable GL_BLEND;
		1727	glDisable GL_TEXTURE_2D;
		1728	}
		1729
		1730	#############################################################################
		1731
		1732	package CFClient::UI::Gauge;
		1733
		1734	our @ISA = CFClient::UI::VBox::;
		1735
		1736	sub new {
		1737	my ($class, %arg) = @_;
		1738
		1739	my $self = $class->SUPER::new (
		1740	tooltip => $arg{type},
		1741	%arg,
		1742	);
		1743
		1744	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);
		1745	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);
		1746	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);
		1747
		1748	$self
		1749	}
		1750
		1751	sub set_fontsize {
		1752	my ($self, $fsize) = @_;
		1753
		1754	$self->{value}->set_fontsize ($fsize);
		1755	$self->{max} ->set_fontsize ($fsize);
		1756	}
		1757
		1758	sub set_value {
		1759	my ($self, $val, $max) = @_;
		1760
		1761	$self->set_max ($max)
		1762	if defined $max;
		1763
		1764	$self->{gauge}->set_value ($val, $max);
		1765	$self->{value}->set_text ($val);
		1766	}
		1767
		1768	sub set_max {
		1769	my ($self, $max) = @_;
		1770
		1771	$self->{gauge}->set_max ($max);
		1772	$self->{max}->set_text ($max);
		1773	}
		1774
		1775	#############################################################################
		1776
1390	package CFClient::UI::Slider;	1777	package CFClient::UI::Slider;
1391		1778
1392	use strict;	1779	use strict;
1393		1780
1394	use SDL::OpenGL;	1781	use CFClient::OpenGL;
1395		1782
1396	our @ISA = CFClient::UI::DrawBG::;	1783	our @ISA = CFClient::UI::DrawBG::;
1397		1784
1398	my @tex =	1785	my @tex =
1399	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1786	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1409	# TODO: calculations are off	1796	# TODO: calculations are off
1410	my $self = $class->SUPER::new (	1797	my $self = $class->SUPER::new (
1411	fg => [1, 1, 1],	1798	fg => [1, 1, 1],
1412	active_fg => [0, 0, 0],	1799	active_fg => [0, 0, 0],
1413	range => [0, 0, 100, 10],	1800	range => [0, 0, 100, 10],
1414	req_w => 40,	1801	req_w => 20,
1415	req_h => 13,	1802	req_h => 20,
1416	vertical => 0,	1803	vertical => 0,
1417	can_hover => 1,	1804	can_hover => 1,
1418	inner_pad => 5,	1805	inner_pad => 5,
1419	@_	1806	@_
1420	);	1807	);
…		…
1524		1911
1525	package CFClient::UI::TextView;	1912	package CFClient::UI::TextView;
1526		1913
1527	our @ISA = CFClient::UI::HBox::;	1914	our @ISA = CFClient::UI::HBox::;
1528		1915
1529	use SDL::OpenGL;	1916	use CFClient::OpenGL;
1530		1917
1531	sub new {	1918	sub new {
1532	my $class = shift;	1919	my $class = shift;
1533		1920
1534	my $self = $class->SUPER::new (	1921	my $self = $class->SUPER::new (
1535	req_w => $::WIDTH / 6,
1536	req_h => $::HEIGHT / 6,
1537	fontsize => $::FONTSIZE,	1922	fontsize => 1,
		1923	#font => default_font
1538	@_,	1924	@_,
1539		1925
1540	layout => (new CFClient::Layout),	1926	layout => (new CFClient::Layout),
1541	par => [],	1927	par => [],
1542	height => 0,	1928	height => 0,
…		…
1563	sub text_height {	1949	sub text_height {
1564	my ($self, $text) = @_;	1950	my ($self, $text) = @_;
1565		1951
1566	my $layout = $self->{layout};	1952	my $layout = $self->{layout};
1567		1953
1568	$layout->set_height ($self->{fontsize});	1954	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1569	$layout->set_width ($self->{w});	1955	$layout->set_width ($self->{w});
1570	$layout->set_text ($text);	1956	$layout->set_text ($text);
1571		1957
1572	($layout->size)[1]	1958	($layout->size)[1]
1573	}	1959	}
…		…
1577		1963
1578	$self->{need_reflow}++;	1964	$self->{need_reflow}++;
1579	$self->update;	1965	$self->update;
1580	}	1966	}
1581		1967
1582	sub size_request {
1583	my ($self) = @_;
1584
1585	($self->{req_w}, $self->{req_h})
1586	}
1587
1588	sub size_allocate {	1968	sub size_allocate {
1589	my ($self, $x, $y, $w, $h) = @_;	1969	my ($self, $w, $h) = @_;
1590		1970
1591	$self->SUPER::size_allocate ($x, $y, $w, $h);	1971	$self->SUPER::size_allocate ($w, $h);
1592		1972
		1973	$self->{layout}->set_font ($self->{font}) if $self->{font};
1593	$self->{layout}->set_height ($self->{fontsize});	1974	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1594	$self->{layout}->set_width ($self->{w});	1975	$self->{layout}->set_width ($self->{children}[0]{w});
1595		1976
1596	$self->reflow;	1977	$self->reflow;
1597	}	1978	}
1598		1979
1599	sub add_paragraph {	1980	sub add_paragraph {
…		…
1649	my $y1 = $top + $self->{h};	2030	my $y1 = $top + $self->{h};
1650		2031
1651	my $y = 0;	2032	my $y = 0;
1652		2033
1653	my $layout = $self->{layout};	2034	my $layout = $self->{layout};
		2035
		2036	$layout->set_font ($self->{font}) if $self->{font};
1654		2037
1655	for my $par (@{$self->{par}}) {	2038	for my $par (@{$self->{par}}) {
1656	my $h = $par->[0];	2039	my $h = $par->[0];
1657		2040
1658	if ($y0 < $y + $h && $y < $y1) {	2041	if ($y0 < $y + $h && $y < $y1) {
…		…
1686		2069
1687	}	2070	}
1688		2071
1689	#############################################################################	2072	#############################################################################
1690		2073
1691	package CFClient::UI::MapWidget;
1692
1693	use strict;
1694
1695	use List::Util qw(min max);
1696
1697	use SDL;
1698	use SDL::OpenGL;
1699
1700	our @ISA = CFClient::UI::Base::;
1701
1702	sub new {
1703	my $class = shift;
1704
1705	$class->SUPER::new (
1706	z => -1,
1707	can_focus => 1,
1708	list => (glGenLists 1),
1709	@_
1710	)
1711	}
1712
1713	sub key_down {
1714	print "MAPKEYDOWN\n";
1715	}
1716
1717	sub key_up {
1718	}
1719
1720	sub button_down {
1721	my ($self, $ev, $x, $y) = @_;
1722
1723	$self->focus_in;
1724
1725	if ($ev->button == 2) {
1726	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1727	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1728
1729	$self->{motion} = sub {
1730	my ($ev, $x, $y) = @_;
1731
1732	($x, $y) = ($ev->motion_x, $ev->motion_y);
1733
1734	$::CFG->{map_shift_x} = $bw + $x - $ox;
1735	$::CFG->{map_shift_y} = $bh + $y - $oy;
1736
1737	$self->update;
1738	};
1739	}
1740	}
1741
1742	sub button_up {
1743	my ($self, $ev, $x, $y) = @_;
1744
1745	delete $self->{motion};
1746	}
1747
1748	sub mouse_motion {
1749	my ($self, $ev, $x, $y) = @_;
1750
1751	$self->{motion}->($ev, $x, $y) if $self->{motion};
1752	}
1753
1754	sub size_request {
1755	(
1756	1 + 32 * int $::WIDTH / 32,
1757	1 + 32 * int $::HEIGHT / 32,
1758	)
1759	}
1760
1761	sub update {
1762	my ($self) = @_;
1763
1764	$self->{need_update} = 1;
1765	$self->SUPER::update;
1766	}
1767
1768	sub draw {
1769	my ($self) = @_;
1770
1771	if (delete $self->{need_update}) {
1772	glNewList $self->{list}, GL_COMPILE;
1773
1774	if ($::MAP) {
1775	my $sw = int $::WIDTH / 32;
1776	my $sh = int $::HEIGHT / 32;
1777
1778	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1779	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1780
1781	glTranslate $sx0 - 32, $sy0 - 32, 0;
1782
1783	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1784
1785	if ($::CFG->{fow_enable}) {
1786	if ($::CFG->{fow_smooth}) { # smooth fog of war
1787	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1788	glConvolutionFilter2D
1789	GL_CONVOLUTION_2D,
1790	GL_ALPHA,
1791	3, 3,
1792	GL_ALPHA, GL_FLOAT,
1793	pack "f*",
1794	0.1, 0.1, 0.1,
1795	0.1, 0.2, 0.1,
1796	0.1, 0.1, 0.1,
1797	;
1798	glEnable GL_CONVOLUTION_2D;
1799	}
1800
1801	$self->{fow_texture} = new CFClient::Texture
1802	w => $w,
1803	h => $h,
1804	data => $data,
1805	internalformat => GL_ALPHA,
1806	format => GL_ALPHA;
1807
1808	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1809
1810	glEnable GL_BLEND;
1811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812	glEnable GL_TEXTURE_2D;
1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1814
1815	glColor +($::CFG->{fow_intensity}) x 3, 1;
1816	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1817
1818	glDisable GL_TEXTURE_2D;
1819	glDisable GL_BLEND;
1820	}
1821
1822	# HACK BEGIN
1823	{
1824	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1825	my ($w, $h) = (250, 250);
1826
1827	glEnable GL_BLEND;
1828	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1829	glEnable GL_TEXTURE_2D;
1830	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1831
1832	$self->{mapmap_texture} =
1833	new CFClient::Texture
1834	w => $w,
1835	h => $h,
1836	data => $::MAP->mapmap ($w, $h),
1837	type => GL_UNSIGNED_INT_8_8_8_8_REV;
1838
1839	$self->{mapmap_texture}->draw_quad (100, 100);
1840
1841	glDisable GL_TEXTURE_2D;
1842	glDisable GL_BLEND;
1843	}
1844	# HACK END
1845	}
1846
1847	glEndList;
1848	}
1849
1850	glPushMatrix;
1851	glCallList $self->{list};
1852	glPopMatrix;
1853
1854	if ($FOCUS != $self) {
1855	glColor 64/255, 64/255, 64/255;
1856	glLogicOp GL_AND;
1857	glEnable GL_COLOR_LOGIC_OP;
1858	glBegin GL_QUADS;
1859	glVertex 0, 0;
1860	glVertex 0, $::HEIGHT;
1861	glVertex $::WIDTH, $::HEIGHT;
1862	glVertex $::WIDTH, 0;
1863	glEnd;
1864	glDisable GL_COLOR_LOGIC_OP;
1865	}
1866	}
1867
1868	my %DIR = (
1869	SDLK_KP8, [1, "north"],
1870	SDLK_KP9, [2, "northeast"],
1871	SDLK_KP6, [3, "east"],
1872	SDLK_KP3, [4, "southeast"],
1873	SDLK_KP2, [5, "south"],
1874	SDLK_KP1, [6, "southwest"],
1875	SDLK_KP4, [7, "west"],
1876	SDLK_KP7, [8, "northwest"],
1877
1878	SDLK_UP, [1, "north"],
1879	SDLK_RIGHT, [3, "east"],
1880	SDLK_DOWN, [5, "south"],
1881	SDLK_LEFT, [7, "west"],
1882	);
1883
1884	sub key_down {
1885	my ($self, $ev) = @_;
1886
1887	my $mod = $ev->key_mod;
1888	my $sym = $ev->key_sym;
1889
1890	if ($sym == SDLK_KP5) {
1891	$::CONN->user_send ("stay fire");
1892	} elsif ($sym == SDLK_a) {
1893	$::CONN->user_send ("apply");
1894	} elsif ($sym == SDLK_QUOTE) {
1895	$self->emit ('activate_console');
1896	} elsif ($sym == SDLK_SLASH) {
1897	$self->emit ('activate_console' => '/');
1898	} elsif (exists $DIR{$sym}) {
1899	if ($mod & KMOD_SHIFT) {
1900	$self->{shft}++;
1901	$::CONN->user_send ("fire $DIR{$sym}[0]");
1902	} elsif ($mod & KMOD_CTRL) {
1903	$self->{ctrl}++;
1904	$::CONN->user_send ("run $DIR{$sym}[0]");
1905	} else {
1906	$::CONN->user_send ("$DIR{$sym}[1]");
1907	}
1908	}
1909	}
1910
1911	sub key_up {
1912	my ($self, $ev) = @_;
1913
1914	my $mod = $ev->key_mod;
1915	my $sym = $ev->key_sym;
1916
1917	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1918	$::CONN->user_send ("fire_stop");
1919	}
1920	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1921	$::CONN->user_send ("run_stop");
1922	}
1923	}
1924
1925	#############################################################################
1926
1927	package CFClient::UI::Animator;	2074	package CFClient::UI::Animator;
1928		2075
1929	use SDL::OpenGL;	2076	use CFClient::OpenGL;
1930		2077
1931	our @ISA = CFClient::UI::Bin::;	2078	our @ISA = CFClient::UI::Bin::;
1932		2079
1933	sub moveto {	2080	sub moveto {
1934	my ($self, $x, $y) = @_;	2081	my ($self, $x, $y) = @_;
…		…
1974	my $class = shift;	2121	my $class = shift;
1975		2122
1976	my $self = $class->SUPER::new (	2123	my $self = $class->SUPER::new (
1977	state => 0,	2124	state => 0,
1978	connect_activate => \&toggle_flopper,	2125	connect_activate => \&toggle_flopper,
		2126	can_events => 1,
1979	@_	2127	@_
1980	);	2128	);
1981		2129
1982	if ($self->{state}) {	2130	if ($self->{state}) {
1983	$self->{state} = 0;	2131	$self->{state} = 0;
…		…
2003	$self->emit (changed => $self->{state});	2151	$self->emit (changed => $self->{state});
2004	}	2152	}
2005		2153
2006	#############################################################################	2154	#############################################################################
2007		2155
		2156	package CFClient::UI::Tooltip;
		2157
		2158	our @ISA = CFClient::UI::Bin::;
		2159
		2160	use CFClient::OpenGL;
		2161
		2162	sub new {
		2163	my $class = shift;
		2164
		2165	$class->SUPER::new (
		2166	@_,
		2167	can_events => 0,
		2168	)
		2169	}
		2170
		2171	sub set_text {
		2172	my ($self, $text) = @_;
		2173
		2174	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2175	$self->{label}->set_text ($text);
		2176	$self->add ($self->{label});
		2177	}
		2178
		2179	sub size_request {
		2180	my ($self) = @_;
		2181
		2182	$self->child->set_max_size ($::WIDTH * 0.2);
		2183
		2184	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2185
		2186	($w + 4, $h + 4)
		2187	}
		2188
		2189	sub _draw {
		2190	my ($self) = @_;
		2191
		2192	glPushMatrix;
		2193	glTranslate 0.375, 0.375;
		2194
		2195	my ($w, $h) = @$self{qw(w h)};
		2196
		2197	glColor 1, 0.8, 0.4;
		2198	glBegin GL_QUADS;
		2199	glVertex 0 , 0;
		2200	glVertex 0 , $h;
		2201	glVertex $w, $h;
		2202	glVertex $w, 0;
		2203	glEnd;
		2204
		2205	glColor 0, 0, 0;
		2206	glBegin GL_LINE_LOOP;
		2207	glVertex 0 , 0;
		2208	glVertex 0 , $h;
		2209	glVertex $w, $h;
		2210	glVertex $w, 0;
		2211	glEnd;
		2212
		2213	glPopMatrix;
		2214
		2215	glTranslate 2, 2;
		2216	$self->SUPER::_draw;
		2217	}
		2218
		2219	#############################################################################
		2220
2008	package CFClient::UI::Root;	2221	package CFClient::UI::Root;
2009		2222
2010	our @ISA = CFClient::UI::Container::;	2223	our @ISA = CFClient::UI::Container::;
2011		2224
2012	use SDL::OpenGL;	2225	use CFClient::OpenGL;
		2226
		2227	sub check_size {
		2228	my ($self) = @_;
		2229
		2230	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
		2231	}
2013		2232
2014	sub size_request {	2233	sub size_request {
2015	($::WIDTH, $::HEIGHT)	2234	($::WIDTH, $::HEIGHT)
2016	}	2235	}
2017		2236
2018	sub size_allocate {	2237	sub configure {
2019	my ($self, $x, $y, $w, $h) = @_;	2238	my ($self, $x, $y, $w, $h) = @_;
2020		2239
2021	$self->_size_allocate ($x, $y, $w, $h);	2240	$self->SUPER::configure ($x, $y, $w, $h);
2022		2241
2023	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
2024	for @{$self->{children}};	2242	for my $child (@{$self->{children}}) {
		2243	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2244
		2245	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2246	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2247	$child->configure ($X, $Y, $W,$H);
		2248	}
2025	}	2249	}
2026		2250
2027	sub _topleft {	2251	sub _topleft {
2028	my ($self, $x, $y) = @_;	2252	my ($self, $x, $y) = @_;
2029		2253
…		…
2031	}	2255	}
2032		2256
2033	sub update {	2257	sub update {
2034	my ($self) = @_;	2258	my ($self) = @_;
2035		2259
2036	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2260	$self->check_size;
2037	::refresh ();	2261	::refresh ();
2038	}	2262	}
2039		2263
2040	sub add {	2264	sub add {
2041	my ($self, $widget) = @_;	2265	my ($self, $child) = @_;
2042		2266
		2267	# integerize window positions
		2268	$child->{x} = int $child->{x};
		2269	$child->{y} = int $child->{y};
		2270
2043	$self->SUPER::add ($widget);	2271	$self->SUPER::add ($child);
2044
2045	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2046	}	2272	}
2047		2273
2048	sub on_refresh {	2274	sub on_refresh {
2049	my ($self, $id, $cb) = @_;	2275	my ($self, $id, $cb) = @_;
2050		2276
…		…
2074	#############################################################################	2300	#############################################################################
2075		2301
2076	package CFClient::UI;	2302	package CFClient::UI;
2077		2303
2078	$ROOT = new CFClient::UI::Root;	2304	$ROOT = new CFClient::UI::Root;
		2305	$TOOLTIP = new CFClient::UI::Tooltip;
2079		2306
2080	1	2307	1
2081		2308

Diff Legend

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