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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
		18
		19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
16		38
17	sub check_tooltip {	39	sub check_tooltip {
18	if (!$GRAB) {	40	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
24		46
25	my $tip = $widget->{tooltip};	47	my $tip = $widget->{tooltip};
26		48
27	$tip = $tip->($widget) if CODE:: eq ref $tip;	49	$tip = $tip->($widget) if CODE:: eq ref $tip;
28		50
29	$TOOLTIP->set_markup ($widget->{tooltip});	51	$TOOLTIP->set_tooltip_from ($widget);
30
31	$TOOLTIP->show;	52	$TOOLTIP->show;
32		53
33	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34		55
35	if ($x + $TOOLTIP->{w} > $::WIDTH) {
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
38		58
39	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
		60	$TOOLTIP->check_size;
		61	$TOOLTIP->update;
40	}	62	}
41		63
42	return;	64	return;
43	}	65	}
44	}	66	}
…		…
48	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
49	}	71	}
50		72
51	# class methods for events	73	# class methods for events
52	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
53	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
54	if $FOCUS;	76	if $FOCUS;
55	}	77	}
56		78
57	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
58	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
59	if $FOCUS;	81	if $FOCUS;
60	}	82	}
61		83
62	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
63	my ($ev) = @_;	85	my ($ev) = @_;
…		…
72	check_tooltip;	94	check_tooltip;
73	}	95	}
74		96
75	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
76		98
77	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
79	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80	}
81	}	101	}
82		102
83	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
84	my ($ev) = @_;	104	my ($ev) = @_;
85	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
86		106
87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88		108
89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90		110
91	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
93	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94	}
95		113
96	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
97	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
98	$grab->update if $grab;	116	$grab->update if $grab;
99	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
115	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
116		134
117	check_tooltip;	135	check_tooltip;
118	}	136	}
119		137
120	if ($HOVER) {
121	($x, $y) = $HOVER->coord2local ($x, $y);
122	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123	}	139	if $HOVER;
124	}	140	}
125		141
126	# convert position array to integers	142	# convert position array to integers
127	sub harmonize {	143	sub harmonize {
128	my ($vals) = @_;	144	my ($vals) = @_;
…		…
132	for (@$vals) {	148	for (@$vals) {
133	my $i = int $_ + $rem;	149	my $i = int $_ + $rem;
134	$rem += $_ - $i;	150	$rem += $_ - $i;
135	$_ = $i;	151	$_ = $i;
136	}	152	}
		153	}
		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
		171	# call when resolution changes etc.
		172	sub rescale_widgets {
		173	my ($sx, $sy) = @_;
		174
		175	for my $widget (values %WIDGET) {
		176	if ($widget->{is_toplevel}) {
		177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		185	}
		186	}
		187
		188	reconfigure_widgets;
137	}	189	}
138		190
139	#############################################################################	191	#############################################################################
140		192
141	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
154	can_events => 1,	206	can_events => 1,
155	@_	207	@_
156	}, $class;	208	}, $class;
157		209
158	for (keys %$self) {	210	for (keys %$self) {
159	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
160	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
161	}	213	}
162	}	214	}
163		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
164	$self	225	$self
165	}	226	}
166		227
167	sub destroy {	228	sub destroy {
168	my ($self) = @_;	229	my ($self) = @_;
…		…
171	%$self = ();	232	%$self = ();
172	}	233	}
173		234
174	sub show {	235	sub show {
175	my ($self) = @_;	236	my ($self) = @_;
176
177	return if $self->{parent};	237	return if $self->{parent};
178		238
179	$CFClient::UI::ROOT->add ($self);	239	$CFClient::UI::ROOT->add ($self);
180	}	240	}
181		241
182	sub hide {	242	sub show_centered {
183	my ($self) = @_;	243	my ($self) = @_;
		244	return if $self->{parent};
		245
		246	$self->show;
		247
		248	$CFClient::UI::ROOT->on_post_alloc (
		249	"centered $self" => sub {
		250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		251	},
		252	);
		253	}
		254
		255	sub set_invisible {
		256	my ($self) = @_;
		257
		258	# broken show/hide model
		259
		260	delete $self->{root};
		261	delete $self->{visible};
184		262
185	undef $GRAB if $GRAB == $self;	263	undef $GRAB if $GRAB == $self;
186	undef $HOVER if $HOVER == $self;	264	undef $HOVER if $HOVER == $self;
		265
		266	CFClient::UI::check_tooltip
		267	if $CFClient::UI::TOOLTIP->{owner} == $self;
		268
		269	$self->focus_out;
		270	}
		271
		272	sub hide {
		273	my ($self) = @_;
		274
		275	$self->set_invisible;
187		276
188	$self->{parent}->remove ($self)	277	$self->{parent}->remove ($self)
189	if $self->{parent};	278	if $self->{parent};
190	}	279	}
191		280
…		…
241		330
242	sub size_allocate {	331	sub size_allocate {
243	# nothing to be done	332	# nothing to be done
244	}	333	}
245		334
		335	sub reconfigure {
		336	my ($self) = @_;
		337
		338	$self->check_size (1);
		339	$self->update;
		340	}
		341
246	sub children {	342	sub children {
247	}
248
249	# call when resolution changes etc.
250	sub reconfigure {
251	my ($self) = @_;
252
253	$_->reconfigure
254	for $self->children;
255
256	$self->check_size;
257	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258	$self->update;
259	}	343	}
260		344
261	sub set_max_size {	345	sub set_max_size {
262	my ($self, $w, $h) = @_;	346	my ($self, $w, $h) = @_;
263		347
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	348	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	349	delete $self->{max_h}; $self->{max_h} = $h if $h;
		350	}
		351
		352	sub set_tooltip {
		353	my ($self, $tooltip) = @_;
		354
		355	$tooltip =~ s/^\s+//;
		356	$tooltip =~ s/\s+$//;
		357
		358	return if $self->{tooltip} eq $tooltip;
		359
		360	$self->{tooltip} = $tooltip;
		361
		362	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		363	delete $CFClient::UI::TOOLTIP->{owner};
		364	CFClient::UI::check_tooltip;
		365	}
266	}	366	}
267		367
268	# translate global coordinates to local coordinate system	368	# translate global coordinates to local coordinate system
269	sub coord2local {	369	sub coord2local {
270	my ($self, $x, $y) = @_;	370	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	385	return if $FOCUS == $self;
286	return unless $self->{can_focus};	386	return unless $self->{can_focus};
287		387
288	my $focus = $FOCUS; $FOCUS = $self;	388	my $focus = $FOCUS; $FOCUS = $self;
289		389
290	$self->emit (focus_in => $focus);	390	$self->_emit (focus_in => $focus);
291		391
292	$focus->update if $focus;	392	$focus->update if $focus;
293	$FOCUS->update;	393	$FOCUS->update;
294	}	394	}
295		395
…		…
298		398
299	return unless $FOCUS == $self;	399	return unless $FOCUS == $self;
300		400
301	my $focus = $FOCUS; undef $FOCUS;	401	my $focus = $FOCUS; undef $FOCUS;
302		402
303	$self->emit (focus_out => $focus);	403	$self->_emit (focus_out => $focus);
304		404
305	$focus->update if $focus; #?	405	$focus->update if $focus; #?
		406
		407	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		408	unless $FOCUS;
306	}	409	}
307		410
308	sub mouse_motion { }	411	sub mouse_motion { }
309	sub button_up { }	412	sub button_up { }
310	sub key_down { }	413	sub key_down { }
311	sub key_up { }	414	sub key_up { }
312		415
313	sub button_down {	416	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	417	my ($self, $ev, $x, $y) = @_;
315		418
316	$self->focus_in;	419	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	453	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	454	glPushMatrix;
352	glColor 1, 1, 0, 1;	455	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	457	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	458	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	459	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	460	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	461	glVertex 0 , $self->{h} - 1;
359	glEnd;	462	glEnd;
360	glPopMatrix;	463	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	464	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	465	}
363	}	466	}
364		467
365	sub _draw {	468	sub _draw {
366	my ($self) = @_;	469	my ($self) = @_;
…		…
383	sub set_parent {	486	sub set_parent {
384	my ($self, $parent) = @_;	487	my ($self, $parent) = @_;
385		488
386	Scalar::Util::weaken ($self->{parent} = $parent);	489	Scalar::Util::weaken ($self->{parent} = $parent);
387		490
		491	$self->{root} = $parent->{root};
		492	$self->{visible} = $parent->{visible} + 1;
		493
		494	# TODO: req_w _does_change after ->reconfigure
388	$self->check_size	495	$self->check_size
389	unless exists $self->{req_w};	496	unless exists $self->{req_w};
		497
		498	$self->show;
390	}	499	}
391		500
392	sub check_size {	501	sub check_size {
393	my ($self) = @_;	502	my ($self, $forced) = @_;
394		503
		504	$self->{force_alloc} = 1 if $forced;
395	$CFClient::UI::ROOT->{check_size}{$self} = $self;	505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
396	}	506	}
397		507
398	sub update {	508	sub update {
399	my ($self) = @_;	509	my ($self) = @_;
…		…
406	my ($self, $signal, $cb) = @_;	516	my ($self, $signal, $cb) = @_;
407		517
408	push @{ $self->{signal_cb}{$signal} }, $cb;	518	push @{ $self->{signal_cb}{$signal} }, $cb;
409	}	519	}
410		520
		521	sub _emit {
		522	my ($self, $signal, @args) = @_;
		523
		524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		525	}
		526
411	sub emit {	527	sub emit {
412	my ($self, $signal, @args) = @_;	528	my ($self, $signal, @args) = @_;
413		529
414	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	530	$self->_emit ($signal, @args)
		531	|| $self->$signal (@args);
415	}	532	}
416		533
417	sub DESTROY {	534	sub DESTROY {
418	my ($self) = @_;	535	my ($self) = @_;
419		536
		537	delete $WIDGET{$self+0};
420	#$self->deactivate;	538	#$self->deactivate;
421	}	539	}
422		540
423	#############################################################################	541	#############################################################################
424		542
…		…
433	my $class = shift;	551	my $class = shift;
434		552
435	# range [value, low, high, page]	553	# range [value, low, high, page]
436		554
437	$class->SUPER::new (	555	$class->SUPER::new (
438	bg => [0, 0, 0, 0.2],	556	#bg => [0, 0, 0, 0.2],
439	active_bg => [1, 1, 1, 0.5],	557	#active_bg => [1, 1, 1, 0.5],
440	@_	558	@_
441	)	559	)
442	}	560	}
443		561
444	sub _draw {	562	sub _draw {
445	my ($self) = @_;	563	my ($self) = @_;
446		564
		565	my $color = $FOCUS == $self && $self->{active_bg}
		566	? $self->{active_bg}
		567	: $self->{bg};
		568
		569	if ($color && (@$color < 4 || $color->[3])) {
447	my ($w, $h) = @$self{qw(w h)};	570	my ($w, $h) = @$self{qw(w h)};
448		571
449	glEnable GL_BLEND;	572	glEnable GL_BLEND;
450	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	573	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	574	glColor @$color;
452		575
453	glBegin GL_QUADS;	576	glBegin GL_QUADS;
454	glVertex 0 , 0;	577	glVertex 0 , 0;
455	glVertex 0 , $h;	578	glVertex 0 , $h;
456	glVertex $w, $h;	579	glVertex $w, $h;
457	glVertex $w, 0;	580	glVertex $w, 0;
458	glEnd;	581	glEnd;
459		582
460	glDisable GL_BLEND;	583	glDisable GL_BLEND;
		584	}
461	}	585	}
462		586
463	#############################################################################	587	#############################################################################
464		588
465	package CFClient::UI::Empty;	589	package CFClient::UI::Empty;
…		…
509	$self->{children} = [	633	$self->{children} = [
510	sort { $a->{z} <=> $b->{z} }	634	sort { $a->{z} <=> $b->{z} }
511	@{$self->{children}}, @widgets	635	@{$self->{children}}, @widgets
512	];	636	];
513		637
514	$self->check_size;	638	$self->check_size (1);
515	$self->update;	639	$self->update;
516	}	640	}
517		641
518	sub children {	642	sub children {
519	@{ $_[0]{children} }	643	@{ $_[0]{children} }
…		…
525	delete $child->{parent};	649	delete $child->{parent};
526	$child->hide;	650	$child->hide;
527		651
528	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529		653
530	$self->check_size;	654	$self->check_size (1);
531	$self->update;	655	$self->update;
532	}	656	}
533		657
534	sub clear {	658	sub clear {
535	my ($self) = @_;	659	my ($self) = @_;
…		…
626	}	750	}
627		751
628	sub update {	752	sub update {
629	my ($self) = @_;	753	my ($self) = @_;
630		754
631	$ROOT->on_refresh ($self => sub { $self->render_child });	755	$ROOT->on_post_alloc ($self => sub { $self->render_child });
632	$self->SUPER::update;	756	$self->SUPER::update;
633	}	757	}
634		758
635	sub size_allocate {	759	sub size_allocate {
636	my ($self, $w, $h) = @_;	760	my ($self, $w, $h) = @_;
…		…
649	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650	glClearColor 0, 0, 0, 0;	774	glClearColor 0, 0, 0, 0;
651	glClear GL_COLOR_BUFFER_BIT;	775	glClear GL_COLOR_BUFFER_BIT;
652		776
653	$self->_render;	777	$self->_render;
654	# glColorMask 1, 1, 1, 0;
655	# glEnable GL_BLEND;
656	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657	# glRasterPos 0, 0;
658	# glCopyPixels 0, 0, $self->{w}, $self->{h};
659	# glDisable GL_BLEND;
660	# glColorMask 1, 1, 1, 1;
661	};	778	};
662	}	779	}
663		780
664	sub _draw {	781	sub _draw {
665	my ($self) = @_;	782	my ($self) = @_;
…		…
669	my $tex = $self->{texture}	786	my $tex = $self->{texture}
670	or return;	787	or return;
671		788
672	glEnable GL_TEXTURE_2D;	789	glEnable GL_TEXTURE_2D;
673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	790	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674	glColor 0, 0, 0, 1;	791	glColor 1, 1, 1, 1;
675		792
676	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	793	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677		794
678	glDisable GL_TEXTURE_2D;	795	glDisable GL_TEXTURE_2D;
679	}	796	}
…		…
682		799
683	package CFClient::UI::ViewPort;	800	package CFClient::UI::ViewPort;
684		801
685	our @ISA = CFClient::UI::Window::;	802	our @ISA = CFClient::UI::Window::;
686		803
		804	sub new {
		805	my $class = shift;
		806
		807	$class->SUPER::new (
		808	scroll_x => 0,
		809	scroll_y => 1,
		810	@_,
		811	)
		812	}
		813
687	sub size_request {	814	sub size_request {
688	my ($self) = @_;	815	my ($self) = @_;
689		816
690	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
692		818
693	@$self{qw(child_w child_h)}	819	@$self{qw(child_w child_h)}
694	}	820	}
695		821
696	sub size_allocate {	822	sub size_allocate {
697	my ($self, $w, $h) = @_;	823	my ($self, $w, $h) = @_;
698		824
		825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		827
		828	$self->child->configure (0, 0, $w, $h);
699	$self->update;	829	$self->update;
700	}	830	}
701		831
702	sub set_offset {	832	sub set_offset {
703	my ($self, $x, $y) = @_;	833	my ($self, $x, $y) = @_;
…		…
754	my $class = shift;	884	my $class = shift;
755		885
756	my $self;	886	my $self;
757		887
758	my $slider = new CFClient::UI::Slider	888	my $slider = new CFClient::UI::Slider
759	vertical => 1,	889	vertical => 1,
760	range => [0, 0, 1, 0.01], # HACK fix	890	range => [0, 0, 1, 0.01], # HACK fix
761	connect_changed => sub {	891	on_changed => sub {
762	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	892	$self->{vp}->set_offset (0, $_[1]);
763	},	893	},
764	;	894	;
765		895
766	$self = $class->SUPER::new (	896	$self = $class->SUPER::new (
767	vp => (new CFClient::UI::ViewPort),	897	vp => (new CFClient::UI::ViewPort expand => 1),
768	slider => $slider,	898	slider => $slider,
769	@_,	899	@_,
770	);	900	);
771		901
772	$self->{vp}->add ($self->{scrolled});	902	$self->{vp}->add ($self->{scrolled});
…		…
774	$self->add ($self->{slider});	904	$self->add ($self->{slider});
775		905
776	$self	906	$self
777	}	907	}
778		908
		909	sub update {
		910	my ($self) = @_;
		911
		912	$self->SUPER::update;
		913
		914	# todo: overwrite size_allocate of child
		915	my $child = $self->{vp}->child;
		916	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		917	}
		918
		919	sub size_allocate {
		920	my ($self, $w, $h) = @_;
		921
		922	$self->SUPER::size_allocate ($w, $h);
		923
		924	my $child = $self->{vp}->child;
		925	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		926	}
		927
779	#TODO# update range on size_allocate depeneing on child	928	#TODO# update range on size_allocate depending on child
780	# update viewport offset on scroll	929	# update viewport offset on scroll
781		930
782	#############################################################################	931	#############################################################################
783		932
784	package CFClient::UI::Frame;	933	package CFClient::UI::Frame;
…		…
788	use CFClient::OpenGL;	937	use CFClient::OpenGL;
789		938
790	sub new {	939	sub new {
791	my $class = shift;	940	my $class = shift;
792		941
793	my $self = $class->SUPER::new (	942	$class->SUPER::new (
794	bg => [1, 1, 1, 1],	943	bg => undef,
795	border_bg => [1, 1, 1, 1],
796	border => 0.8,
797	@_	944	@_,
798	);	945	)
799
800	$self
801	}	946	}
802		947
803	sub _draw {	948	sub _draw {
804	my ($self) = @_;	949	my ($self) = @_;
805		950
806	my ($w, $h) = ($self->{w}, $self->{h});	951	if ($self->{bg}) {
		952	my ($w, $h) = @$self{qw(w h)};
807		953
808	glEnable GL_BLEND;	954	glEnable GL_BLEND;
809	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	955	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810	glEnable GL_TEXTURE_2D;	956	glColor @{ $self->{bg} };
811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812		957
813	# glBegin GL_QUADS;	958	glBegin GL_QUADS;
814	# glColor 0, 0, 0, 0;
815	# glVertex 0 , 0;	959	glVertex 0 , 0;
816	# glVertex 0 , $h;	960	glVertex 0 , $h;
817	# glVertex $w, $h;	961	glVertex $w, $h;
818	# glVertex $w, 0;	962	glVertex $w, 0;
819	# glEnd;	963	glEnd;
820		964
821
822	$self->child->draw;
823	glDisable GL_BLEND;	965	glDisable GL_BLEND;
824	glDisable GL_TEXTURE_2D;	966	}
		967
		968	$self->SUPER::_draw;
825	}	969	}
826		970
827	#############################################################################	971	#############################################################################
828		972
829	package CFClient::UI::FancyFrame;	973	package CFClient::UI::FancyFrame;
…		…
840	my $class = shift;	984	my $class = shift;
841		985
842	# TODO: user_x, user_y, overwrite moveto?	986	# TODO: user_x, user_y, overwrite moveto?
843		987
844	my $self = $class->SUPER::new (	988	my $self = $class->SUPER::new (
845	bg => [1, 1, 1, 1],	989	bg => [1, 1, 1, 1],
846	border_bg => [1, 1, 1, 1],	990	border_bg => [1, 1, 1, 1],
847	border => 0.6,	991	border => 0.6,
		992	is_toplevel => 1,
848	can_events => 1,	993	can_events => 1,
849	@_	994	@_
850	);	995	);
851		996
852	$self->{title} &&= new CFClient::UI::Label	997	$self->{title} &&= new CFClient::UI::Label
853	align => 0,	998	align => 0,
…		…
877	my ($self, $w, $h) = @_;	1022	my ($self, $w, $h) = @_;
878		1023
879	$h -= List::Util::max 0, $self->border * 2;	1024	$h -= List::Util::max 0, $self->border * 2;
880	$w -= List::Util::max 0, $self->border * 2;	1025	$w -= List::Util::max 0, $self->border * 2;
881		1026
882	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883	if $self->{title};	1028	if $self->{title};
884		1029
885	$self->child->configure ($self->border, $self->border, $w, $h);	1030	$self->child->configure ($self->border, $self->border, $w, $h);
886	}	1031	}
887		1032
…		…
906	my ($ev, $x, $y) = @_;	1051	my ($ev, $x, $y) = @_;
907		1052
908	my $dx = $ev->{x} - $ox;	1053	my $dx = $ev->{x} - $ox;
909	my $dy = $ev->{y} - $oy;	1054	my $dy = $ev->{y} - $oy;
910		1055
		1056	$self->{user_x} = $wx + $dx * $mx;
		1057	$self->{user_y} = $wy + $dy * $my;
911	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
912	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1060	$self->move ($self->{user_x}, $self->{user_y});
914	$self->check_size;	1061	$self->check_size;
915	};	1062	};
916		1063
917	} elsif ($lr ^ $td) {	1064	} elsif ($lr ^ $td) {
918	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
921	$self->{motion} = sub {	1068	$self->{motion} = sub {
922	my ($ev, $x, $y) = @_;	1069	my ($ev, $x, $y) = @_;
923		1070
924	($x, $y) = ($ev->{x}, $ev->{y});	1071	($x, $y) = ($ev->{x}, $ev->{y});
925		1072
926	$self->move ($bx + $x - $ox, $by + $y - $oy);	1073	$self->{user_x} = $bx + $x - $ox;
		1074	$self->{user_y} = $by + $y - $oy;
		1075	$self->move ($self->{user_x}, $self->{user_y});
927	$self->update;	1076	$self->update;
928	};	1077	};
929	}	1078	}
930	}	1079	}
931		1080
…		…
945	my ($self) = @_;	1094	my ($self) = @_;
946		1095
947	my ($w, $h ) = ($self->{w}, $self->{h});	1096	my ($w, $h ) = ($self->{w}, $self->{h});
948	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1097	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949		1098
950	glEnable GL_BLEND;
951	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952	glEnable GL_TEXTURE_2D;	1099	glEnable GL_TEXTURE_2D;
953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954		1101
955	my $border = $self->border;	1102	my $border = $self->border;
956		1103
957	glColor @{ $self->{border_bg} };	1104	glColor @{ $self->{border_bg} };
958	$tex[1]->draw_quad (0, 0, $w, $border);	1105	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
959	$tex[3]->draw_quad (0, $border, $border, $ch);	1106	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1107	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1108	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962		1109
963	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1110	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964	my $bg = $tex[0];	1111	my $bg = $tex[0];
965		1112
966	# TODO: repeat texture not scale	1113	# TODO: repeat texture not scale
…		…
970	glColor @{ $self->{bg} };	1117	glColor @{ $self->{bg} };
971		1118
972	$bg->{s} = $rep_x;	1119	$bg->{s} = $rep_x;
973	$bg->{t} = $rep_y;	1120	$bg->{t} = $rep_y;
974	$bg->{wrap_mode} = 1;	1121	$bg->{wrap_mode} = 1;
975	$bg->draw_quad ($border, $border, $cw, $ch);	1122	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1123	}
976		1124
977	glDisable GL_TEXTURE_2D;	1125	glDisable GL_TEXTURE_2D;
978	glDisable GL_BLEND;
979	}
980		1126
981	$self->{title}->draw if $self->{title};	1127	$self->{title}->draw if $self->{title};
982		1128
983	$self->child->draw;	1129	$self->child->draw;
984	}	1130	}
…		…
996	sub new {	1142	sub new {
997	my $class = shift;	1143	my $class = shift;
998		1144
999	$class->SUPER::new (	1145	$class->SUPER::new (
1000	col_expand => [],	1146	col_expand => [],
1001	@_	1147	@_,
1002	)	1148	)
		1149	}
		1150
		1151	sub children {
		1152	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003	}	1153	}
1004		1154
1005	sub add {	1155	sub add {
1006	my ($self, $x, $y, $child) = @_;	1156	my ($self, $x, $y, $child) = @_;
1007		1157
1008	$child->set_parent ($self);	1158	$child->set_parent ($self);
1009	$self->{children}[$y][$x] = $child;	1159	$self->{children}[$y][$x] = $child;
1010		1160
1011	$child->check_size;	1161	$self->check_size (1);
1012	}	1162	}
1013		1163
1014	sub children {
1015	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016	}
1017
1018	# TODO: move to container class maybe? send childs a signal on removal?	1164	# TODO: move to container class maybe? send children a signal on removal?
1019	sub clear {	1165	sub clear {
1020	my ($self) = @_;	1166	my ($self) = @_;
1021		1167
1022	my @children = $self->children;	1168	my @children = $self->children;
1023	delete $self->{children};	1169	delete $self->{children};
…		…
1025	for (@children) {	1171	for (@children) {
1026	delete $_->{parent};	1172	delete $_->{parent};
1027	$_->hide;	1173	$_->hide;
1028	}	1174	}
1029		1175
		1176	$self->check_size (1);
1030	$self->update;	1177	$self->update;
1031	}	1178	}
1032		1179
1033	sub get_wh {	1180	sub get_wh {
1034	my ($self) = @_;	1181	my ($self) = @_;
…		…
1066	sub size_allocate {	1213	sub size_allocate {
1067	my ($self, $w, $h) = @_;	1214	my ($self, $w, $h) = @_;
1068		1215
1069	my ($ws, $hs) = $self->get_wh;	1216	my ($ws, $hs) = $self->get_wh;
1070		1217
1071	my $req_w = sum @$ws;	1218	my $req_w = (sum @$ws) || 1;
1072	my $req_h = sum @$hs;	1219	my $req_h = (sum @$hs) || 1;
1073		1220
1074	# TODO: nicer code && do row_expand	1221	# TODO: nicer code && do row_expand
1075	my @col_expand = @{$self->{col_expand}};	1222	my @col_expand = @{$self->{col_expand}};
1076	@col_expand = (1) x @$ws unless @col_expand;	1223	@col_expand = (1) x @$ws unless @col_expand;
1077	my $col_expand = (sum @col_expand) || 1;	1224	my $col_expand = (sum @col_expand) || 1;
…		…
1251		1398
1252	#############################################################################	1399	#############################################################################
1253		1400
1254	package CFClient::UI::Label;	1401	package CFClient::UI::Label;
1255		1402
1256	our @ISA = CFClient::UI::Base::;	1403	our @ISA = CFClient::UI::DrawBG::;
1257		1404
1258	use CFClient::OpenGL;	1405	use CFClient::OpenGL;
1259		1406
1260	sub new {	1407	sub new {
1261	my ($class, %arg) = @_;	1408	my ($class, %arg) = @_;
1262		1409
1263	my $self = $class->SUPER::new (	1410	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1411	fg => [1, 1, 1],
		1412	#bg => none
		1413	#active_bg => none
1265	#font => default_font	1414	#font => default_font
1266	#text => initial text	1415	#text => initial text
1267	#markup => initial narkup	1416	#markup => initial narkup
		1417	#max_w => maximum pixel width
		1418	ellipsise => 3, # end
1268	layout => (new CFClient::Layout),	1419	layout => (new CFClient::Layout),
1269	fontsize => 1,	1420	fontsize => 1,
1270	align => -1,	1421	align => -1,
1271	valign => -1,	1422	valign => -1,
1272	padding => 2,	1423	padding => 2,
…		…
1287	}	1438	}
1288		1439
1289	$self	1440	$self
1290	}	1441	}
1291		1442
1292	sub escape {	1443	sub escape($) {
1293	local $_ = $_[1];	1444	local $_ = $_[0];
1294		1445
1295	s/&/&amp;/g;	1446	s/&/&amp;/g;
1296	s/>/&gt;/g;	1447	s/>/&gt;/g;
1297	s/</&lt;/g;	1448	s/</&lt;/g;
1298		1449
1299	$_[1]	1450	$_
1300	}	1451	}
1301		1452
1302	sub update {	1453	sub update {
1303	my ($self) = @_;	1454	my ($self) = @_;
1304		1455
…		…
1337	sub size_request {	1488	sub size_request {
1338	my ($self) = @_;	1489	my ($self) = @_;
1339		1490
1340	$self->{layout}->set_font ($self->{font}) if $self->{font};	1491	$self->{layout}->set_font ($self->{font}) if $self->{font};
1341	$self->{layout}->set_width ($self->{max_w} || -1);	1492	$self->{layout}->set_width ($self->{max_w} || -1);
		1493	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1494	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1495	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343		1496
1344	my ($w, $h) = $self->{layout}->size;	1497	my ($w, $h) = $self->{layout}->size;
1345		1498
1346	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1376	}	1529	}
1377		1530
1378	sub _draw {	1531	sub _draw {
1379	my ($self) = @_;	1532	my ($self) = @_;
1380		1533
		1534	$self->SUPER::_draw; # draw background, if applicable
		1535
1381	my $tex = $self->{texture} ||= do {	1536	my $tex = $self->{texture} ||= do {
1382	$self->{layout}->set_foreground (@{$self->{fg}});	1537	$self->{layout}->set_foreground (@{$self->{fg}});
1383	$self->{layout}->set_font ($self->{font}) if $self->{font};	1538	$self->{layout}->set_font ($self->{font}) if $self->{font};
1384	$self->{layout}->set_width ($self->{w});	1539	$self->{layout}->set_width ($self->{w});
		1540	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386		1543
1387	my $tex = new_from_layout CFClient::Texture $self->{layout};	1544	my $tex = new_from_layout CFClient::Texture $self->{layout};
1388		1545
1389	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391	: ($self->{w} - $tex->{w}) * 0.5;	1548	: ($self->{w} - $tex->{w}) * 0.5);
1392		1549
1393	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395	: ($self->{h} - $tex->{h}) * 0.5;	1552	: ($self->{h} - $tex->{h}) * 0.5);
1396		1553
1397	$tex	1554	$tex
1398	};	1555	};
1399		1556
1400	glEnable GL_TEXTURE_2D;	1557	glEnable GL_TEXTURE_2D;
…		…
1428	active_fg => [0, 0, 0],	1585	active_fg => [0, 0, 0],
1429	can_hover => 1,	1586	can_hover => 1,
1430	can_focus => 1,	1587	can_focus => 1,
1431	valign => 0,	1588	valign => 0,
1432	can_events => 1,	1589	can_events => 1,
		1590	#text => ...
1433	@_	1591	@_
1434	)	1592	)
1435	}	1593	}
1436		1594
1437	sub _set_text {	1595	sub _set_text {
…		…
1447	$self->{text} = $text;	1605	$self->{text} = $text;
1448		1606
1449	$text =~ s/./*/g if $self->{hidden};	1607	$text =~ s/./*/g if $self->{hidden};
1450	$self->{layout}->set_text ("$text ");	1608	$self->{layout}->set_text ("$text ");
1451		1609
1452	$self->emit (changed => $self->{text});	1610	$self->_emit (changed => $self->{text});
1453	}	1611	}
1454		1612
1455	sub set_text {	1613	sub set_text {
1456	my ($self, $text) = @_;	1614	my ($self, $text) = @_;
1457		1615
1458	$self->{cursor} = length $text;	1616	$self->{cursor} = length $text;
1459	$self->_set_text ($text);	1617	$self->_set_text ($text);
		1618	$self->update;
1460	$self->check_size;	1619	$self->check_size;
1461	$self->update;
1462	}	1620	}
1463		1621
1464	sub get_text {	1622	sub get_text {
1465	$_[0]{text}	1623	$_[0]{text}
1466	}	1624	}
…		…
1469	my ($self) = @_;	1627	my ($self) = @_;
1470		1628
1471	my ($w, $h) = $self->SUPER::size_request;	1629	my ($w, $h) = $self->SUPER::size_request;
1472		1630
1473	($w + 1, $h) # add 1 for cursor	1631	($w + 1, $h) # add 1 for cursor
1474	}
1475
1476	sub size_allocate {
1477	my ($self, $w, $h) = @_;
1478
1479	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480	}	1632	}
1481		1633
1482	sub key_down {	1634	sub key_down {
1483	my ($self, $ev) = @_;	1635	my ($self, $ev) = @_;
1484		1636
…		…
1486	my $sym = $ev->{sym};	1638	my $sym = $ev->{sym};
1487	my $uni = $ev->{unicode};	1639	my $uni = $ev->{unicode};
1488		1640
1489	my $text = $self->get_text;	1641	my $text = $self->get_text;
1490		1642
1491	if ($sym == 8) {	1643	if ($uni == 8) {
1492	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1644	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493	} elsif ($sym == 127) {	1645	} elsif ($uni == 127) {
1494	substr $text, $self->{cursor}, 1, "";	1646	substr $text, $self->{cursor}, 1, "";
1495	} elsif ($sym == CFClient::SDLK_LEFT) {	1647	} elsif ($sym == CFClient::SDLK_LEFT) {
1496	--$self->{cursor} if $self->{cursor};	1648	--$self->{cursor} if $self->{cursor};
1497	} elsif ($sym == CFClient::SDLK_RIGHT) {	1649	} elsif ($sym == CFClient::SDLK_RIGHT) {
1498	++$self->{cursor} if $self->{cursor} < length $self->{text};	1650	++$self->{cursor} if $self->{cursor} < length $self->{text};
1499	} elsif ($sym == CFClient::SDLK_HOME) {	1651	} elsif ($sym == CFClient::SDLK_HOME) {
1500	$self->{cursor} = 0;	1652	$self->{cursor} = 0;
1501	} elsif ($sym == CFClient::SDLK_END) {	1653	} elsif ($sym == CFClient::SDLK_END) {
1502	$self->{cursor} = length $text;	1654	$self->{cursor} = length $text;
1503	} elsif ($sym == 27) {	1655	} elsif ($uni == 27) {
1504	$self->emit ('escape');	1656	$self->_emit ('escape');
1505	} elsif ($uni) {	1657	} elsif ($uni) {
1506	substr $text, $self->{cursor}++, 0, chr $uni;	1658	substr $text, $self->{cursor}++, 0, chr $uni;
1507	}	1659	}
1508		1660
1509	$self->_set_text ($text);	1661	$self->_set_text ($text);
1510	$self->update;	1662	$self->update;
		1663	$self->check_size;
1511	}	1664	}
1512		1665
1513	sub focus_in {	1666	sub focus_in {
1514	my ($self) = @_;	1667	my ($self) = @_;
1515		1668
…		…
1595	if ($sym == 13) {	1748	if ($sym == 13) {
1596	unshift @{$self->{history}},	1749	unshift @{$self->{history}},
1597	my $txt = $self->get_text;	1750	my $txt = $self->get_text;
1598	$self->{history_pointer} = -1;	1751	$self->{history_pointer} = -1;
1599	$self->{history_saveback} = '';	1752	$self->{history_saveback} = '';
1600	$self->emit (activate => $txt);	1753	$self->_emit (activate => $txt);
1601	$self->update;	1754	$self->update;
1602		1755
1603	} elsif ($sym == CFClient::SDLK_UP) {	1756	} elsif ($sym == CFClient::SDLK_UP) {
1604	if ($self->{history_pointer} < 0) {	1757	if ($self->{history_pointer} < 0) {
1605	$self->{history_saveback} = $self->get_text;	1758	$self->{history_saveback} = $self->get_text;
…		…
1644	my $class = shift;	1797	my $class = shift;
1645		1798
1646	$class->SUPER::new (	1799	$class->SUPER::new (
1647	padding => 4,	1800	padding => 4,
1648	fg => [1, 1, 1],	1801	fg => [1, 1, 1],
1649	bg => [1, 1, 1, 0.2],
1650	active_fg => [0, 0, 1],	1802	active_fg => [0, 0, 1],
1651	can_hover => 1,	1803	can_hover => 1,
1652	align => 0,	1804	align => 0,
1653	valign => 0,	1805	valign => 0,
1654	can_events => 1,	1806	can_events => 1,
1655	@_	1807	@_
1656	)	1808	)
1657	}	1809	}
1658		1810
		1811	sub activate { }
		1812
1659	sub button_up {	1813	sub button_up {
1660	my ($self, $ev, $x, $y) = @_;	1814	my ($self, $ev, $x, $y) = @_;
1661		1815
		1816	$self->emit ("activate")
1662	if ($x >= 0 && $x < $self->{w}	1817	if $x >= 0 && $x < $self->{w}
1663	&& $y >= 0 && $y < $self->{h}) {	1818	&& $y >= 0 && $y < $self->{h};
1664	$self->emit ("activate");
1665	}
1666	}	1819	}
1667		1820
1668	sub _draw {	1821	sub _draw {
1669	my ($self) = @_;	1822	my ($self) = @_;
1670		1823
…		…
1672		1825
1673	if ($GRAB == $self) {	1826	if ($GRAB == $self) {
1674	$self->{fg} = $self->{active_fg};	1827	$self->{fg} = $self->{active_fg};
1675	}	1828	}
1676		1829
1677	glEnable GL_BLEND;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	1830	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1831	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681	glColor 0, 0, 0, 1;	1832	glColor 0, 0, 0, 1;
1682		1833
1683	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1834	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684		1835
1685	glDisable GL_TEXTURE_2D;	1836	glDisable GL_TEXTURE_2D;
1686	glDisable GL_BLEND;
1687		1837
1688	$self->SUPER::_draw;	1838	$self->SUPER::_draw;
1689	}	1839	}
1690		1840
1691	#############################################################################	1841	#############################################################################
…		…
1705		1855
1706	$class->SUPER::new (	1856	$class->SUPER::new (
1707	padding => 2,	1857	padding => 2,
1708	fg => [1, 1, 1],	1858	fg => [1, 1, 1],
1709	active_fg => [1, 1, 0],	1859	active_fg => [1, 1, 0],
		1860	bg => [0, 0, 0, 0.2],
		1861	active_bg => [1, 1, 1, 0.5],
1710	state => 0,	1862	state => 0,
1711	can_hover => 1,	1863	can_hover => 1,
1712	@_	1864	@_
1713	)	1865	)
1714	}	1866	}
…		…
1723	my ($self, $ev, $x, $y) = @_;	1875	my ($self, $ev, $x, $y) = @_;
1724		1876
1725	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1726	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1727	$self->{state} = !$self->{state};	1879	$self->{state} = !$self->{state};
1728	$self->emit (changed => $self->{state});	1880	$self->_emit (changed => $self->{state});
1729	}	1881	}
1730	}	1882	}
1731		1883
1732	sub _draw {	1884	sub _draw {
1733	my ($self) = @_;	1885	my ($self) = @_;
…		…
1738		1890
1739	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1891	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1740		1892
1741	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1893	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742		1894
1743	glEnable GL_BLEND;	1895	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1896
1744	glEnable GL_TEXTURE_2D;	1897	glEnable GL_TEXTURE_2D;
1745	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747	my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749	$tex->draw_quad (0, 0, $s, $s);	1898	$tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751	glDisable GL_TEXTURE_2D;	1899	glDisable GL_TEXTURE_2D;
1752	glDisable GL_BLEND;
1753	}	1900	}
1754		1901
1755	#############################################################################	1902	#############################################################################
1756		1903
1757	package CFClient::UI::Image;	1904	package CFClient::UI::Image;
…		…
1800	glTranslate 0, -$self->{w}, 0;	1947	glTranslate 0, -$self->{w}, 0;
1801		1948
1802	($w, $h) = ($h, $w);	1949	($w, $h) = ($h, $w);
1803	}	1950	}
1804		1951
1805	glEnable GL_BLEND;
1806	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807	glEnable GL_TEXTURE_2D;	1952	glEnable GL_TEXTURE_2D;
1808	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809		1954
1810	$tex->draw_quad (0, 0, $w, $h);	1955	$tex->draw_quad_alpha (0, 0, $w, $h);
1811		1956
1812	glDisable GL_BLEND;
1813	glDisable GL_TEXTURE_2D;	1957	glDisable GL_TEXTURE_2D;
1814	}	1958	}
1815		1959
1816	#############################################################################	1960	#############################################################################
1817		1961
…		…
2006	qw(s1_slider.png s1_slider_bg.png);	2150	qw(s1_slider.png s1_slider_bg.png);
2007		2151
2008	sub new {	2152	sub new {
2009	my $class = shift;	2153	my $class = shift;
2010		2154
2011	# range [value, low, high, page]	2155	# range [value, low, high, page, unit]
2012		2156
2013	# TODO: 0-width page	2157	# TODO: 0-width page
2014	# TODO: req_w/h are wrong with vertical	2158	# TODO: req_w/h are wrong with vertical
2015	# TODO: calculations are off	2159	# TODO: calculations are off
2016	my $self = $class->SUPER::new (	2160	my $self = $class->SUPER::new (
2017	fg => [1, 1, 1],	2161	fg => [1, 1, 1],
2018	active_fg => [0, 0, 0],	2162	active_fg => [0, 0, 0],
		2163	bg => [0, 0, 0, 0.2],
		2164	active_bg => [1, 1, 1, 0.5],
2019	range => [0, 0, 100, 10],	2165	range => [0, 0, 100, 10, 0],
2020	req_w => $::WIDTH / 80,	2166	req_w => $::WIDTH / 80,
2021	req_h => $::WIDTH / 80,	2167	req_h => $::WIDTH / 80,
2022	vertical => 0,	2168	vertical => 0,
2023	can_hover => 1,	2169	can_hover => 1,
2024	inner_pad => 5,	2170	inner_pad => 0.02,
2025	@_	2171	@_
2026	);	2172	);
2027		2173
		2174	$self->set_value ($self->{range}[0]);
		2175	$self->update;
		2176
2028	$self	2177	$self
		2178	}
		2179
		2180	sub set_range {
		2181	my ($self, $range) = @_;
		2182
		2183	($range, $self->{range}) = ($self->{range}, $range);
		2184
		2185	$self->update
		2186	if "@$range" ne "@{$self->{range}}";
		2187	}
		2188
		2189	sub set_value {
		2190	my ($self, $value) = @_;
		2191
		2192	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2193
		2194	$hi = $lo + 1 if $hi <= $lo;
		2195
		2196	$page = $hi - $lo if $page > $hi - $lo;
		2197
		2198	$value = $lo if $value < $lo;
		2199	$value = $hi - $page if $value > $hi - $page;
		2200
		2201	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2202	if $unit;
		2203
		2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2205
		2206	if ($value != $old_value) {
		2207	$self->_emit (changed => $value);
		2208	$self->update;
		2209	}
2029	}	2210	}
2030		2211
2031	sub size_request {	2212	sub size_request {
2032	my ($self) = @_;	2213	my ($self) = @_;
2033		2214
…		…
2039		2220
2040	sub button_down {	2221	sub button_down {
2041	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
2042		2223
2043	$self->SUPER::button_down ($ev, $x, $y);	2224	$self->SUPER::button_down ($ev, $x, $y);
		2225
		2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2227
2044	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
2045	}	2229	}
2046		2230
2047	sub mouse_motion {	2231	sub mouse_motion {
2048	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
2049		2233
2050	if ($GRAB == $self) {	2234	if ($GRAB == $self) {
		2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2236
		2237	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2238
		2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2240
		2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2242	}
		2243	}
		2244
		2245	sub update {
		2246	my ($self) = @_;
		2247
		2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2249	$self->set_value ($self->{range}[0]);
		2250
2051	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
2052		2253
2053	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054		2255
2055	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2256	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2056	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2257	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057		2258
2058	$x -= $inner_pad_px; # substract the padding	2259	$value = ($value - $lo) / $range;
2059	$x = $x * ($hi - $lo) / $inner_w + $lo;	2260	$value = $value * $self->{scale} + $self->{offset};
2060	$x = $lo if $x < $lo;
2061	$x = $hi - $page if $x > $hi - $page;
2062	$self->{range}[0] = $x;
2063		2261
2064	$self->emit (changed => $x);	2262	$self->{knob_x} = $value - $knob_w * 0.5;
2065	$self->update;	2263	$self->{knob_w} = $knob_w;
2066	}	2264	});
2067	}
2068		2265
2069	# the inner_* stuff is for generating a padding for the slider handle,	2266	$self->SUPER::update;
2070	# so that the handle doesn't leave the texture. This calculation isn't 100%
2071	# correct propably, but it does the job for now
2072	sub _calc_inner_pad_px {
2073	my ($self, $w) = @_;
2074	($w / 100) * $self->{inner_pad} # % to pixels
2075	}	2267	}
2076		2268
2077	sub _draw {	2269	sub _draw {
2078	my ($self) = @_;	2270	my ($self) = @_;
2079		2271
2080	$self->SUPER::_draw ();	2272	$self->SUPER::_draw ();
2081		2273
2082	my ($w, $h) = @$self{qw(w h)};	2274	glScale $self->{w}, $self->{h};
2083		2275
2084	if ($self->{vertical}) {	2276	if ($self->{vertical}) {
2085	# draw a vertical slider like a rotated horizontal slider	2277	# draw a vertical slider like a rotated horizontal slider
2086		2278
		2279	glTranslate 1, 0, 0;
2087	glRotate 90, 0, 0, 1;	2280	glRotate 90, 0, 0, 1;
2088	glTranslate 0, -$self->{w}, 0;
2089
2090	($w, $h) = ($h, $w);
2091	}	2281	}
2092		2282
2093	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2283	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2284	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095		2285
2096	my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098	$hi = $value + 1 if $lo == $hi;
2099
2100	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103	$page = int $page * $inner_w / ($hi - $lo);
2104	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106	$w -= $page;
2107	$page &= ~1;
2108	glTranslate $page * 0.5, 0, 0;
2109	$page ||= 2;
2110
2111	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114	glEnable GL_BLEND;
2115	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116	glEnable GL_TEXTURE_2D;	2286	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2287	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2288
2119	# draw background	2289	# draw background
2120	$tex[1]->draw_quad (0, 0, $w, $h);	2290	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121		2291
2122	# draw handle	2292	# draw handle
2123	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2293	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124		2294
2125	glDisable GL_BLEND;
2126	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
2127	}	2296	}
		2297
		2298	#############################################################################
		2299
		2300	package CFClient::UI::ValSlider;
		2301
		2302	our @ISA = CFClient::UI::HBox::;
		2303
		2304	sub new {
		2305	my ($class, %arg) = @_;
		2306
		2307	my $range = delete $arg{range};
		2308
		2309	my $self = $class->SUPER::new (
		2310	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2311	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2312	to_value => sub { shift },
		2313	from_value => sub { shift },
		2314	%arg,
		2315	);
		2316
		2317	$self->{slider}->connect (changed => sub {
		2318	my ($self, $value) = @_;
		2319	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2320	$self->{parent}->emit (changed => $value);
		2321	});
		2322
		2323	# $self->{entry}->connect (changed => sub {
		2324	# my ($self, $value) = @_;
		2325	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2326	# $self->{parent}->emit (changed => $value);
		2327	# });
		2328
		2329	$self->add ($self->{slider}, $self->{entry});
		2330
		2331	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2332
		2333	$self
		2334	}
		2335
		2336	sub set_range { shift->{slider}->set_range (@_) }
		2337	sub set_value { shift->{slider}->set_value (@_) }
2128		2338
2129	#############################################################################	2339	#############################################################################
2130		2340
2131	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
2132		2342
…		…
2141	fontsize => 1,	2351	fontsize => 1,
2142	can_events => 0,	2352	can_events => 0,
2143	#font => default_font	2353	#font => default_font
2144	@_,	2354	@_,
2145		2355
2146	layout => (new CFClient::Layout),	2356	layout => (new CFClient::Layout 1),
2147	par => [],	2357	par => [],
2148	height => 0,	2358	height => 0,
2149	children => [	2359	children => [
2150	(new CFClient::UI::Empty expand => 1),	2360	(new CFClient::UI::Empty expand => 1),
2151	(new CFClient::UI::Slider vertical => 1),	2361	(new CFClient::UI::Slider vertical => 1),
…		…
2162		2372
2163	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
2164	$self->reflow;	2374	$self->reflow;
2165	}	2375	}
2166		2376
2167	sub text_height {
2168	my ($self, $text) = @_;
2169
2170	my $layout = $self->{layout};
2171
2172	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173	$layout->set_width ($self->{children}[0]{w});
2174	$layout->set_text ($text);
2175
2176	($layout->size)[1]
2177	}
2178
2179	sub reflow {
2180	my ($self) = @_;
2181
2182	$self->{need_reflow}++;
2183	$self->update;
2184	}
2185
2186	sub size_allocate {	2377	sub size_allocate {
2187	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h) = @_;
2188		2379
2189	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h);
2190		2381
…		…
2193	$self->{layout}->set_width ($self->{children}[0]{w});	2384	$self->{layout}->set_width ($self->{children}[0]{w});
2194		2385
2195	$self->reflow;	2386	$self->reflow;
2196	}	2387	}
2197		2388
		2389	sub text_size {
		2390	my ($self, $text, $indent) = @_;
		2391
		2392	my $layout = $self->{layout};
		2393
		2394	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2395	$layout->set_width ($self->{children}[0]{w} - $indent);
		2396	$layout->set_markup ($text);
		2397
		2398	$layout->size
		2399	}
		2400
		2401	sub reflow {
		2402	my ($self) = @_;
		2403
		2404	$self->{need_reflow}++;
		2405	$self->update;
		2406	}
		2407
		2408	sub set_offset {
		2409	my ($self, $offset) = @_;
		2410
		2411	# todo: base offset on lines or so, not on pixels
		2412	$self->{children}[1]->set_value ($offset);
		2413	}
		2414
		2415	sub clear {
		2416	my ($self) = @_;
		2417
		2418	$self->{par} = [];
		2419	$self->{height} = 0;
		2420	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2421	}
		2422
2198	sub add_paragraph {	2423	sub add_paragraph {
2199	my ($self, $color, $text) = @_;	2424	my ($self, $color, $text, $indent) = @_;
2200		2425
2201	#TODO: intelligently "reformat" paragraph	2426	for my $line (split /\n/, $text) {
2202		2427	my ($w, $h) = $self->text_size ($line);
2203	my $height = $self->text_height ($text);
2204
2205	$self->{height} += $height;	2428	$self->{height} += $h;
		2429	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2430	}
2206		2431
2207	push @{$self->{par}}, [$height, $color, $text];
2208
2209	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2432	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2210	$self->{children}[1]->update;
2211	}	2433	}
2212		2434
2213	sub update {	2435	sub update {
2214	my ($self) = @_;	2436	my ($self) = @_;
2215		2437
…		…
2217		2439
2218	return unless $self->{h} > 0;	2440	return unless $self->{h} > 0;
2219		2441
2220	delete $self->{texture};	2442	delete $self->{texture};
2221		2443
2222	$ROOT->on_refresh ($self, sub {	2444	$ROOT->on_post_alloc ($self, sub {
		2445	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2446
2223	if (delete $self->{need_reflow}) {	2447	if (delete $self->{need_reflow}) {
2224	my $height = 0;	2448	my $height = 0;
2225		2449
2226	$height += $_->[0] = $self->text_height ($_->[2])	2450	my $layout = $self->{layout};
		2451
		2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2453
2227	for @{$self->{par}};	2454	for (@{$self->{par}}) {
		2455	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2456	$layout->set_width ($W - $_->[3]);
		2457	$layout->set_markup ($_->[4]);
		2458	my ($w, $h) = $layout->size;
		2459	$_->[0] = $w + $_->[3];
		2460	$_->[1] = $h;
		2461	}
		2462
		2463	$height += $_->[1];
		2464	}
2228		2465
2229	$self->{height} = $height;	2466	$self->{height} = $height;
2230		2467
2231	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2468	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2232		2469
2233	delete $self->{texture};	2470	delete $self->{texture};
2234	}	2471	}
2235		2472
2236	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2473	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2237	glClearColor 0, 0, 0, 0;	2474	glClearColor 0.5, 0.5, 0.5, 0;
2238	glClear GL_COLOR_BUFFER_BIT;	2475	glClear GL_COLOR_BUFFER_BIT;
2239		2476
		2477	my $top = int $self->{children}[1]{range}[0];
		2478
		2479	my $y0 = $top;
		2480	my $y1 = $top + $H;
		2481
		2482	my $y = 0;
		2483
		2484	my $layout = $self->{layout};
		2485
		2486	$layout->set_font ($self->{font}) if $self->{font};
		2487
2240	glEnable GL_BLEND;	2488	glEnable GL_BLEND;
		2489	#TODO# not correct in windows where rgba is forced off
2241	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2490	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245	my $top = int $self->{children}[1]{range}[0];
2246
2247	my $y0 = $top;
2248	my $y1 = $top + $self->{h};
2249
2250	my $y = 0;
2251
2252	my $layout = $self->{layout};
2253
2254	$layout->set_font ($self->{font}) if $self->{font};
2255		2491
2256	for my $par (@{$self->{par}}) {	2492	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2493	my $h = $par->[1];
2258		2494
2259	if ($y0 < $y + $h && $y < $y1) {	2495	if ($y0 < $y + $h && $y < $y1) {
		2496	$layout->set_foreground (@{ $par->[2] });
		2497	$layout->set_width ($W - $par->[3]);
2260	$layout->set_text ($par->[2]);	2498	$layout->set_markup ($par->[4]);
2261		2499
2262	glColor @{ $par->[1] };	2500	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263	my ($W, $H) = $layout->size;	2501
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2502	glRasterPos $par->[3], $y - $y0;
		2503	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2504	}
2266		2505
2267	$y += $h;	2506	$y += $h;
2268	}	2507	}
2269		2508
2270	glDisable GL_TEXTURE_2D;
2271	glDisable GL_BLEND;	2509	glDisable GL_BLEND;
2272	};	2510	};
2273	});	2511	});
2274	}	2512	}
2275		2513
2276	sub _draw {	2514	sub _draw {
2277	my ($self) = @_;	2515	my ($self) = @_;
2278		2516
2279	glEnable GL_BLEND;
2280	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281	glEnable GL_TEXTURE_2D;	2517	glEnable GL_TEXTURE_2D;
2282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2518	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283	glColor 1, 1, 1, 1;	2519	glColor 1, 1, 1, 1;
2284	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2520	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285	glDisable GL_TEXTURE_2D;	2521	glDisable GL_TEXTURE_2D;
2286	glDisable GL_BLEND;
2287		2522
2288	$self->{children}[1]->draw;	2523	$self->{children}[1]->draw;
2289		2524
2290	}	2525	}
2291		2526
…		…
2339		2574
2340	sub new {	2575	sub new {
2341	my $class = shift;	2576	my $class = shift;
2342		2577
2343	my $self = $class->SUPER::new (	2578	my $self = $class->SUPER::new (
2344	state => 0,	2579	state => 0,
2345	connect_activate => \&toggle_flopper,	2580	on_activate => \&toggle_flopper,
2346	@_	2581	@_
2347	);	2582	);
2348		2583
2349	if ($self->{state}) {	2584	if ($self->{state}) {
2350	$self->{state} = 0;	2585	$self->{state} = 0;
…		…
2359		2594
2360	# TODO: use animation	2595	# TODO: use animation
2361	if ($self->{state} = !$self->{state}) {	2596	if ($self->{state} = !$self->{state}) {
2362	$CFClient::UI::ROOT->add ($self->{other});	2597	$CFClient::UI::ROOT->add ($self->{other});
2363	$self->{other}->move ($self->coord2global (0, $self->{h}));	2598	$self->{other}->move ($self->coord2global (0, $self->{h}));
2364	$self->emit ("open");	2599	$self->_emit ("open");
2365	} else {	2600	} else {
2366	$CFClient::UI::ROOT->remove ($self->{other});	2601	$CFClient::UI::ROOT->remove ($self->{other});
2367	$self->emit ("close");	2602	$self->_emit ("close");
2368	}	2603	}
2369		2604
2370	$self->emit (changed => $self->{state});	2605	$self->_emit (changed => $self->{state});
2371	}	2606	}
2372		2607
2373	#############################################################################	2608	#############################################################################
2374		2609
2375	package CFClient::UI::Tooltip;	2610	package CFClient::UI::Tooltip;
…		…
2385	@_,	2620	@_,
2386	can_events => 0,	2621	can_events => 0,
2387	)	2622	)
2388	}	2623	}
2389		2624
2390	sub set_markup {	2625	sub set_tooltip_from {
2391	my ($self, $text) = @_;	2626	my ($self, $widget) = @_;
2392		2627
2393	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2628	$self->add (new CFClient::UI::Label
2394	$self->{label}->set_markup ($text);	2629	markup => $widget->{tooltip},
2395	$self->add ($self->{label});	2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2631	fontsize => 0.8,
		2632	fg => [0, 0, 0, 1],
		2633	ellipsise => 0,
		2634	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2635	);
2396	}	2636	}
2397		2637
2398	sub size_request {	2638	sub size_request {
2399	my ($self) = @_;	2639	my ($self) = @_;
2400
2401	$self->child->set_max_size ($::WIDTH * 0.3);
2402		2640
2403	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2641	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404		2642
2405	($w + 4, $h + 4)	2643	($w + 4, $h + 4)
2406	}	2644	}
…		…
2412	}	2650	}
2413		2651
2414	sub _draw {	2652	sub _draw {
2415	my ($self) = @_;	2653	my ($self) = @_;
2416		2654
2417	glPushMatrix;
2418	glTranslate 0.375, 0.375;	2655	glTranslate 0.375, 0.375;
2419		2656
2420	my ($w, $h) = @$self{qw(w h)};	2657	my ($w, $h) = @$self{qw(w h)};
2421		2658
2422	glColor 1, 0.8, 0.4;	2659	glColor 1, 0.8, 0.4;
…		…
2433	glVertex 0 , $h;	2670	glVertex 0 , $h;
2434	glVertex $w, $h;	2671	glVertex $w, $h;
2435	glVertex $w, 0;	2672	glVertex $w, 0;
2436	glEnd;	2673	glEnd;
2437		2674
2438	glPopMatrix;	2675	glTranslate 2 - 0.375, 2 - 0.375;
2439
2440	glTranslate 2, 2;
2441	$self->SUPER::_draw;	2676	$self->SUPER::_draw;
2442	}	2677	}
2443		2678
2444	#############################################################################	2679	#############################################################################
2445		2680
…		…
2450	use CFClient::OpenGL;	2685	use CFClient::OpenGL;
2451		2686
2452	sub new {	2687	sub new {
2453	my $class = shift;	2688	my $class = shift;
2454		2689
2455	$class->SUPER::new (	2690	my $self = $class->SUPER::new (
2456	aspect => 1,	2691	aspect => 1,
		2692	can_events => 0,
2457	@_,	2693	@_,
2458	)	2694	);
		2695
		2696	if ($self->{anim} && $self->{animspeed}) {
		2697	Scalar::Util::weaken (my $widget = $self);
		2698
		2699	$self->{timer} = Event->timer (
		2700	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2701	hard => 1,
		2702	interval => $self->{animspeed},
		2703	cb => sub {
		2704	++$widget->{frame};
		2705	$widget->update;
		2706	},
		2707	);
		2708	}
		2709
		2710	$self
2459	}	2711	}
2460		2712
2461	sub size_request {	2713	sub size_request {
2462	(32, 8)	2714	(32, 8)
2463	}	2715	}
2464		2716
		2717	sub update {
		2718	my ($self) = @_;
		2719
		2720	return unless $self->{visible};
		2721
		2722	$self->SUPER::update;
		2723	}
		2724
2465	sub _draw {	2725	sub _draw {
2466	my ($self) = @_;	2726	my ($self) = @_;
2467		2727
2468	return unless $::CONN;#d# manage and cache textures differently	2728	return unless $::CONN;
		2729
		2730	my $face;
		2731
		2732	if ($self->{frame}) {
		2733	my $anim = $::CONN->{anim}[$self->{anim}];
		2734
		2735	$face = $anim->[ $self->{frame} % @$anim ]
		2736	if $anim && @$anim;
		2737	}
		2738
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2739	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470		2740
2471	# TODO animation
2472	if ($tex) {	2741	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2742	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2743	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2744	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2745	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2746	glDisable GL_TEXTURE_2D;
2480	glDisable GL_BLEND;
2481	}	2747	}
		2748	}
		2749
		2750	sub DESTROY {
		2751	my ($self) = @_;
		2752
		2753	$self->{timer}->cancel
		2754	if $self->{timer};
		2755
		2756	$self->SUPER::DESTROY;
2482	}	2757	}
2483		2758
2484	#############################################################################	2759	#############################################################################
2485		2760
2486	package CFClient::UI::InventoryItem;	2761	package CFClient::UI::Inventory;
2487		2762
2488	our @ISA = CFClient::UI::HBox::;	2763	our @ISA = CFClient::UI::ScrolledWindow::;
2489		2764
2490	sub new {	2765	sub new {
2491	my $class = shift;	2766	my $class = shift;
2492		2767
2493	my %args = @_;
2494
2495	my $item = delete $args{item};
2496
2497	my $desc = $item->{nrof} < 2
2498	? $item->{name}
2499	: "$item->{nrof} $item->{name_pl}";
2500
2501
2502	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2503	can_hover => 1,	2769	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2504	can_events => 1,
2505	tooltip => (CFClient::UI::Label->escape ($desc)
2506	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507	connect_button_down => sub {
2508	my ($self, $ev, $x, $y) = @_;
2509
2510	# todo: maybe put examine on 1? but should just be a tooltip :(
2511	if ($ev->{button} == 1) {
2512	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513	} elsif ($ev->{button} == 2) {
2514	$::CONN->send ("apply $item->{tag}");
2515	} elsif ($ev->{button} == 3) {
2516	CFClient::UI::Menu->new (
2517	items => [
2518	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519	[
2520	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521	sub { $::CONN->send ("lock $item->{tag}") },
2522	],
2523	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526	],
2527	)->popup ($ev);
2528	}
2529
2530	1
2531	},
2532	%args
2533	);
2534
2535	$self->add (new CFClient::UI::Face
2536	can_events => 0,
2537	face => $item->{face},
2538	anim => $item->{anim},
2539	animspeed => $item->{animspeed},
2540	);
2541
2542	$self->add (new CFClient::UI::Label
2543	can_events => 0,
2544	text => $desc,
2545	);
2546
2547	$self
2548	}
2549
2550	#############################################################################
2551
2552	package CFClient::UI::Inventory;
2553
2554	our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556	sub new {
2557	my $class = shift;
2558
2559	my $self = $class->SUPER::new (
2560	scrolled => (new CFClient::UI::VBox),
2561	@_,	2770	@_,
2562	);	2771	);
2563		2772
2564	$self	2773	$self
2565	}	2774	}
…		…
2568	my ($self, $items) = @_;	2777	my ($self, $items) = @_;
2569		2778
2570	$self->{scrolled}->clear;	2779	$self->{scrolled}->clear;
2571	return unless $items;	2780	return unless $items;
2572		2781
2573	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2782	my @items = sort {
		2783	($a->{type} <=> $b->{type})
		2784	or ($a->{name} cmp $b->{name})
		2785	} @$items;
2574		2786
2575	$self->{real_items} = \@items;	2787	$self->{real_items} = \@items;
2576		2788
		2789	my $row = 0;
2577	for my $item (@items) {	2790	for my $item (@items) {
2578	my $desc = $item->{nrof} < 2	2791	CFClient::Item::update_widgets $item;
2579	? $item->{name}
2580	: "$item->{nrof} $item->{name_pl}";
2581		2792
2582	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2793	$self->{scrolled}->add (0, $row, $item->{face_widget});
2583	}	2794	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2795	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2584		2796
2585	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2797	$row++;
		2798	}
2586	}	2799	}
2587		2800
2588	sub size_request {	2801	sub size_request {
2589	my ($self) = @_;	2802	my ($self) = @_;
2590	($self->{req_w}, $self->{req_h});	2803	($self->{req_w}, $self->{req_h});
…		…
2630		2843
2631	# popup given the event (must be a mouse button down event currently)	2844	# popup given the event (must be a mouse button down event currently)
2632	sub popup {	2845	sub popup {
2633	my ($self, $ev) = @_;	2846	my ($self, $ev) = @_;
2634		2847
2635	$self->emit ("popdown");	2848	$self->_emit ("popdown");
2636		2849
2637	# maybe save $GRAB? must be careful about events...	2850	# maybe save $GRAB? must be careful about events...
2638	$GRAB = $self;	2851	$GRAB = $self;
2639	$self->{button} = $ev->{button};	2852	$self->{button} = $ev->{button};
2640		2853
…		…
2655		2868
2656	if ($ev->{button} == $self->{button}) {	2869	if ($ev->{button} == $self->{button}) {
2657	undef $GRAB;	2870	undef $GRAB;
2658	$self->hide;	2871	$self->hide;
2659		2872
2660	$self->emit ("popdown");	2873	$self->_emit ("popdown");
2661	$self->{hover}[1]->() if $self->{hover};	2874	$self->{hover}[1]->() if $self->{hover};
2662	}	2875	}
2663	}	2876	}
2664		2877
2665	#############################################################################	2878	#############################################################################
2666		2879
2667	package CFClient::UI::Statusbox;	2880	package CFClient::UI::Statusbox;
2668		2881
2669	our @ISA = CFClient::UI::VBox::;	2882	our @ISA = CFClient::UI::VBox::;
		2883
		2884	sub new {
		2885	my $class = shift;
		2886
		2887	$class->SUPER::new (
		2888	fontsize => 0.8,
		2889	@_,
		2890	)
		2891	}
2670		2892
2671	sub reorder {	2893	sub reorder {
2672	my ($self) = @_;	2894	my ($self) = @_;
2673	my $NOW = time;	2895	my $NOW = time;
2674		2896
2675	while (my ($k, $v) = each %{ $self->{item} }) {	2897	while (my ($k, $v) = each %{ $self->{item} }) {
2676	delete $self->{item}{$k} if $v->{timeout} < $NOW;	2898	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677	}	2899	}
2678		2900
2679	my @widgets;	2901	my @widgets;
2680	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };	2902
		2903	my @items = sort {
		2904	$a->{pri} <=> $b->{pri}
		2905	or $b->{id} <=> $a->{id}
		2906	} values %{ $self->{item} };
		2907
2681	my $count = 10 + 1;	2908	my $count = 10 + 1;
2682	for my $item (@items) {	2909	for my $item (@items) {
2683	last unless --$count;	2910	last unless --$count;
2684		2911
2685	push @widgets, $item->{label} ||= do {	2912	push @widgets, $item->{label} ||= do {
2686	# TODO: doesn't handle markup well (read as: at all)	2913	# TODO: doesn't handle markup well (read as: at all)
2687	my $short = delete $item->{text};	2914	my $short = $item->{count} > 1
		2915	? "<b>$item->{count} ×</b> $item->{text}"
		2916	: $item->{text};
		2917
2688	for ($short) {	2918	for ($short) {
2689	s/^\s+//;	2919	s/^\s+//;
2690	s/\012.*//s;	2920	s/\s+/ /g;
2691	my $len = int 30 / $item->{fontsize};
2692	substr $_, $len, length, "…" if $len < length;
2693	}	2921	}
2694		2922
2695	new CFClient::UI::Label	2923	new CFClient::UI::Label
2696	markup => $short,	2924	markup => $short,
2697	tooltip => delete $item->{tooltip},	2925	tooltip => $item->{tooltip},
2698	fontsize => delete $item->{fontsize},	2926	tooltip_font => $::FONT_PROP,
2699	color => delete $item->{color},	2927	tooltip_width => 0.67,
		2928	fontsize => $item->{fontsize} || $self->{fontsize},
		2929	max_w => $::WIDTH * 0.44,
		2930	fg => $item->{fg},
2700	can_events => 1,	2931	can_events => 1,
2701	can_hover => 1,	2932	can_hover => 1
2702	};	2933	};
2703	}	2934	}
2704		2935
2705	$self->clear;	2936	$self->clear;
2706	$self->SUPER::add (@widgets);	2937	$self->SUPER::add (reverse @widgets);
2707	}	2938	}
2708		2939
2709	sub add {	2940	sub add {
2710	my ($self, $text, %arg) = @_;	2941	my ($self, $text, %arg) = @_;
2711		2942
2712	my $item = {	2943	$text =~ s/^\s+//;
2713	time => time,	2944	$text =~ s/\s+$//;
		2945
		2946	return unless $text;
		2947
		2948	my $timeout = time + ((delete $arg{timeout}) || 60);
		2949
		2950	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2951
		2952	if (my $item = $self->{item}{$group}) {
		2953	if ($item->{text} eq $text) {
		2954	$item->{count}++;
		2955	} else {
		2956	$item->{count} = 1;
		2957	$item->{text} = $item->{tooltip} = $text;
		2958	}
		2959	$item->{id} = ++$self->{id};
		2960	$item->{timeout} = $timeout;
		2961	delete $item->{label};
		2962	} else {
		2963	$self->{item}{$group} = {
		2964	id => ++$self->{id},
2714	text => $text,	2965	text => $text,
2715	timeout => 60,	2966	timeout => $timeout,
2716	tooltip => $text,	2967	tooltip => $text,
2717	fontsize => 0.8,
2718	color => [0.8, 0.8, 0.8, 0.8],	2968	fg => [0.8, 0.8, 0.8, 0.8],
		2969	pri => 0,
		2970	count => 1,
2719	%arg,	2971	%arg,
		2972	};
2720	};	2973	}
2721
2722	$item->{timeout} += time;
2723	$item->{group} ||= $item+0;
2724
2725	$item = $self->{item}{$item->{group}} ||= $item;
2726		2974
2727	$self->reorder;	2975	$self->reorder;
		2976	}
		2977
		2978	sub reconfigure {
		2979	my ($self) = @_;
		2980
		2981	delete $_->{label}
		2982	for values %{ $self->{item} || {} };
		2983
		2984	$self->reorder;
		2985	$self->SUPER::reconfigure;
2728	}	2986	}
2729		2987
2730	#############################################################################	2988	#############################################################################
2731		2989
2732	package CFClient::UI::Root;	2990	package CFClient::UI::Root;
…		…
2737		2995
2738	sub new {	2996	sub new {
2739	my $class = shift;	2997	my $class = shift;
2740		2998
2741	$class->SUPER::new (	2999	$class->SUPER::new (
		3000	visible => 1,
2742	@_,	3001	@_,
2743	)	3002	)
2744	}	3003	}
2745		3004
2746	sub configure {	3005	sub configure {
…		…
2764	}	3023	}
2765		3024
2766	sub size_allocate {	3025	sub size_allocate {
2767	my ($self, $w, $h) = @_;	3026	my ($self, $w, $h) = @_;
2768		3027
2769	my $old_w = $self->{old_w};
2770	my $old_h = $self->{old_h};
2771
2772	if ($old_w && $old_h) {
2773	for my $child ($self->children) {
2774	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782	}
2783	}
2784
2785	for my $child ($self->children) {	3028	for my $child ($self->children) {
2786	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3029	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787		3030
		3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3032	if exists $child->{req_x};
		3033
		3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3035	if exists $child->{req_y};
		3036
2788	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3037	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2789	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3039
2790	$child->configure ($X, $Y, $W, $H);	3040	$child->configure ($X, $Y, $W, $H);
2791	}	3041	}
2792
2793	$self->{old_w} = $w;
2794	$self->{old_h} = $h;
2795	}	3042	}
2796		3043
2797	sub coord2local {	3044	sub coord2local {
2798	my ($self, $x, $y) = @_;	3045	my ($self, $x, $y) = @_;
2799		3046
…		…
2812	$self->check_size;	3059	$self->check_size;
2813	$::WANT_REFRESH++;	3060	$::WANT_REFRESH++;
2814	}	3061	}
2815		3062
2816	sub add {	3063	sub add {
2817	my ($self, $child) = @_;	3064	my ($self, @children) = @_;
2818		3065
		3066	for (my @widgets = @children; my $w = pop @widgets; ) {
		3067	push @widgets, $w->children;
		3068	$w->{root} = $self;
		3069	$w->{visible} = $self->{visible} + 1;
		3070	}
		3071
		3072	for my $child (@children) {
		3073	$child->{is_toplevel} = 1;
		3074
2819	# integerise window positions	3075	# integerise window positions
2820	$child->{x} = int $child->{x};	3076	$child->{x} = int $child->{x};
2821	$child->{y} = int $child->{y};	3077	$child->{y} = int $child->{y};
		3078	}
2822		3079
2823	$self->SUPER::add ($child);	3080	$self->SUPER::add (@children);
		3081	}
		3082
		3083	sub remove {
		3084	my ($self, @children) = @_;
		3085
		3086	$self->SUPER::remove (@children);
		3087
		3088	while (@children) {
		3089	my $w = pop @children;
		3090	push @children, $w->children;
		3091	$w->set_invisible;
		3092	}
2824	}	3093	}
2825		3094
2826	sub on_refresh {	3095	sub on_refresh {
2827	my ($self, $id, $cb) = @_;	3096	my ($self, $id, $cb) = @_;
2828		3097
2829	$self->{refresh_hook}{$id} = $cb;	3098	$self->{refresh_hook}{$id} = $cb;
2830	}	3099	}
2831		3100
		3101	sub on_post_alloc {
		3102	my ($self, $id, $cb) = @_;
		3103
		3104	$self->{post_alloc_hook}{$id} = $cb;
		3105	}
		3106
2832	sub draw {	3107	sub draw {
2833	my ($self) = @_;	3108	my ($self) = @_;
2834		3109
		3110	while ($self->{refresh_hook}) {
		3111	$_->()
		3112	for values %{delete $self->{refresh_hook}};
		3113	}
		3114
2835	if ($self->{check_size}) {	3115	if ($self->{check_size}) {
2836	my @queue = ([], []);	3116	my @queue;
2837		3117
2838	for (;;) {	3118	for (;;) {
2839	if ($self->{check_size}) {	3119	if ($self->{check_size}) {
2840	# heuristic: check containers last	3120	#TODO use array-of-depth approach
2841	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3121
		3122	@queue = sort { $a->{visible} <=> $b->{visible} }
2842	for values %{delete $self->{check_size}}	3123	@queue, values %{delete $self->{check_size}};
2843	}	3124	}
2844		3125
2845	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3126	my $widget = pop @queue || last;
		3127
		3128	defined $widget->{visible} or last; # do not resize invisible widgets
2846		3129
2847	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3130	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848	? @$widget{qw(user_w user_h)}	3131	? @$widget{qw(user_w user_h)}
2849	: $widget->size_request;	3132	: $widget->size_request;
2850		3133
		3134	if (delete $widget->{force_alloc}
2851	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3135	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2852	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3136	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853		3137
2854	$widget->{req_w} = $w;	3138	$widget->{req_w} = $w;
2855	$widget->{req_h} = $h;	3139	$widget->{req_h} = $h;
2856		3140
2857	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3141	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2858		3142
2859	$widget->{parent}->check_size	3143	$widget->{parent}->check_size
2860	if $widget->{parent};	3144	if $widget->{parent};
2861	}	3145	}
2862	}	3146	}
…		…
2869	$w = 0 if $w < 0;	3153	$w = 0 if $w < 0;
2870	$h = 0 if $h < 0;	3154	$h = 0 if $h < 0;
2871		3155
2872	$widget->{w} = $w;	3156	$widget->{w} = $w;
2873	$widget->{h} = $h;	3157	$widget->{h} = $h;
2874	$widget->size_allocate ($w, $h);
2875	$widget->emit (size_allocate => $w, $h);	3158	$widget->emit (size_allocate => $w, $h);
2876	}	3159	}
2877	}	3160	}
2878		3161
2879	while ($self->{refresh_hook}) {	3162	while ($self->{post_alloc_hook}) {
2880	$_->()	3163	$_->()
2881	for values %{delete $self->{refresh_hook}};	3164	for values %{delete $self->{post_alloc_hook}};
2882	}	3165	}
2883		3166
2884	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3167	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886	glClear GL_COLOR_BUFFER_BIT;	3169	glClear GL_COLOR_BUFFER_BIT;
2887		3170
2888	glMatrixMode GL_PROJECTION;	3171	glMatrixMode GL_PROJECTION;
2889	glLoadIdentity;	3172	glLoadIdentity;
2890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3173	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891	glMatrixMode GL_MODELVIEW;	3174	glMatrixMode GL_MODELVIEW;
2892	glLoadIdentity;	3175	glLoadIdentity;
2893		3176
2894	$self->_draw;	3177	$self->_draw;
2895	}	3178	}
…		…
2897	#############################################################################	3180	#############################################################################
2898		3181
2899	package CFClient::UI;	3182	package CFClient::UI;
2900		3183
2901	$ROOT = new CFClient::UI::Root;	3184	$ROOT = new CFClient::UI::Root;
2902	$TOOLTIP = new CFClient::UI::Tooltip;	3185	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903		3186
2904	1	3187	1
2905		3188

Diff Legend

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