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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.450 by root, Wed Dec 26 15:29:43 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;
9		7
10	use CFClient;	8	use CFPlus;
		9	use CFPlus::Pod;
11	use CFClient::Texture;	10	use CFPlus::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	29	$TOOLTIP->hide;
28		30
29	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
		32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		33
31	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
32		35
33	my $tip = $widget->{tooltip};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	37	$TOOLTIP->show;
39	}	38	}
40		39
41	return;	40	return;
42	}	41	}
43	}	42	}
44	}	43	}
45		44
46	$TOOLTIP->hide;	45	$TOOLTIP->hide;
		46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
48	});	48	};
49		49
50	sub get_layout {	50	sub get_layout {
51	my $layout;	51	my $layout;
52		52
53	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
79	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	81	if $FOCUS;
82	}	82	}
83		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->again;
		94	}
		95	}
		96
84	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	98	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
87		100
88	if (!$BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
90		105
91	$GRAB = $widget;	106	$GRAB = $widget;
92	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
93		108
94	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
95	}	110	}
96		111
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
		114	# mousewheel
		115	my $delta = $ev->{button} * 2 - 9;
		116	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		117
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	118	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	119	$ev->{dy} = $shift ? 0 : $delta;
		120
		121	$GRAB->emit (mouse_wheel => $ev);
		122	} else {
		123	$GRAB->emit (button_down => $ev)
		124	}
		125	}
101	}	126	}
102		127
103	sub feed_sdl_button_up_event {	128	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	129	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		130
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	131	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		132
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	133	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		134
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	135	$GRAB->emit (button_up => $ev)
112	if $GRAB;	136	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		137
114	if (!$BUTTON_STATE) {	138	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	140	$grab->update if $grab;
117	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
118		142
		143	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
120	}	145	}
121	}	146	}
122		147
123	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
124	my ($ev) = @_;	149	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	150	my ($x, $y) = ($ev->{x}, $ev->{y});
126		151
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	152	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		153
129	if ($widget != $HOVER) {	154	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		155
132	$hover->update if $hover && $hover->{can_hover};	156	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	157	if $HOVER;
140	}	158	}
141		159
142	# convert position array to integers	160	# convert position array to integers
143	sub harmonize {	161	sub harmonize {
…		…
193	reconfigure_widgets;	211	reconfigure_widgets;
194	}	212	}
195		213
196	#############################################################################	214	#############################################################################
197		215
		216	package CFPlus::UI::Event;
		217
		218	sub xy {
		219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		220	}
		221
		222	#############################################################################
		223
198	package CFClient::UI::Base;	224	package CFPlus::UI::Base;
199		225
200	use strict;	226	use strict;
201		227
202	use CFClient::OpenGL;	228	use CFPlus::OpenGL;
203		229
204	sub new {	230	sub new {
205	my $class = shift;	231	my $class = shift;
206		232
207	my $self = bless {	233	my $self = bless {
…		…
212	h => undef,	238	h => undef,
213	can_events => 1,	239	can_events => 1,
214	@_	240	@_
215	}, $class;	241	}, $class;
216		242
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	243	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		244
219	for (keys %$self) {	245	for (keys %$self) {
220	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
222	}	248	}
223	}	249	}
224		250
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	252	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	253	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	254	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	255	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		256
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		259
234	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
239		265
240	sub destroy {	266	sub destroy {
241	my ($self) = @_;	267	my ($self) = @_;
242		268
243	$self->hide;	269	$self->hide;
		270	$self->emit ("destroy");
244	%$self = ();	271	%$self = ();
245	}	272	}
246		273
		274	sub TO_JSON {
		275	{ "\fw" => $_[0]{s_id} }
		276	}
		277
247	sub show {	278	sub show {
248	my ($self) = @_;	279	my ($self) = @_;
249		280
250	return if $self->{parent};	281	return if $self->{parent};
251		282
252	$CFClient::UI::ROOT->add ($self);	283	$CFPlus::UI::ROOT->add ($self);
253	}	284	}
254		285
255	sub set_visible {	286	sub set_visible {
256	my ($self) = @_;	287	my ($self) = @_;
257		288
…		…
278	delete $self->{root};	309	delete $self->{root};
279		310
280	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
282		313
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	314	$CFPlus::UI::TOOLTIP_WATCHER->invoke
284	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
285		316
286	$self->emit ("focus_out");	317	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
288	}	319	}
…		…
290	sub set_visibility {	321	sub set_visibility {
291	my ($self, $visible) = @_;	322	my ($self, $visible) = @_;
292		323
293	return if $self->{visible} == $visible;	324	return if $self->{visible} == $visible;
294		325
295	$visible ? $self->hide	326	$visible ? $self->show
296	: $self->show;	327	: $self->hide;
297	}	328	}
298		329
299	sub toggle_visibility {	330	sub toggle_visibility {
300	my ($self) = @_;	331	my ($self) = @_;
301		332
…		…
330	$self->{force_h} = $h;	361	$self->{force_h} = $h;
331		362
332	$self->realloc;	363	$self->realloc;
333	}	364	}
334		365
		366	# traverse the widget chain up to find the maximum "physical" size constraints
		367	sub get_max_wh {
		368	my ($self) = @_;
		369
		370	return $self->{parent}->get_max_wh
		371	if $self->{parent};
		372
		373	($::WIDTH, $::HEIGHT)
		374	}
		375
335	sub size_request {	376	sub size_request {
336	require Carp;	377	require Carp;
337	Carp::confess "size_request is abstract";	378	Carp::confess "size_request is abstract";
338	}	379	}
339		380
		381	sub baseline_shift {
		382	0
		383	}
		384
340	sub configure {	385	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	386	my ($self, $x, $y, $w, $h) = @_;
342		387
343	if ($self->{aspect}) {	388	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	389	my ($ow, $oh) = ($w, $h);
345		390
346	$w = List::Util::min $w, int $h * $self->{aspect};	391	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	392	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		393
349	# use alignment to adjust x, y	394	# use alignment to adjust x, y
350		395
351	$x += int 0.5 * ($ow - $w);	396	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	397	$y += int 0.5 * ($oh - $h);
…		…
393		438
394	return if $self->{tooltip} eq $tooltip;	439	return if $self->{tooltip} eq $tooltip;
395		440
396	$self->{tooltip} = $tooltip;	441	$self->{tooltip} = $tooltip;
397		442
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	443	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	444	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	445	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
401	}	446	}
402	}	447	}
403		448
404	# translate global coordinates to local coordinate system	449	# translate global coordinates to local coordinate system
405	sub coord2local {	450	sub coord2local {
406	my ($self, $x, $y) = @_;	451	my ($self, $x, $y) = @_;
407		452
		453	return (undef, undef) unless $self->{parent};
		454
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	455	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	456	}
410		457
411	# translate local coordinates to global coordinate system	458	# translate local coordinates to global coordinate system
412	sub coord2global {	459	sub coord2global {
413	my ($self, $x, $y) = @_;	460	my ($self, $x, $y) = @_;
414		461
		462	return (undef, undef) unless $self->{parent};
		463
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	464	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	465	}
417		466
418	sub invoke_focus_in {	467	sub invoke_focus_in {
419	my ($self) = @_;	468	my ($self) = @_;
420		469
421	return if $FOCUS == $self;	470	return if $FOCUS == $self;
422	return unless $self->{can_focus};	471	return unless $self->{can_focus};
423		472
424	my $focus = $FOCUS; $FOCUS = $self;	473	$FOCUS = $self;
425		474
426	$focus->update if $focus;	475	$self->update;
427	$FOCUS->update;
428		476
429	0	477	0
430	}	478	}
431		479
432	sub invoke_focus_out {	480	sub invoke_focus_out {
433	my ($self) = @_;	481	my ($self) = @_;
434		482
435	return unless $FOCUS == $self;	483	return unless $FOCUS == $self;
436		484
437	my $focus = $FOCUS; undef $FOCUS;	485	undef $FOCUS;
438		486
439	$focus->update if $focus; #?	487	$self->update;
440		488
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	489	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	490	unless $FOCUS;
443		491
444	0	492	0
445	}	493	}
446		494
447	sub grab_focus {	495	sub grab_focus {
448	my ($self) = @_;	496	my ($self) = @_;
449		497
		498	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	499	$self->emit ("focus_in");
451	}	500	}
452		501
453	sub invoke_mouse_motion { 1 }	502	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	503	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	504	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	505	sub invoke_key_up { 0 }
		506	sub invoke_mouse_wheel { 0 }
457		507
458	sub invoke_button_down {	508	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	509	my ($self, $ev, $x, $y) = @_;
460		510
461	$self->grab_focus;	511	$self->grab_focus;
462		512
463	1	513	0
464	}	514	}
465		515
466	sub connect {	516	sub connect {
467	my ($self, $signal, $cb) = @_;	517	my ($self, $signal, $cb) = @_;
468		518
469	push @{ $self->{signal_cb}{$signal} }, $cb;	519	push @{ $self->{signal_cb}{$signal} }, $cb;
		520
		521	defined wantarray and CFPlus::guard {
		522	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		523	@{ $self->{signal_cb}{$signal} };
		524	}
470	}	525	}
		526
		527	sub disconnect_all {
		528	my ($self, $signal) = @_;
		529
		530	delete $self->{signal_cb}{$signal};
		531	}
		532
		533	my %has_coords = (
		534	button_down => 1,
		535	button_up => 1,
		536	mouse_motion => 1,
		537	mouse_wheel => 1,
		538	);
471		539
472	sub emit {	540	sub emit {
473	my ($self, $signal, @args) = @_;	541	my ($self, $signal, @args) = @_;
474		542
475	#d##TODO# stop propagating at first true, do not use sum	543	# I do not really like this solution, but I do not like duplication
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	544	# and needlessly verbose code, either.
		545	my @append
		546	= $has_coords{$signal}
		547	? $args[0]->xy ($self)
		548	: ();
		549
		550	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		551
		552	for my $cb (
		553	@{$self->{signal_cb}{$signal} || []}, # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	554	($self->can ("invoke_$signal") || sub { 1 }), # closure
		555	) {
		556	return $cb->($self, @args, @append) || next;
		557	}
		558
		559	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	560	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	561	}
480		562
481	sub find_widget {	563	#sub find_widget {
482	my ($self, $x, $y) = @_;	564	# in .xs
483
484	return () unless $self->{can_events};
485
486	return $self
487	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490	()
491	}
492		565
493	sub set_parent {	566	sub set_parent {
494	my ($self, $parent) = @_;	567	my ($self, $parent) = @_;
495		568
496	Scalar::Util::weaken ($self->{parent} = $parent);	569	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	570	$self->set_visible if $parent->{visible};
498	}	571	}
499		572
500	sub realloc {	573	sub realloc {
501	my ($self) = @_;	574	my ($self) = @_;
…		…
527		600
528	# using global variables seems a bit hacky, but passing through all drawing	601	# using global variables seems a bit hacky, but passing through all drawing
529	# functions seems pointless.	602	# functions seems pointless.
530	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	603	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531		604
532	sub draw {	605	#sub draw {
533	my ($self) = @_;	606	#CFPlus.xs
534
535	return unless $self->{h} && $self->{w};
536
537	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542
543	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546
547	glPushMatrix;
548	glTranslate $self->{x}, $self->{y}, 0;
549
550	if ($self == $HOVER && $self->{can_hover}) {
551	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
552	glEnable GL_BLEND;
553	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
554	glBegin GL_QUADS;
555	glVertex 0 , 0;
556	glVertex $self->{w}, 0;
557	glVertex $self->{w}, $self->{h};
558	glVertex 0 , $self->{h};
559	glEnd;
560	glDisable GL_BLEND;
561	}
562
563	if ($ENV{CFPLUS_DEBUG} & 1) {
564	glPushMatrix;
565	glColor 1, 1, 0, 1;
566	glTranslate 0.375, 0.375;
567	glBegin GL_LINE_LOOP;
568	glVertex 0 , 0;
569	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;
572	glEnd;
573	glPopMatrix;
574	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575	}
576
577	$self->_draw;
578	glPopMatrix;
579	}
580		607
581	sub _draw {	608	sub _draw {
582	my ($self) = @_;	609	my ($self) = @_;
583		610
584	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
585	}	612	}
586		613
587	sub DESTROY {	614	sub DESTROY {
588	my ($self) = @_;	615	my ($self) = @_;
589		616
590	delete $WIDGET{$self+0};	617	return if CFPlus::in_destruct;
591		618
		619	local $@;
592	eval { $self->destroy };	620	eval { $self->destroy };
593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	621	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		622
		623	delete $WIDGET{$self+0};
594	}	624	}
595		625
596	#############################################################################	626	#############################################################################
597		627
598	package CFClient::UI::DrawBG;	628	package CFPlus::UI::DrawBG;
599		629
600	our @ISA = CFClient::UI::Base::;	630	our @ISA = CFPlus::UI::Base::;
601		631
602	use strict;	632	use strict;
603	use CFClient::OpenGL;	633	use CFPlus::OpenGL;
604		634
605	sub new {	635	sub new {
606	my $class = shift;	636	my $class = shift;
607
608	# range [value, low, high, page]
609		637
610	$class->SUPER::new (	638	$class->SUPER::new (
611	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
612	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
613	@_	641	@_
…		…
625	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
626		654
627	glEnable GL_BLEND;	655	glEnable GL_BLEND;
628	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
629	glColor_premultiply @$color;	657	glColor_premultiply @$color;
630
631	glBegin GL_QUADS;
632	glVertex 0 , 0;
633	glVertex 0 , $h;
634	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
635	glVertex $w, 0;
636	glEnd;
637
638	glDisable GL_BLEND;	659	glDisable GL_BLEND;
639	}	660	}
640	}	661	}
641		662
642	#############################################################################	663	#############################################################################
643		664
644	package CFClient::UI::Empty;	665	package CFPlus::UI::Empty;
645		666
646	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
647		668
648	sub new {	669	sub new {
649	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	671	$class->SUPER::new (can_events => 0, %arg);
651	}	672	}
…		…
658		679
659	sub draw { }	680	sub draw { }
660		681
661	#############################################################################	682	#############################################################################
662		683
663	package CFClient::UI::Container;	684	package CFPlus::UI::Container;
664		685
665	our @ISA = CFClient::UI::Base::;	686	our @ISA = CFPlus::UI::Base::;
666		687
667	sub new {	688	sub new {
668	my ($class, %arg) = @_;	689	my ($class, %arg) = @_;
669		690
670	my $children = delete $arg{children};	691	my $children = delete $arg{children};
…		…
674	can_events => 0,	695	can_events => 0,
675	%arg,	696	%arg,
676	);	697	);
677		698
678	$self->add (@$children)	699	$self->add (@$children)
679	if $children;	700	if $children && @$children;
680		701
681	$self	702	$self
		703	}
		704
		705	sub realloc {
		706	my ($self) = @_;
		707
		708	$self->{force_realloc} = 1;
		709	$self->{force_size_alloc} = 1;
		710	$self->SUPER::realloc;
682	}	711	}
683		712
684	sub add {	713	sub add {
685	my ($self, @widgets) = @_;	714	my ($self, @widgets) = @_;
686		715
687	$_->set_parent ($self)	716	$_->set_parent ($self)
688	for @widgets;	717	for @widgets;
689		718
		719	# TODO: only do this in widgets that need it, e.g. root, fixed
690	use sort 'stable';	720	use sort 'stable';
691		721
692	$self->{children} = [	722	$self->{children} = [
693	sort { $a->{z} <=> $b->{z} }	723	sort { $a->{z} <=> $b->{z} }
694	@{$self->{children}}, @widgets	724	@{$self->{children}}, @widgets
695	];	725	];
696		726
697	$self->realloc;	727	$self->realloc;
		728
		729	$self->emit (c_add => \@widgets);
		730
		731	map $_+0, @widgets
698	}	732	}
699		733
700	sub children {	734	sub children {
701	@{ $_[0]{children} }	735	@{ $_[0]{children} }
702	}	736	}
703		737
704	sub remove {	738	sub remove {
705	my ($self, $child) = @_;	739	my ($self, @widgets) = @_;
706		740
		741	$self->emit (c_remove => \@widgets);
		742
		743	for my $child (@widgets) {
707	delete $child->{parent};	744	delete $child->{parent};
708	$child->hide;	745	$child->hide;
709
710	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	746	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		747	}
711		748
712	$self->realloc;	749	$self->realloc;
713	}	750	}
714		751
715	sub clear {	752	sub clear {
716	my ($self) = @_;	753	my ($self) = @_;
717		754
718	my $children = delete $self->{children};	755	my $children = $self->{children};
719	$self->{children} = [];	756	$self->{children} = [];
720		757
721	for (@$children) {	758	for (@$children) {
722	delete $_->{parent};	759	delete $_->{parent};
723	$_->hide;	760	$_->hide;
…		…
743	}	780	}
744		781
745	sub _draw {	782	sub _draw {
746	my ($self) = @_;	783	my ($self) = @_;
747		784
748	$_->draw for @{$self->{children}};	785	$_->draw for $self->visible_children;
749	}	786	}
750		787
751	#############################################################################	788	#############################################################################
752		789
753	package CFClient::UI::Bin;	790	package CFPlus::UI::Bin;
754		791
755	our @ISA = CFClient::UI::Container::;	792	our @ISA = CFPlus::UI::Container::;
756		793
757	sub new {	794	sub new {
758	my ($class, %arg) = @_;	795	my ($class, %arg) = @_;
759		796
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	797	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		798
762	$class->SUPER::new (children => [$child], %arg)	799	$class->SUPER::new (children => [$child], %arg)
763	}	800	}
764		801
765	sub add {	802	sub add {
766	my ($self, $child) = @_;	803	my ($self, $child) = @_;
767		804
768	$self->SUPER::remove ($_) for @{ $self->{children} };	805	$self->clear;
769	$self->SUPER::add ($child);	806	$self->SUPER::add ($child);
770	}	807	}
771		808
772	sub remove {	809	sub remove {
773	my ($self, $widget) = @_;	810	my ($self, $widget) = @_;
774		811
775	$self->SUPER::remove ($widget);	812	$self->SUPER::remove ($widget);
776		813
777	$self->{children} = [new CFClient::UI::Empty]	814	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	815	unless @{$self->{children}};
779	}	816	}
780		817
781	sub child { $_[0]->{children}[0] }	818	sub child { $_[0]->{children}[0] }
782		819
…		…
791		828
792	1	829	1
793	}	830	}
794		831
795	#############################################################################	832	#############################################################################
796
797	# back-buffered drawing area	833	# back-buffered drawing area
798		834
799	package CFClient::UI::Window;	835	package CFPlus::UI::Window;
800		836
801	our @ISA = CFClient::UI::Bin::;	837	our @ISA = CFPlus::UI::Bin::;
802		838
803	use CFClient::OpenGL;	839	use CFPlus::OpenGL;
804		840
805	sub new {	841	sub new {
806	my ($class, %arg) = @_;	842	my ($class, %arg) = @_;
807		843
808	my $self = $class->SUPER::new (%arg);	844	my $self = $class->SUPER::new (%arg);
…		…
830	}	866	}
831		867
832	sub render_child {	868	sub render_child {
833	my ($self) = @_;	869	my ($self) = @_;
834		870
835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	871	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836	glClearColor 0, 0, 0, 0;	872	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	873	glClear GL_COLOR_BUFFER_BIT;
838		874
839	{	875	{
840	package CFClient::UI::Base;	876	package CFPlus::UI::Base;
841		877
842	($draw_x, $draw_y, $draw_w, $draw_h) =	878	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	879	(0, 0, $self->{w}, $self->{h});
		880
		881	$self->_render;
844	}	882	}
845
846	$self->_render;
847	};	883	};
848	}	884	}
849		885
850	sub _draw {	886	sub _draw {
851	my ($self) = @_;	887	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		888
855	my $tex = $self->{texture}	889	my $tex = $self->{texture}
856	or return;	890	or return;
857		891
858	glEnable GL_TEXTURE_2D;	892	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	894	glColor 0, 0, 0, 1;
861		895
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	896	$tex->draw_quad_alpha_premultiplied (0, 0);
863		897
864	glDisable GL_TEXTURE_2D;	898	glDisable GL_TEXTURE_2D;
865	}	899	}
866		900
867	#############################################################################	901	#############################################################################
868		902
869	package CFClient::UI::ViewPort;	903	package CFPlus::UI::ViewPort;
870		904
		905	use List::Util qw(min max);
		906
871	our @ISA = CFClient::UI::Window::;	907	our @ISA = CFPlus::UI::Window::;
872		908
873	sub new {	909	sub new {
874	my $class = shift;	910	my $class = shift;
875		911
876	$class->SUPER::new (	912	$class->SUPER::new (
…		…
883	sub size_request {	919	sub size_request {
884	my ($self) = @_;	920	my ($self) = @_;
885		921
886	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887		923
888	$w = 10 if $self->{scroll_x};	924	$w = 1 if $self->{scroll_x};
889	$h = 10 if $self->{scroll_y};	925	$h = 1 if $self->{scroll_y};
890		926
891	($w, $h)	927	($w, $h)
892	}	928	}
893		929
894	sub invoke_size_allocate {	930	sub invoke_size_allocate {
…		…
906	}	942	}
907		943
908	sub set_offset {	944	sub set_offset {
909	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
910		946
		947	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		948	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		949
		950	if ($x != $self->{view_x} or $y != $self->{view_y}) {
911	$self->{view_x} = int $x;	951	$self->{view_x} = $x;
912	$self->{view_y} = int $y;	952	$self->{view_y} = $y;
913		953
		954	$self->emit (changed => $x, $y);
914	$self->update;	955	$self->update;
		956	}
		957	}
		958
		959	sub set_center {
		960	my ($self, $x, $y) = @_;
		961
		962	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		963	}
		964
		965	sub make_visible {
		966	my ($self, $x, $y, $border) = @_;
		967
		968	if ( $x < $self->{view_x} + $self->{w} * $border
		969	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		970	|| $y < $self->{view_y} + $self->{h} * $border
		971	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		972	) {
		973	$self->set_center ($x, $y);
		974	}
915	}	975	}
916		976
917	# hmm, this does not work for topleft of $self... but we should not ask for that	977	# hmm, this does not work for topleft of $self... but we should not ask for that
918	sub coord2local {	978	sub coord2local {
919	my ($self, $x, $y) = @_;	979	my ($self, $x, $y) = @_;
…		…
934	my ($self, $x, $y) = @_;	994	my ($self, $x, $y) = @_;
935		995
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	998	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1000	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1002	}
943	}	1003	}
944		1004
945	sub _render {	1005	sub _render {
946	my ($self) = @_;	1006	my ($self) = @_;
947		1007
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1008	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1009	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1010
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1011	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1012
953	$self->SUPER::_render;	1013	$self->SUPER::_render;
954	}	1014	}
955		1015
956	#############################################################################	1016	#############################################################################
957		1017
958	package CFClient::UI::ScrolledWindow;	1018	package CFPlus::UI::ScrolledWindow;
959		1019
960	our @ISA = CFClient::UI::HBox::;	1020	our @ISA = CFPlus::UI::Table::;
961		1021
962	sub new {	1022	sub new {
963	my ($class, %arg) = @_;	1023	my ($class, %arg) = @_;
964		1024
965	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
966		1026
967	my $self;	1027	my $self;
968		1028
969	my $slider = new CFClient::UI::Slider	1029	my $hslider = new CFPlus::UI::Slider
		1030	c_col => 0,
		1031	c_row => 1,
		1032	vertical => 0,
		1033	range => [0, 0, 1, 0.01], # HACK fix
		1034	on_changed => sub {
		1035	$self->{hpos} = $_[1];
		1036	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1037	},
		1038	;
		1039
		1040	my $vslider = new CFPlus::UI::Slider
		1041	c_col => 1,
		1042	c_row => 0,
970	vertical => 1,	1043	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1045	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1046	$self->{vpos} = $_[1];
		1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1048	},
975	;	1049	;
976		1050
977	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1052	scroll_x => 0,
		1053	scroll_y => 1,
		1054	can_events => 1,
979	slider => $slider,	1055	hslider => $hslider,
		1056	vslider => $vslider,
		1057	col_expand => [1, 0],
		1058	row_expand => [1, 0],
980	%arg,	1059	%arg,
981	);	1060	);
982		1061
		1062	$self->{vp} = new CFPlus::UI::ViewPort
		1063	c_col => 0,
		1064	c_row => 0,
		1065	expand => 1,
		1066	scroll_x => $self->{scroll_x},
		1067	scroll_y => $self->{scroll_y},
		1068	on_changed => sub {
		1069	my ($vp, $x, $y) = @_;
		1070
		1071	$vp->{parent}{hslider}->set_value ($x);
		1072	$vp->{parent}{vslider}->set_value ($y);
		1073
		1074	0
		1075	},
		1076	on_size_allocate => sub {
		1077	my ($vp, $w, $h) = @_;
		1078	$vp->{parent}->update_slider;
		1079	0
		1080	},
		1081	;
		1082
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add ($self->{vp});
		1084
984	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
985		1086
986	$self	1087	$self
987	}	1088	}
988		1089
…		…
990	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
991		1092
992	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
993	}	1094	}
994		1095
		1096	sub set_offset { shift->{vp}->set_offset (@_) }
		1097	sub set_center { shift->{vp}->set_center (@_) }
		1098	sub make_visible { shift->{vp}->make_visible (@_) }
		1099
995	sub update {	1100	sub update_slider {
		1101	my ($self) = @_;
		1102
		1103	my $child = ($self->{vp} or return)->child;
		1104
		1105	if ($self->{scroll_x}) {
		1106	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1107	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1108
		1109	my $visible = $w1 > $w2;
		1110	if ($visible != $self->{hslider_visible}) {
		1111	$self->{hslider_visible} = $visible;
		1112	$visible ? $self->SUPER::add ($self->{hslider})
		1113	: $self->SUPER::remove ($self->{hslider});
		1114	}
		1115	}
		1116
		1117	if ($self->{scroll_y}) {
		1118	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120
		1121	my $visible = $h1 > $h2;
		1122	if ($visible != $self->{vslider_visible}) {
		1123	$self->{vslider_visible} = $visible;
		1124	$visible ? $self->SUPER::add ($self->{vslider})
		1125	: $self->SUPER::remove ($self->{vslider});
		1126	}
		1127	}
		1128	}
		1129
		1130	sub start_dragging {
996	my ($self) = @_;	1131	my ($self, $ev) = @_;
997		1132
998	$self->SUPER::update;	1133	$self->grab_focus;
999		1134
1000	# todo: overwrite size_allocate of child	1135	my $ox = $self->{vp}{view_x};
1001	my $child = $self->{vp}->child;	1136	my $oy = $self->{vp}{view_y};
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1137
		1138	$self->{motion} = sub {
		1139	my ($ev, $x, $y) = @_;
		1140
		1141	$ox -= $ev->{xrel};
		1142	$oy -= $ev->{yrel};
		1143
		1144	$self->{vp}->set_offset ($ox, $oy);
		1145	};
		1146	}
		1147
		1148	sub invoke_mouse_wheel {
		1149	my ($self, $ev) = @_;
		1150
		1151	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1152	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1153
		1154	1
		1155	}
		1156
		1157	sub invoke_button_down {
		1158	my ($self, $ev, $x, $y) = @_;
		1159
		1160	if ($ev->{button} == 2) {
		1161	$self->start_dragging ($ev);
		1162	return 1;
		1163	}
		1164
		1165	0
		1166	}
		1167
		1168	sub invoke_button_up {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if (delete $self->{motion}) {
		1172	return 1;
		1173	}
		1174
		1175	0
		1176	}
		1177
		1178	sub invoke_mouse_motion {
		1179	my ($self, $ev, $x, $y) = @_;
		1180
		1181	if ($self->{motion}) {
		1182	$self->{motion}->($ev, $x, $y);
		1183	return 1;
		1184	}
		1185
		1186	0
1003	}	1187	}
1004		1188
1005	sub invoke_size_allocate {	1189	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1190	my ($self, $w, $h) = @_;
1007		1191
1008	my $child = $self->{vp}->child;	1192	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1193	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1194	}
1013		1195
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1196	#############################################################################
1018		1197
1019	package CFClient::UI::Frame;	1198	package CFPlus::UI::Frame;
1020		1199
1021	our @ISA = CFClient::UI::Bin::;	1200	our @ISA = CFPlus::UI::Bin::;
1022		1201
1023	use CFClient::OpenGL;	1202	use CFPlus::OpenGL;
1024		1203
1025	sub new {	1204	sub new {
1026	my $class = shift;	1205	my $class = shift;
1027		1206
1028	$class->SUPER::new (	1207	$class->SUPER::new (
…		…
1038	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1039		1218
1040	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1042	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1043
1044	glBegin GL_QUADS;
1045	glVertex 0 , 0;
1046	glVertex 0 , $h;
1047	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1048	glVertex $w, 0;
1049	glEnd;
1050
1051	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1052	}	1224	}
1053		1225
1054	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1055	}	1227	}
1056		1228
1057	#############################################################################	1229	#############################################################################
1058		1230
1059	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1060		1232
1061	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1062		1234
1063	use CFClient::OpenGL;	1235	use CFPlus::OpenGL;
		1236
		1237	sub new {
		1238	my ($class, %arg) = @_;
		1239
		1240	if ((exists $arg{label}) && !ref $arg{label}) {
		1241	$arg{label} = new CFPlus::UI::Label
		1242	align => 1,
		1243	valign => 0,
		1244	text => $arg{label},
		1245	fontsize => ($arg{border} || 0.8) * 0.75;
		1246	}
		1247
		1248	my $self = $class->SUPER::new (
		1249	# label => "",
		1250	fg => [0.6, 0.3, 0.1],
		1251	border => 0.8,
		1252	style => 'single',
		1253	%arg,
		1254	);
		1255
		1256	$self
		1257	}
		1258
		1259	sub add {
		1260	my ($self, @widgets) = @_;
		1261
		1262	$self->SUPER::add (@widgets);
		1263	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1264	}
		1265
		1266	sub border {
		1267	int $_[0]{border} * $::FONTSIZE
		1268	}
		1269
		1270	sub size_request {
		1271	my ($self) = @_;
		1272
		1273	($self->{label_w}, undef) = $self->{label}->size_request
		1274	if $self->{label};
		1275
		1276	my ($w, $h) = $self->SUPER::size_request;
		1277
		1278	(
		1279	$w + $self->border * 2,
		1280	$h + $self->border * 2,
		1281	)
		1282	}
		1283
		1284	sub invoke_size_allocate {
		1285	my ($self, $w, $h) = @_;
		1286
		1287	my $border = $self->border;
		1288
		1289	$w -= List::Util::max 0, $border * 2;
		1290	$h -= List::Util::max 0, $border * 2;
		1291
		1292	if (my $label = $self->{label}) {
		1293	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1294	$label->{h} = List::Util::min $h, $border;
		1295	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1296	}
		1297
		1298	$self->child->configure ($border, $border, $w, $h);
		1299
		1300	1
		1301	}
		1302
		1303	sub _draw {
		1304	my ($self) = @_;
		1305
		1306	my $child = $self->{children}[0];
		1307
		1308	my $border = $self->border;
		1309	my ($w, $h) = ($self->{w}, $self->{h});
		1310
		1311	$child->draw;
		1312
		1313	glColor @{$self->{fg}};
		1314	glBegin GL_LINE_STRIP;
		1315	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1317	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1319	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1321	glEnd;
		1322
		1323	if ($self->{label}) {
		1324	glTranslate $border * 2, 0;
		1325	$self->{label}->_draw;
		1326	}
		1327	}
		1328
		1329	#############################################################################
		1330
		1331	package CFPlus::UI::Toplevel;
		1332
		1333	our @ISA = CFPlus::UI::Bin::;
		1334
		1335	use CFPlus::OpenGL;
1064		1336
1065	my $bg =	1337	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1068		1340
1069	my @border =	1341	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1344
		1345	my @icon =
		1346	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1347	qw(x1_move.png x1_resize.png);
1072		1348
1073	sub new {	1349	sub new {
1074	my ($class, %arg) = @_;	1350	my ($class, %arg) = @_;
1075		1351
1076	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1353	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1354	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1355	border => 0.6,
1080	can_events => 1,	1356	can_events => 1,
1081	min_w => 16,	1357	min_w => 64,
1082	min_h => 16,	1358	min_h => 32,
1083	%arg,	1359	%arg,
1084	);	1360	);
1085		1361
1086	$self->{title_widget} = new CFClient::UI::Label	1362	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1363	align => 0,
1088	valign => 1,	1364	valign => 1,
1089	text => $self->{title},	1365	text => $self->{title},
1090	fontsize => $self->{border},	1366	fontsize => $self->{border},
1091	if exists $self->{title};	1367	if exists $self->{title};
1092		1368
1093	if ($self->{has_close_button}) {	1369	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1370	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1371	new CFPlus::UI::ImageButton
1096	image => 'x1_close.png',	1372	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1373	on_activate => sub { $self->emit ("delete") };
1098		1374
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1375	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1376	}
1101		1377
1102	$self	1378	$self
1103	}	1379	}
1104		1380
1105	sub add {	1381	sub add {
1106	my ($self, @widgets) = @_;	1382	my ($self, @widgets) = @_;
1107		1383
1108	$self->SUPER::add (@widgets);	1384	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1385	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1386	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1387	}
1112		1388
1113	sub border {	1389	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1390	int $_[0]{border} * $::FONTSIZE
		1391	}
		1392
		1393	sub get_max_wh {
		1394	my ($self) = @_;
		1395
		1396	return ($self->{w}, $self->{h})
		1397	if $self->{visible} && $self->{w};
		1398
		1399	$self->SUPER::get_max_wh
1115	}	1400	}
1116		1401
1117	sub size_request {	1402	sub size_request {
1118	my ($self) = @_;	1403	my ($self) = @_;
1119		1404
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1433	$self->child->configure ($border, $border, $w, $h);
1149		1434
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1435	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1436	if $self->{close_button};
1152		1437
		1438	1
		1439	}
		1440
		1441	sub invoke_delete {
		1442	my ($self) = @_;
		1443
		1444	$self->hide;
		1445
1153	1	1446	1
1154	}	1447	}
1155		1448
1156	sub invoke_button_down {	1449	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1450	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1509
1217	! ! $self->{motion}	1510	! ! $self->{motion}
1218	}	1511	}
1219		1512
		1513	sub invoke_visibility_change {
		1514	my ($self, $visible) = @_;
		1515
		1516	delete $self->{motion} unless $visible;
		1517
		1518	0
		1519	}
		1520
1220	sub _draw {	1521	sub _draw {
1221	my ($self) = @_;	1522	my ($self) = @_;
1222		1523
1223	my $child = $self->{children}[0];	1524	my $child = $self->{children}[0];
1224		1525
…		…
1229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230		1531
1231	my $border = $self->border;	1532	my $border = $self->border;
1232		1533
1233	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1234	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238		1553
1239	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1241		1556
1242	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1261	if $self->{close_button};	1576	if $self->{close_button};
1262	}	1577	}
1263		1578
1264	#############################################################################	1579	#############################################################################
1265		1580
1266	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1267		1582
1268	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1269		1584
1270	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1271		1586
1272	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1273		1588
1274	sub new {	1589	sub new {
1275	my $class = shift;	1590	my $class = shift;
1276		1591
1277	$class->SUPER::new (	1592	$class->SUPER::new (
1278	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1279	@_,	1595	@_,
1280	)	1596	)
1281	}	1597	}
1282		1598
1283	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}
1286
1287	sub add {	1599	sub add {
1288	my ($self, $x, $y, $child) = @_;	1600	my ($self, @widgets) = @_;
1289		1601
1290	$child->set_parent ($self);	1602	for my $child (@widgets) {
1291	$self->{children}[$y][$x] = $child;	1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
1292		1606
1293	$self->realloc;	1607	$self->SUPER::add (@widgets);
1294	}	1608	}
1295		1609
1296	sub remove {	1610	sub add_at {
		1611	my $self = shift;
		1612
		1613	my @widgets;
		1614
		1615	while (@_) {
		1616	my ($col, $row, $child) = splice @_, 0, 3, ();
		1617
		1618	$child->{c_row} = $row;
		1619	$child->{c_col} = $col;
		1620
		1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1297	my ($self, $child) = @_;	1628	my ($self) = @_;
1298		1629
1299	# TODO: not yet implemented	1630	my (@w, @h);
1300	}
1301
1302	# TODO: move to container class maybe? send children a signal on removal?
1303	sub clear {
1304	my ($self) = @_;
1305		1631
1306	my @children = $self->children;	1632	my @children = $self->children;
1307	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1308		1643	}
1309	for (@children) {
1310	delete $_->{parent};
1311	$_->hide;
1312	}
1313		1644
1314	$self->realloc;	1645	# second pass, rows
1315	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1316
1317	sub get_wh {
1318	my ($self) = @_;
1319
1320	my (@w, @h);
1321
1322	for my $y (0 .. $#{$self->{children}}) {
1323	my $row = $self->{children}[$y]
1324	or next;
1325
1326	for my $x (0 .. $#$row) {
1327	my $widget = $row->[$x]
1328	or next;
1329	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1330		1648
1331	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1332	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1333	}	1653	}
1334	}	1654	}
1335		1655
1336	(\@w, \@h)	1656	(\@w, \@h)
1337	}	1657	}
…		…
1353	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1354		1674
1355	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1357		1677
1358	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1359	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1362		1682
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1684
1367	CFClient::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1368	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1369		1694
1370	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371		1697
1372	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1373	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1374	or next;
1375		1700
1376	my $x = 0;	1701	$widget->configure (
1377	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378		1704	);
1379	for my $c (0 .. $#$row) {	1705	}
1380	my $col_w = $ws->[$c];
1381		1706
1382	if (my $widget = $row->[$c]) {	1707	1
1383	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1384	}
1385		1709
1386	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1387	}	1737	}
		1738	}
1388		1739
1389	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1390	}	1771	}
1391		1772
1392	1	1773	1
1393	}	1774	}
1394		1775
1395	sub find_widget {
1396	my ($self, $x, $y) = @_;
1397
1398	$x -= $self->{x};
1399	$y -= $self->{y};
1400
1401	my $res;
1402
1403	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1404	$res = $_->find_widget ($x, $y)
1405	and return $res;
1406	}
1407
1408	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1409	}
1410
1411	sub _draw {
1412	my ($self) = @_;
1413
1414	for (grep $_, @{$self->{children}}) {
1415	$_->draw for grep $_, @$_;
1416	}
1417	}
1418
1419	#############################################################################	1776	#############################################################################
1420		1777
1421	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1422		1779
1423	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1424		1781
1425	sub size_request {	1782	sub size_request {
1426	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1427		1786
1428	$self->{vertical}	1787	$self->{vertical}
1429	? (	1788	? (
1430	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1431	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1432	)	1791	)
1433	: (	1792	: (
1434	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1435	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1436	)	1795	)
1437	}	1796	}
1438		1797
1439	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1440	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
1441		1800
1442	my $space = $self->{vertical} ? $h : $w;	1801	my $space = $self->{vertical} ? $h : $w;
1443	my $children = $self->{children};	1802	my @children = $self->visible_children;
1444		1803
1445	my @req;	1804	my @req;
1446		1805
1447	if ($self->{homogeneous}) {	1806	if ($self->{homogeneous}) {
1448	@req = ($space / (@$children || 1)) x @$children;	1807	@req = ($space / (@children || 1)) x @children;
1449	} else {	1808	} else {
1450	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1809	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451	my $req = List::Util::sum @req;	1810	my $req = List::Util::sum @req;
1452		1811
1453	if ($req > $space) {	1812	if ($req > $space) {
1454	# ah well, not enough space	1813	# ah well, not enough space
1455	$_ *= $space / $req for @req;	1814	$_ *= $space / $req for @req;
1456	} else {	1815	} else {
1457	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1816	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458		1817
1459	$space = ($space - $req) / $expand; # remaining space to give away	1818	$space = ($space - $req) / $expand; # remaining space to give away
1460		1819
1461	$req[$_] += $space * $children->[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#$children;	1821	for 0 .. $#children;
1463	}	1822	}
1464	}	1823	}
1465		1824
1466	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1467		1826
1468	my $pos = 0;	1827	my $pos = 0;
1469	for (0 .. $#$children) {	1828	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1471	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1830	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472		1831
1473	$pos += $alloc;	1832	$pos += $alloc;
1474	}	1833	}
1475		1834
1476	1	1835	1
1477	}	1836	}
1478		1837
1479	#############################################################################	1838	#############################################################################
1480		1839
1481	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1482		1841
1483	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1484		1843
1485	sub new {	1844	sub new {
1486	my $class = shift;	1845	my $class = shift;
1487		1846
1488	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1491	)	1850	)
1492	}	1851	}
1493		1852
1494	#############################################################################	1853	#############################################################################
1495		1854
1496	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1497		1856
1498	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1499		1858
1500	sub new {	1859	sub new {
1501	my $class = shift;	1860	my $class = shift;
1502		1861
1503	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1506	)	1865	)
1507	}	1866	}
1508		1867
1509	#############################################################################	1868	#############################################################################
1510		1869
1511	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1512		1871
1513	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1514		1873
1515	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1516		1875
1517	sub new {	1876	sub new {
1518	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1519		1878
1520	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1882	#active_bg => none
1524	#font => default_font	1883	#font => default_font
1525	#text => initial text	1884	#text => initial text
1526	#markup => initial narkup	1885	#markup => initial narkup
1527	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1528	ellipsise => 3, # end	1888	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1890	fontsize => 1,
1531	align => -1,	1891	align => -1,
1532	valign => -1,	1892	valign => -1,
1533	padding_x => 2,	1893	padding_x => 2,
1534	padding_y => 2,	1894	padding_y => 2,
1535	can_events => 0,	1895	can_events => 0,
1536	%arg	1896	%arg
1537	);	1897	);
1538		1898
1539	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1902	$self->{template} = $layout;
1543	}	1903	}
1544		1904
1545	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1549	}	1909	}
1550		1910
1551	$self	1911	$self
1552	}	1912	}
1553		1913
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1914	sub update {
1565	my ($self) = @_;	1915	my ($self) = @_;
1566		1916
1567	delete $self->{texture};	1917	delete $self->{texture};
1568	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1573		1923
1574	delete $self->{ox};	1924	delete $self->{ox};
1575	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1576	}	1926	}
1577		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1578	sub set_text {	1934	sub set_text {
1579	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1580		1936
1581	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
1583		1939
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1940	$self->{layout}->set_text ($text);
1586		1941
1587	delete $self->{size_req};	1942	delete $self->{size_req};
1588	$self->realloc;	1943	$self->realloc;
1589	$self->update;	1944	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1950	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1951	$self->{text} = "M$markup";
1597		1952
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1953	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1954
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1955	$self->{layout}->set_markup ($markup);
1602		1956
1603	delete $self->{size_req};	1957	delete $self->{size_req};
1604	$self->realloc;	1958	$self->realloc;
1605	$self->update;	1959	$self->update;
…		…
1607		1961
1608	sub size_request {	1962	sub size_request {
1609	my ($self) = @_;	1963	my ($self) = @_;
1610		1964
1611	$self->{size_req} ||= do {	1965	$self->{size_req} ||= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1612	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1613	$self->{layout}->set_width ($self->{max_w} || -1);	1969	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1614	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
1615	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1616	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1617		1973
1618	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
1619		1975
1620	if (exists $self->{template}) {	1976	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	1977	$self->{template}->set_font ($self->{font}) if $self->{font};
		1978	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1979	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1980
1624	my ($w2, $h2) = $self->{template}->size;	1981	my ($w2, $h2) = $self->{template}->size;
1625		1982
1626	$w = List::Util::max $w, $w2;	1983	$w = List::Util::max $w, $w2;
…		…
1631	};	1988	};
1632		1989
1633	@{ $self->{size_req} }	1990	@{ $self->{size_req} }
1634	}	1991	}
1635		1992
		1993	sub baseline_shift {
		1994	$_[0]{layout}->descent
		1995	}
		1996
1636	sub invoke_size_allocate {	1997	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	1998	my ($self, $w, $h) = @_;
1638		1999
1639	delete $self->{ox};	2000	delete $self->{ox};
1640		2001
…		…
1646		2007
1647	sub set_fontsize {	2008	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	2009	my ($self, $fontsize) = @_;
1649		2010
1650	$self->{fontsize} = $fontsize;	2011	$self->{fontsize} = $fontsize;
		2012	delete $self->{size_req};
1651	delete $self->{texture};	2013	delete $self->{texture};
1652		2014
1653	$self->realloc;	2015	$self->realloc;
1654	}	2016	}
1655		2017
1656	sub reconfigure {	2018	sub reconfigure {
1657	my ($self) = @_;	2019	my ($self) = @_;
1658		2020
1659	delete $self->{size_req};	2021	delete $self->{size_req};
		2022	delete $self->{texture};
1660		2023
1661	$self->SUPER::reconfigure;	2024	$self->SUPER::reconfigure;
1662	}	2025	}
1663		2026
1664	sub _draw {	2027	sub _draw {
1665	my ($self) = @_;	2028	my ($self) = @_;
1666		2029
1667	$self->SUPER::_draw; # draw background, if applicable	2030	$self->SUPER::_draw; # draw background, if applicable
1668		2031
1669	my $tex = $self->{texture} ||= do {	2032	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2033	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2034	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2035	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2036	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2037	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2038	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2039
1677	new_from_layout CFClient::Texture $self->{layout}	2040	[$self->{layout}->size]
1678	};	2041	};
1679		2042
1680	unless (exists $self->{ox}) {	2043	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2044	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2045	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
1684		2047
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1688	};	2053	};
1689		2054
1690	glEnable GL_TEXTURE_2D;	2055	# unless ($self->{list}) {
1691		2056	# $self->{list} = CFPlus::OpenGL::glGenList;
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2057	# CFPlus::OpenGL::glNewList $self->{list};
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2058	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694		2059	# CFPlus::OpenGL::glEndList;
1695	if ($tex->{format} == GL_ALPHA) {
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}	2060	# }
		2061	#
		2062	# CFPlus::OpenGL::glCallList $self->{list};
1703		2063
1704	glDisable GL_TEXTURE_2D;	2064	$self->{layout}->draw;
1705	}	2065	}
		2066
		2067	#sub destroy {
		2068	# my ($self) = @_;
		2069	#
		2070	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2071	#
		2072	# $self->SUPER::destroy;
		2073	#}
1706		2074
1707	#############################################################################	2075	#############################################################################
1708		2076
1709	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1710		2078
1711	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1712		2080
1713	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1714		2082
1715	sub new {	2083	sub new {
1716	my $class = shift;	2084	my $class = shift;
1717		2085
1718	$class->SUPER::new (	2086	$class->SUPER::new (
1719	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
1720	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
1721	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
1722	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
1723	can_hover => 1,	2093	can_hover => 1,
1724	can_focus => 1,	2094	can_focus => 1,
1725	valign => 0,	2095	valign => 0,
1726	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1727	#text => ...	2098	#text => ...
1728	#hidden => "*",	2099	#hidden => "*",
1729	@_	2100	@_
1730	)	2101	)
1731	}	2102	}
…		…
1776	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1778		2149
1779	my $text = $self->get_text;	2150	my $text = $self->get_text;
1780		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1781	if ($uni == 8) {	2154	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2162	} elsif ($sym == CFPlus::SDLK_HOME) {
		2163	# what a hack
		2164	$self->{cursor} =
		2165	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2166	? length $1
		2167	: 0;
		2168	} elsif ($sym == CFPlus::SDLK_END) {
		2169	# uh, again
		2170	$self->{cursor} =
		2171	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2172	? $self->{cursor} + length $1
		2173	: length $self->{text};
		2174	} elsif ($uni == 21) { # ctrl-u
		2175	$text = "";
1790	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2178	$self->emit ('escape');
1795	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2183	} else {
1798	return 0;	2184	return 0;
1799	}	2185	}
1800		2186
1801	$self->_set_text ($text);	2187	$self->_set_text ($text);
1802		2188
1803	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1804		2191
1805	1	2192	1
1806	}	2193	}
1807		2194
1808	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1820		2207
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2208	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2209
1823	# byte-index to char-index	2210	# byte-index to char-index
1824	my $text = $self->{text};	2211	my $text = $self->{text};
1825	utf8::encode $text;	2212	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2213	$self->{cursor} = length $text;
1827		2214
1828	$self->_set_text ($self->{text});	2215	$self->_set_text ($self->{text});
1829	$self->update;	2216	$self->update;
1830		2217
1831	1	2218	1
…		…
1850	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
1851	}	2238	}
1852		2239
1853	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
1854	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1855	glBegin GL_QUADS;
1856	glVertex 0 , 0;
1857	glVertex 0 , $self->{h};
1858	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
1859	glVertex $self->{w}, 0;
1860	glEnd;
1861	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
1862		2244
1863	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
1864		2246
1865	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
1867		2249
1868	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
1869	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
1870	utf8::encode $text;	2252	utf8::encode $text;
1871		2253
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2254	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1873	}	2255	}
1874		2256
1875	glColor @{$self->{fg}};	2257	glColor_premultiply @{$self->{active_fg}};
1876	glBegin GL_LINES;	2258	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2260	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2261	glEnd;
1880	}
1881	}
1882		2262
		2263	glLineWidth 3;
		2264	glColor @{$self->{active_outline}};
		2265	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2266	glLineWidth 1;
		2267
		2268	} else {
		2269	glColor @{$self->{outline}};
		2270	glBegin GL_LINE_STRIP;
		2271	glVertex .5, $self->{h} * .5;
		2272	glVertex .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2274	glVertex $self->{w} - .5, $self->{h} * .5;
		2275	glEnd;
		2276	}
		2277	}
		2278
		2279	#############################################################################
		2280
1883	package CFClient::UI::Entry;	2281	package CFPlus::UI::Entry;
1884		2282
1885	our @ISA = CFClient::UI::EntryBase::;	2283	our @ISA = CFPlus::UI::EntryBase::;
1886		2284
1887	use CFClient::OpenGL;	2285	use CFPlus::OpenGL;
1888		2286
1889	sub invoke_key_down {	2287	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2288	my ($self, $ev) = @_;
1891		2289
1892	my $sym = $ev->{sym};	2290	my $sym = $ev->{sym};
1893		2291
1894	if ($sym == 13) {	2292	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2293	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2294	my $txt = $self->get_text;
1897		2295
1898	$self->{history_pointer} = -1;	2296	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2297	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2298	$self->emit (activate => $txt);
1901	$self->update;	2299	$self->update;
1902		2300
1903	} elsif ($sym == CFClient::SDLK_UP) {	2301	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2302	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2303	$self->{history_saveback} = $self->get_text;
1906	}	2304	}
1907	if (@{$self->{history} || []} > 0) {	2305	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2306	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2308	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2309	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2311	}
1914		2312
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2313	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2314	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2315	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2316
1919	if ($self->{history_pointer} >= 0) {	2317	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2318	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2327	1
1930	}	2328	}
1931		2329
1932	#############################################################################	2330	#############################################################################
1933		2331
		2332	package CFPlus::UI::TextEdit;
		2333
		2334	our @ISA = CFPlus::UI::EntryBase::;
		2335
		2336	use CFPlus::OpenGL;
		2337
		2338	sub move_cursor_ver {
		2339	my ($self, $dy) = @_;
		2340
		2341	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2342
		2343	$y += $dy;
		2344
		2345	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2346	$self->{cursor} = $index;
		2347	delete $self->{cur_h};
		2348	$self->update;
		2349	return;
		2350	}
		2351	}
		2352
		2353	sub invoke_key_down {
		2354	my ($self, $ev) = @_;
		2355
		2356	my $sym = $ev->{sym};
		2357
		2358	if ($sym == CFPlus::SDLK_UP) {
		2359	$self->move_cursor_ver (-1);
		2360	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2361	$self->move_cursor_ver (+1);
		2362	} else {
		2363	return $self->SUPER::invoke_key_down ($ev)
		2364	}
		2365
		2366	1
		2367	}
		2368
		2369	#############################################################################
		2370
1934	package CFClient::UI::Button;	2371	package CFPlus::UI::ButtonBin;
1935		2372
1936	our @ISA = CFClient::UI::Label::;	2373	our @ISA = CFPlus::UI::Bin::;
1937		2374
1938	use CFClient::OpenGL;	2375	use CFPlus::OpenGL;
1939		2376
1940	my @tex =	2377	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2379	qw(b1_button_inactive.png b1_button_active.png);
1943		2380
1944	sub new {	2381	sub new {
1945	my $class = shift;	2382	my $class = shift;
1946		2383
1947	$class->SUPER::new (	2384	$class->SUPER::new (
1948	padding_x => 4,
1949	padding_y => 4,
1950	fg => [1, 1, 1],
1951	active_fg => [0, 0, 1],
1952	can_hover => 1,	2385	can_hover => 1,
1953	align => 0,	2386	align => 0,
1954	valign => 0,	2387	valign => 0,
1955	can_events => 1,	2388	can_events => 1,
1956	@_	2389	@_
…		…
1968	}	2401	}
1969		2402
1970	sub _draw {	2403	sub _draw {
1971	my ($self) = @_;	2404	my ($self) = @_;
1972		2405
1973	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1974
1975	glEnable GL_TEXTURE_2D;	2406	glEnable GL_TEXTURE_2D;
1976	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977	glColor 0, 0, 0, 1;	2408	glColor 0, 0, 0, 1;
1978		2409
		2410	my $tex = $tex[$GRAB == $self];
1979	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2411	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980		2412
1981	glDisable GL_TEXTURE_2D;	2413	glDisable GL_TEXTURE_2D;
1982		2414
1983	$self->SUPER::_draw;	2415	$self->SUPER::_draw;
1984	}	2416	}
1985		2417
1986	#############################################################################	2418	#############################################################################
1987		2419
		2420	package CFPlus::UI::Button;
		2421
		2422	our @ISA = CFPlus::UI::Label::;
		2423
		2424	use CFPlus::OpenGL;
		2425
		2426	my @tex =
		2427	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2428	qw(b1_button_inactive.png b1_button_active.png);
		2429
		2430	sub new {
		2431	my $class = shift;
		2432
		2433	$class->SUPER::new (
		2434	padding_x => 4,
		2435	padding_y => 4,
		2436	fg => [1.0, 1.0, 1.0],
		2437	active_fg => [0.8, 0.8, 0.8],
		2438	can_hover => 1,
		2439	align => 0,
		2440	valign => 0,
		2441	can_events => 1,
		2442	@_
		2443	)
		2444	}
		2445
		2446	sub invoke_button_up {
		2447	my ($self, $ev, $x, $y) = @_;
		2448
		2449	$self->emit ("activate")
		2450	if $x >= 0 && $x < $self->{w}
		2451	&& $y >= 0 && $y < $self->{h};
		2452
		2453	1
		2454	}
		2455
		2456	sub _draw {
		2457	my ($self) = @_;
		2458
		2459	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2460
		2461	glEnable GL_TEXTURE_2D;
		2462	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2463	glColor 0, 0, 0, 1;
		2464
		2465	my $tex = $tex[$GRAB == $self];
		2466	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2467
		2468	glDisable GL_TEXTURE_2D;
		2469
		2470	$self->SUPER::_draw;
		2471	}
		2472
		2473	#############################################################################
		2474
		2475	package CFPlus::UI::CheckBox;
		2476
		2477	our @ISA = CFPlus::UI::DrawBG::;
		2478
		2479	my @tex =
		2480	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2481	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2482
		2483	use CFPlus::OpenGL;
		2484
		2485	sub new {
		2486	my $class = shift;
		2487
		2488	$class->SUPER::new (
		2489	padding_x => 2,
		2490	padding_y => 2,
		2491	fg => [1, 1, 1],
		2492	active_fg => [1, 1, 0],
		2493	bg => [0, 0, 0, 0.2],
		2494	active_bg => [1, 1, 1, 0.5],
		2495	state => 0,
		2496	can_hover => 1,
		2497	@_
		2498	)
		2499	}
		2500
		2501	sub size_request {
		2502	my ($self) = @_;
		2503
		2504	(6) x 2
		2505	}
		2506
		2507	sub toggle {
		2508	my ($self) = @_;
		2509
		2510	$self->{state} = !$self->{state};
		2511	$self->emit (changed => $self->{state});
		2512	$self->update;
		2513	}
		2514
		2515	sub invoke_button_down {
		2516	my ($self, $ev, $x, $y) = @_;
		2517
		2518	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2519	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2520	$self->toggle;
		2521	} else {
		2522	return 0
		2523	}
		2524
		2525	1
		2526	}
		2527
		2528	sub _draw {
		2529	my ($self) = @_;
		2530
		2531	$self->SUPER::_draw;
		2532
		2533	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2534
		2535	my ($w, $h) = @$self{qw(w h)};
		2536
		2537	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2538
		2539	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2540
		2541	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2542
		2543	glEnable GL_TEXTURE_2D;
		2544	$tex->draw_quad_alpha (0, 0, $s, $s);
		2545	glDisable GL_TEXTURE_2D;
		2546	}
		2547
		2548	#############################################################################
		2549
		2550	package CFPlus::UI::Image;
		2551
		2552	our @ISA = CFPlus::UI::Base::;
		2553
		2554	use CFPlus::OpenGL;
		2555
		2556	our %texture_cache;
		2557
		2558	sub new {
		2559	my $class = shift;
		2560
		2561	my $self = $class->SUPER::new (
		2562	can_events => 0,
		2563	scale => 1,
		2564	@_,
		2565	);
		2566
		2567	$self->{path} || $self->{tex}
		2568	or Carp::croak "'path' or 'tex' attributes required";
		2569
		2570	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2571	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2572
		2573	CFPlus::weaken $texture_cache{$self->{path}};
		2574
		2575	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2576
		2577	$self
		2578	}
		2579
		2580	sub STORABLE_freeze {
		2581	my ($self, $cloning) = @_;
		2582
		2583	$self->{path}
		2584	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2585
		2586	$self->{path}
		2587	}
		2588
		2589	sub STORABLE_attach {
		2590	my ($self, $cloning, $path) = @_;
		2591
		2592	$self->new (path => $path)
		2593	}
		2594
		2595	sub size_request {
		2596	my ($self) = @_;
		2597
		2598	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2599	}
		2600
		2601	sub _draw {
		2602	my ($self) = @_;
		2603
		2604	my $tex = $self->{tex};
		2605
		2606	my ($w, $h) = ($self->{w}, $self->{h});
		2607
		2608	if ($self->{rot90}) {
		2609	glRotate 90, 0, 0, 1;
		2610	glTranslate 0, -$self->{w}, 0;
		2611
		2612	($w, $h) = ($h, $w);
		2613	}
		2614
		2615	glEnable GL_TEXTURE_2D;
		2616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2617
		2618	$tex->draw_quad_alpha (0, 0, $w, $h);
		2619
		2620	glDisable GL_TEXTURE_2D;
		2621	}
		2622
		2623	#############################################################################
		2624
1988	package CFClient::UI::ImageButton;	2625	package CFPlus::UI::ImageButton;
1989		2626
1990	our @ISA = CFClient::UI::Image::;	2627	our @ISA = CFPlus::UI::Image::;
1991		2628
1992	use CFClient::OpenGL;	2629	use CFPlus::OpenGL;
1993		2630
1994	my %textures;	2631	my %textures;
1995		2632
1996	sub new {	2633	sub new {
1997	my $class = shift;	2634	my $class = shift;
…		…
2007	can_events => 1,	2644	can_events => 1,
2008	@_	2645	@_
2009	);	2646	);
2010	}	2647	}
2011		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
		2653	}
		2654
2012	sub invoke_button_up {	2655	sub invoke_button_up {
2013	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2014		2657
2015	$self->emit ("activate")	2658	$self->emit ("activate")
2016	if $x >= 0 && $x < $self->{w}	2659	if $x >= 0 && $x < $self->{w}
…		…
2019	1	2662	1
2020	}	2663	}
2021		2664
2022	#############################################################################	2665	#############################################################################
2023		2666
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2667	package CFPlus::UI::VGauge;
2093		2668
2094	our @ISA = CFClient::UI::Base::;	2669	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097	use Carp qw/confess/;
2098
2099	our %loaded_images;
2100
2101	sub new {
2102	my $class = shift;
2103
2104	my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108	$loaded_images{$self->{image}} ||=
2109	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113	Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115	$self->{aspect} = $tex->{w} / $tex->{h};
2116
2117	$self
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	($self->{tex}->{w}, $self->{tex}->{h})
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	my $tex = $self->{tex};
2130
2131	my ($w, $h) = ($self->{w}, $self->{h});
2132
2133	if ($self->{rot90}) {
2134	glRotate 90, 0, 0, 1;
2135	glTranslate 0, -$self->{w}, 0;
2136
2137	($w, $h) = ($h, $w);
2138	}
2139
2140	glEnable GL_TEXTURE_2D;
2141	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143	$tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145	glDisable GL_TEXTURE_2D;
2146	}
2147
2148	#############################################################################
2149
2150	package CFClient::UI::VGauge;
2151
2152	our @ISA = CFClient::UI::Base::;
2153		2670
2154	use List::Util qw(min max);	2671	use List::Util qw(min max);
2155		2672
2156	use CFClient::OpenGL;	2673	use CFPlus::OpenGL;
2157		2674
2158	my %tex = (	2675	my %tex = (
2159	food => [	2676	food => [
2160	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2677	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2678	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162	],	2679	],
2163	grace => [	2680	grace => [
2164	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2681	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2682	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166	],	2683	],
2167	hp => [	2684	hp => [
2168	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2685	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2686	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170	],	2687	],
2171	mana => [	2688	mana => [
2172	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2689	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2690	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174	],	2691	],
2175	);	2692	);
2176		2693
2177	# eg. VGauge->new (gauge => 'food'), default gauge: food	2694	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2237	my $ycut1 = max 0, min 1, $ycut;	2754	my $ycut1 = max 0, min 1, $ycut;
2238	my $ycut2 = max 0, min 1, $ycut - 1;	2755	my $ycut2 = max 0, min 1, $ycut - 1;
2239		2756
2240	my $h1 = $self->{h} * (1 - $ycut1);	2757	my $h1 = $self->{h} * (1 - $ycut1);
2241	my $h2 = $self->{h} * (1 - $ycut2);	2758	my $h2 = $self->{h} * (1 - $ycut2);
		2759	my $h3 = $self->{h};
		2760
		2761	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242		2762
2243	glEnable GL_BLEND;	2763	glEnable GL_BLEND;
2244	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2764	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2765	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246	glEnable GL_TEXTURE_2D;	2766	glEnable GL_TEXTURE_2D;
…		…
2265		2785
2266	if ($t3) {	2786	if ($t3) {
2267	glBindTexture GL_TEXTURE_2D, $t3->{name};	2787	glBindTexture GL_TEXTURE_2D, $t3->{name};
2268	glBegin GL_QUADS;	2788	glBegin GL_QUADS;
2269	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2789	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2790	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2791	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2792	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273	glEnd;	2793	glEnd;
2274	}	2794	}
2275		2795
2276	glDisable GL_BLEND;	2796	glDisable GL_BLEND;
2277	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2278	}	2798	}
2279		2799
2280	#############################################################################	2800	#############################################################################
2281		2801
		2802	package CFPlus::UI::Progress;
		2803
		2804	our @ISA = CFPlus::UI::Label::;
		2805
		2806	use CFPlus::OpenGL;
		2807
		2808	sub new {
		2809	my ($class, %arg) = @_;
		2810
		2811	my $self = $class->SUPER::new (
		2812	fg => [1, 1, 1],
		2813	bg => [0, 0, 1, 0.2],
		2814	bar => [0.7, 0.5, 0.1, 0.8],
		2815	outline => [0.4, 0.3, 0],
		2816	fontsize => 0.9,
		2817	valign => 0,
		2818	align => 0,
		2819	can_events => 1,
		2820	ellipsise => 1,
		2821	label => "%d%%",
		2822	%arg,
		2823	);
		2824
		2825	$self->set_value ($arg{value} || -1);
		2826
		2827	$self
		2828	}
		2829
		2830	sub set_label {
		2831	my ($self, $label) = @_;
		2832
		2833	return if $self->{label} eq $label;
		2834	$self->{label} = $label;
		2835
		2836	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2837	}
		2838
		2839	sub set_value {
		2840	my ($self, $value) = @_;
		2841
		2842	if ($self->{value} ne $value) {
		2843	$self->{value} = $value;
		2844
		2845	if ($value < 0) {
		2846	$self->set_text ("-");
		2847	} else {
		2848	$self->set_text (sprintf $self->{label}, $value * 100);
		2849	}
		2850
		2851	$self->update;
		2852	}
		2853	}
		2854
		2855	sub _draw {
		2856	my ($self) = @_;
		2857
		2858	glEnable GL_BLEND;
		2859	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2860
		2861	if ($self->{value} >= 0) {
		2862	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2863
		2864	glColor_premultiply @{$self->{bar}};
		2865	glRect 2, 2, $s, $self->{h} - 2;
		2866	glColor_premultiply @{$self->{bg}};
		2867	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2868	}
		2869
		2870	glColor_premultiply @{$self->{outline}};
		2871	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2872
		2873	glDisable GL_BLEND;
		2874
		2875	{
		2876	local $self->{bg}; # do not draw background
		2877	$self->SUPER::_draw;
		2878	}
		2879	}
		2880
		2881	#############################################################################
		2882
		2883	package CFPlus::UI::ExperienceProgress;
		2884
		2885	our @ISA = CFPlus::UI::Progress::;
		2886
		2887	sub new {
		2888	my ($class, %arg) = @_;
		2889
		2890	my $self = $class->SUPER::new (
		2891	tooltip => sub {
		2892	my ($self) = @_;
		2893
		2894	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2895	$self->{lvl},
		2896	::formsep ($self->{exp}),
		2897	::formsep ($self->{nxt}),
		2898	::formsep ($self->{nxt} - $self->{exp}),
		2899	},
		2900	%arg
		2901	);
		2902
		2903	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2904	if $::CONN;
		2905
		2906	$self
		2907	}
		2908
		2909	sub DESTROY {
		2910	my ($self) = @_;
		2911
		2912	delete $::CONN->{on_exp_update}{$self+0}
		2913	if $::CONN;
		2914
		2915	$self->SUPER::DESTROY;
		2916	}
		2917
		2918	sub set_value {
		2919	my ($self, $lvl, $exp) = @_;
		2920
		2921	$self->{lvl} = $lvl;
		2922	$self->{exp} = $exp;
		2923
		2924	my $v = -1;
		2925
		2926	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2927	my $l0 = $table->[$lvl - 1];
		2928	my $l1 = $table->[$lvl];
		2929
		2930	$self->{nxt} = $l1;
		2931
		2932	$v = ($exp - $l0) / ($l1 - $l0);
		2933	}
		2934
		2935	$self->SUPER::set_value ($v);
		2936	}
		2937
		2938	#############################################################################
		2939
2282	package CFClient::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2283		2941
2284	our @ISA = CFClient::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2285		2943
2286	sub new {	2944	sub new {
2287	my ($class, %arg) = @_;	2945	my ($class, %arg) = @_;
2288		2946
2289	my $self = $class->SUPER::new (	2947	my $self = $class->SUPER::new (
…		…
2291	can_hover => 1,	2949	can_hover => 1,
2292	can_events => 1,	2950	can_events => 1,
2293	%arg,	2951	%arg,
2294	);	2952	);
2295		2953
2296	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2954	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2955	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2956	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299		2957
2300	$self	2958	$self
2301	}	2959	}
2302		2960
2303	sub set_fontsize {	2961	sub set_fontsize {
…		…
2324	$self->{value}->set_text ($val);	2982	$self->{value}->set_text ($val);
2325	}	2983	}
2326		2984
2327	#############################################################################	2985	#############################################################################
2328		2986
2329	package CFClient::UI::Slider;	2987	package CFPlus::UI::Slider;
2330		2988
2331	use strict;	2989	use strict;
2332		2990
2333	use CFClient::OpenGL;	2991	use CFPlus::OpenGL;
2334		2992
2335	our @ISA = CFClient::UI::DrawBG::;	2993	our @ISA = CFPlus::UI::DrawBG::;
2336		2994
2337	my @tex =	2995	my @tex =
2338	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2996	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339	qw(s1_slider.png s1_slider_bg.png);	2997	qw(s1_slider.png s1_slider_bg.png);
2340		2998
2341	sub new {	2999	sub new {
2342	my $class = shift;	3000	my $class = shift;
2343		3001
…		…
2411		3069
2412	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2413		3071
2414	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2415		3073
2416	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2417	}	3077	}
2418		3078
2419	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2420	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2421		3081
…		…
2428		3088
2429	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3089	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430	} else {	3090	} else {
2431	return 0;	3091	return 0;
2432	}	3092	}
		3093
		3094	1
		3095	}
		3096
		3097	sub invoke_mouse_wheel {
		3098	my ($self, $ev) = @_;
		3099
		3100	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3101
		3102	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3103
		3104	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2433		3105
2434	1	3106	1
2435	}	3107	}
2436		3108
2437	sub update {	3109	sub update {
…		…
2488	glDisable GL_TEXTURE_2D;	3160	glDisable GL_TEXTURE_2D;
2489	}	3161	}
2490		3162
2491	#############################################################################	3163	#############################################################################
2492		3164
2493	package CFClient::UI::ValSlider;	3165	package CFPlus::UI::ValSlider;
2494		3166
2495	our @ISA = CFClient::UI::HBox::;	3167	our @ISA = CFPlus::UI::HBox::;
2496		3168
2497	sub new {	3169	sub new {
2498	my ($class, %arg) = @_;	3170	my ($class, %arg) = @_;
2499		3171
2500	my $range = delete $arg{range};	3172	my $range = delete $arg{range};
2501		3173
2502	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
2503	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3175	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3176	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505	to_value => sub { shift },	3177	to_value => sub { shift },
2506	from_value => sub { shift },	3178	from_value => sub { shift },
2507	%arg,	3179	%arg,
2508	);	3180	);
2509		3181
…		…
2529	sub set_range { shift->{slider}->set_range (@_) }	3201	sub set_range { shift->{slider}->set_range (@_) }
2530	sub set_value { shift->{slider}->set_value (@_) }	3202	sub set_value { shift->{slider}->set_value (@_) }
2531		3203
2532	#############################################################################	3204	#############################################################################
2533		3205
2534	package CFClient::UI::TextScroller;	3206	package CFPlus::UI::TextScroller;
2535		3207
2536	our @ISA = CFClient::UI::HBox::;	3208	our @ISA = CFPlus::UI::HBox::;
2537		3209
2538	use CFClient::OpenGL;	3210	use CFPlus::OpenGL;
2539		3211
2540	sub new {	3212	sub new {
2541	my $class = shift;	3213	my $class = shift;
2542		3214
2543	my $self = $class->SUPER::new (	3215	my $self = $class->SUPER::new (
2544	fontsize => 1,	3216	fontsize => 1,
2545	can_events => 0,	3217	can_events => 1,
2546	indent => 0,	3218	indent => 0,
2547	#font => default_font	3219	#font => default_font
2548	@_,	3220	@_,
2549		3221
2550	layout => (new CFClient::Layout 1),	3222	layout => (new CFPlus::Layout),
2551	par => [],	3223	par => [],
		3224	max_par => 0,
2552	height => 0,	3225	height => 0,
2553	children => [	3226	children => [
2554	(new CFClient::UI::Empty expand => 1),	3227	(new CFPlus::UI::Empty expand => 1),
2555	(new CFClient::UI::Slider vertical => 1),	3228	(new CFPlus::UI::Slider vertical => 1),
2556	],	3229	],
2557	);	3230	);
2558		3231
2559	$self->{children}[1]->connect (changed => sub { $self->update });	3232	$self->{children}[1]->connect (changed => sub { $self->update });
2560		3233
…		…
2566		3239
2567	$self->{fontsize} = $fontsize;	3240	$self->{fontsize} = $fontsize;
2568	$self->reflow;	3241	$self->reflow;
2569	}	3242	}
2570		3243
		3244	sub size_request {
		3245	my ($self) = @_;
		3246
		3247	my ($empty, $slider) = $self->visible_children;
		3248
		3249	local $self->{children} = [$empty, $slider];
		3250	$self->SUPER::size_request
		3251	}
		3252
2571	sub invoke_size_allocate {	3253	sub invoke_size_allocate {
2572	my ($self, $w, $h) = @_;	3254	my ($self, $w, $h) = @_;
2573		3255
		3256	my ($empty, $slider, @other) = @{ $self->{children} };
		3257	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3258
2574	$self->{layout}->set_font ($self->{font}) if $self->{font};	3259	$self->{layout}->set_font ($self->{font}) if $self->{font};
2575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3260	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576	$self->{layout}->set_width ($self->{children}[0]{w});	3261	$self->{layout}->set_width ($empty->{w});
2577	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3262	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578		3263
2579	$self->reflow;	3264	$self->reflow;
2580		3265
		3266	local $self->{children} = [$empty, $slider];
2581	$self->SUPER::invoke_size_allocate ($w, $h)	3267	$self->SUPER::invoke_size_allocate ($w, $h)
2582	}	3268	}
2583		3269
2584	sub text_size {	3270	sub invoke_mouse_wheel {
2585	my ($self, $text, $indent) = @_;	3271	my ($self, $ev) = @_;
		3272
		3273	return 0 unless $ev->{dy}; # only vertical movements
		3274
		3275	$self->{children}[1]->emit (mouse_wheel => $ev);
		3276
		3277	1
		3278	}
		3279
		3280	sub get_layout {
		3281	my ($self, $para) = @_;
2586		3282
2587	my $layout = $self->{layout};	3283	my $layout = $self->{layout};
2588		3284
		3285	$layout->set_font ($self->{font}) if $self->{font};
		3286	$layout->set_foreground (@{$para->{fg}});
2589	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3287	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590	$layout->set_width ($self->{children}[0]{w} - $indent);	3288	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3289	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($text);	3290	$layout->set_markup ($para->{markup});
		3291
		3292	$layout->set_shapes (
		3293	map
		3294	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3295	@{$para->{widget}}
2593		3296	);
		3297
2594	$layout->size	3298	$layout
2595	}	3299	}
2596		3300
2597	sub reflow {	3301	sub reflow {
2598	my ($self) = @_;	3302	my ($self) = @_;
2599		3303
…		…
2606		3310
2607	# todo: base offset on lines or so, not on pixels	3311	# todo: base offset on lines or so, not on pixels
2608	$self->{children}[1]->set_value ($offset);	3312	$self->{children}[1]->set_value ($offset);
2609	}	3313	}
2610		3314
		3315	sub current_paragraph {
		3316	my ($self) = @_;
		3317
		3318	$self->{top_paragraph} - 1
		3319	}
		3320
		3321	sub scroll_to {
		3322	my ($self, $para) = @_;
		3323
		3324	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3325
		3326	$self->{scroll_to} = $para;
		3327	$self->update;
		3328	}
		3329
2611	sub clear {	3330	sub clear {
2612	my ($self) = @_;	3331	my ($self) = @_;
		3332
		3333	my (undef, undef, @other) = @{ $self->{children} };
		3334	$self->remove ($_) for @other;
2613		3335
2614	$self->{par} = [];	3336	$self->{par} = [];
2615	$self->{height} = 0;	3337	$self->{height} = 0;
2616	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617	}	3339	}
2618		3340
2619	sub add_paragraph {	3341	sub add_paragraph {
2620	my ($self, $color, $text, $indent) = @_;	3342	my $self = shift;
2621		3343
2622	for my $line (split /\n/, $text) {	3344	for my $para (@_) {
2623	my ($w, $h) = $self->text_size ($line);	3345	$para = {
		3346	fg => [1, 1, 1, 1],
		3347	indent => 0,
		3348	markup => "",
		3349	widget => [],
		3350	ref $para ? %$para : (markup => $para),
		3351	w => 1e10,
		3352	wrapped => 1,
		3353	};
		3354
		3355	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3356	push @{$self->{par}}, $para;
		3357	}
		3358
		3359	if (my $max = $self->{max_par}) {
		3360	shift @{$self->{par}} while @{$self->{par}} > $max;
		3361	}
		3362
		3363	$self->{need_reflow}++;
		3364	$self->update;
		3365	}
		3366
		3367	sub scroll_to_bottom {
		3368	my ($self) = @_;
		3369
		3370	$self->{scroll_to} = $#{$self->{par}};
		3371	$self->update;
		3372	}
		3373
		3374	sub force_uptodate {
		3375	my ($self) = @_;
		3376
		3377	if (delete $self->{need_reflow}) {
		3378	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3379
		3380	my $height = 0;
		3381
		3382	for my $para (@{$self->{par}}) {
		3383	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3384	my $layout = $self->get_layout ($para);
		3385	my ($w, $h) = $layout->size;
		3386
		3387	$para->{w} = $w + $para->{indent};
		3388	$para->{h} = $h;
		3389	$para->{wrapped} = $layout->has_wrapped;
		3390	}
		3391
		3392	$para->{y} = $height;
		3393	$height += $para->{h};
		3394	}
		3395
2624	$self->{height} += $h;	3396	$self->{height} = $height;
2625	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3397	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626	}
2627		3398
2628	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3399	delete $self->{texture};
		3400	}
		3401
		3402	if (my $paridx = delete $self->{scroll_to}) {
		3403	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3404	}
2629	}	3405	}
2630		3406
2631	sub update {	3407	sub update {
2632	my ($self) = @_;	3408	my ($self) = @_;
2633		3409
…		…
2636	return unless $self->{h} > 0;	3412	return unless $self->{h} > 0;
2637		3413
2638	delete $self->{texture};	3414	delete $self->{texture};
2639		3415
2640	$ROOT->on_post_alloc ($self => sub {	3416	$ROOT->on_post_alloc ($self => sub {
		3417	$self->force_uptodate;
		3418
2641	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3419	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642		3420
2643	if (delete $self->{need_reflow}) {
2644	my $height = 0;
2645
2646	my $layout = $self->{layout};
2647
2648	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650	for (@{$self->{par}}) {
2651	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652	$layout->set_width ($W - $_->[3]);
2653	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654	$layout->set_markup ($_->[4]);
2655	my ($w, $h) = $layout->size;
2656	$_->[0] = $w + $_->[3];
2657	$_->[1] = $h;
2658	}
2659
2660	$height += $_->[1];
2661	}
2662
2663	$self->{height} = $height;
2664
2665	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667	delete $self->{texture};
2668	}
2669
2670	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3421	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671	glClearColor 0, 0, 0, 0;	3422	glClearColor 0, 0, 0, 0;
2672	glClear GL_COLOR_BUFFER_BIT;	3423	glClear GL_COLOR_BUFFER_BIT;
2673		3424
		3425	package CFPlus::UI::Base;
		3426	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3427	(0, 0, $self->{w}, $self->{h});
		3428
		3429	my $top = int $self->{children}[1]{range}[0];
		3430
		3431	my $paridx = 0;
		3432	my $top_paragraph;
2674	my $top = int $self->{children}[1]{range}[0];	3433	my $top = int $self->{children}[1]{range}[0];
2675		3434
2676	my $y0 = $top;	3435	my $y0 = $top;
2677	my $y1 = $top + $H;	3436	my $y1 = $top + $H;
2678		3437
2679	my $y = 0;
2680
2681	my $layout = $self->{layout};
2682
2683	$layout->set_font ($self->{font}) if $self->{font};
2684
2685	glEnable GL_BLEND;
2686	#TODO# not correct in windows where rgba is forced off
2687	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689	for my $par (@{$self->{par}}) {	3438	for my $para (@{$self->{par}}) {
2690	my $h = $par->[1];	3439	my $h = $para->{h};
		3440	my $y = $para->{y};
2691		3441
2692	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
2693	$layout->set_foreground (@{ $par->[2] });	3443	my $layout = $self->get_layout ($para);
2694	$layout->set_width ($W - $par->[3]);
2695	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696	$layout->set_markup ($par->[4]);
2697		3444
2698	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3445	$layout->render ($para->{indent}, $y - $y0);
		3446	$layout->draw;
2699		3447
2700	glRasterPos $par->[3], $y - $y0;	3448	if (my @w = @{ $para->{widget} }) {
2701	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3449	my @s = $layout->get_shapes;
		3450
		3451	for (@w) {
		3452	my ($dx, $dy) = splice @s, 0, 2, ();
		3453
		3454	$_->{x} = $dx + $para->{indent};
		3455	$_->{y} = $dy + $y - $y0;
		3456
		3457	$_->draw;
		3458	}
		3459	}
2702	}	3460	}
2703		3461
2704	$y += $h;	3462	$paridx++;
		3463	$top_paragraph ||= $paridx if $y >= $top;
2705	}	3464	}
2706		3465
2707	glDisable GL_BLEND;	3466	$self->{top_paragraph} = $top_paragraph;
2708	};	3467	};
2709	});	3468	});
		3469	}
		3470
		3471	sub reconfigure {
		3472	my ($self) = @_;
		3473
		3474	$self->SUPER::reconfigure;
		3475
		3476	$_->{w} = 1e10 for @{ $self->{par} };
		3477	$self->reflow;
2710	}	3478	}
2711		3479
2712	sub _draw {	3480	sub _draw {
2713	my ($self) = @_;	3481	my ($self) = @_;
2714		3482
…		…
2717	glColor 0, 0, 0, 1;	3485	glColor 0, 0, 0, 1;
2718	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3486	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719	glDisable GL_TEXTURE_2D;	3487	glDisable GL_TEXTURE_2D;
2720		3488
2721	$self->{children}[1]->draw;	3489	$self->{children}[1]->draw;
2722
2723	}	3490	}
2724		3491
2725	#############################################################################	3492	#############################################################################
2726		3493
2727	package CFClient::UI::Animator;	3494	package CFPlus::UI::Animator;
2728		3495
2729	use CFClient::OpenGL;	3496	use CFPlus::OpenGL;
2730		3497
2731	our @ISA = CFClient::UI::Bin::;	3498	our @ISA = CFPlus::UI::Bin::;
2732		3499
2733	sub moveto {	3500	sub moveto {
2734	my ($self, $x, $y) = @_;	3501	my ($self, $x, $y) = @_;
2735		3502
2736	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3503	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2764	glPopMatrix;	3531	glPopMatrix;
2765	}	3532	}
2766		3533
2767	#############################################################################	3534	#############################################################################
2768		3535
2769	package CFClient::UI::Flopper;	3536	package CFPlus::UI::Flopper;
2770		3537
2771	our @ISA = CFClient::UI::Button::;	3538	our @ISA = CFPlus::UI::Button::;
2772		3539
2773	sub new {	3540	sub new {
2774	my $class = shift;	3541	my $class = shift;
2775		3542
2776	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
…		…
2788	$self->{other}->toggle_visibility;	3555	$self->{other}->toggle_visibility;
2789	}	3556	}
2790		3557
2791	#############################################################################	3558	#############################################################################
2792		3559
2793	package CFClient::UI::Tooltip;	3560	package CFPlus::UI::Tooltip;
2794		3561
2795	our @ISA = CFClient::UI::Bin::;	3562	our @ISA = CFPlus::UI::Bin::;
2796		3563
2797	use CFClient::OpenGL;	3564	use CFPlus::OpenGL;
2798		3565
2799	sub new {	3566	sub new {
2800	my $class = shift;	3567	my $class = shift;
2801		3568
2802	$class->SUPER::new (	3569	$class->SUPER::new (
…		…
2806	}	3573	}
2807		3574
2808	sub set_tooltip_from {	3575	sub set_tooltip_from {
2809	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
2810		3577
2811	my $tooltip = $widget->{tooltip};	3578	my $tip = $widget->{tooltip};
		3579	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3580
		3581	$tip = CFPlus::Pod::section_label tooltip => $1
		3582	if $tip =~ /^#(.*)$/;
2812		3583
2813	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
2814	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
2815	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2816	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
2817	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
2818	}	3589	}
2819		3590
2820	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
2821	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
2822		3593
2823	$self->add (new CFClient::UI::Label	3594	$self->add (new CFPlus::UI::Label
2824	markup => $tooltip,	3595	markup => $tip,
2825	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826	fontsize => 0.8,	3597	fontsize => 0.8,
2827	fg => [0, 0, 0, 1],	3598	style => 1, # FLAG_INVERSE
2828	ellipsise => 0,	3599	ellipsise => 0,
2829	font => ($widget->{tooltip_font} || $::FONT_PROP),	3600	font => ($widget->{tooltip_font} || $::FONT_PROP),
2830	);	3601	);
2831	}	3602	}
2832		3603
…		…
2851		3622
2852	$self->{root}->on_post_alloc ("move_$self" => sub {	3623	$self->{root}->on_post_alloc ("move_$self" => sub {
2853	my $widget = $self->{owner}	3624	my $widget = $self->{owner}
2854	or return;	3625	or return;
2855		3626
		3627	if ($widget->{visible}) {
2856	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3628	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857		3629
2858	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3630	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859	if $x + $self->{w} > $self->{root}{w};	3631	if $x + $self->{w} > $self->{root}{w};
2860		3632
2861	$self->move_abs ($x, $y);	3633	$self->move_abs ($x, $y);
		3634	} else {
		3635	$self->hide;
		3636	}
2862	});	3637	});
2863	}	3638	}
2864		3639
2865	sub _draw {	3640	sub _draw {
2866	my ($self) = @_;	3641	my ($self) = @_;
2867		3642
2868	glTranslate 0.375, 0.375;
2869
2870	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
2871		3644
2872	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
2873	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
2874	glVertex 0 , 0;
2875	glVertex 0 , $h;
2876	glVertex $w, $h;
2877	glVertex $w, 0;
2878	glEnd;
2879		3647
2880	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
2881	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
2882	glVertex 0 , 0;
2883	glVertex 0 , $h;
2884	glVertex $w, $h;
2885	glVertex $w, 0;
2886	glEnd;
2887		3650
2888	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
2889		3652
2890	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
2891	}	3654	}
2892		3655
2893	#############################################################################	3656	#############################################################################
2894		3657
2895	package CFClient::UI::Face;	3658	package CFPlus::UI::Face;
2896		3659
2897	our @ISA = CFClient::UI::Base::;	3660	our @ISA = CFPlus::UI::DrawBG::;
2898		3661
2899	use CFClient::OpenGL;	3662	use CFPlus::OpenGL;
2900		3663
2901	sub new {	3664	sub new {
2902	my $class = shift;	3665	my $class = shift;
2903		3666
2904	my $self = $class->SUPER::new (	3667	my $self = $class->SUPER::new (
		3668	size_w => 32,
		3669	size_h => 8,
2905	aspect => 1,	3670	aspect => 1,
2906	can_events => 0,	3671	can_events => 0,
2907	@_,	3672	@_,
2908	);	3673	);
2909		3674
2910	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
2911	Scalar::Util::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
2912		3677
2913	$self->{timer} = Event->timer (	3678	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2914	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3679	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2915	hard => 1,	3680	return unless $::CONN;
2916	interval => $self->{animspeed},	3681
2917	cb => sub {	3682	my $w = $widget
		3683	or return;
		3684
2918	++$widget->{frame};	3685	++$w->{frame};
		3686	$w->update_face;
		3687
		3688	# somehow, $widget can go away
2919	$widget->update;	3689	$w->update;
2920	},	3690	$w->update_timer;
2921	);	3691	};
		3692
		3693	$self->update_face;
		3694	$self->update_timer;
2922	}	3695	}
2923		3696
2924	$self	3697	$self
2925	}	3698	}
2926		3699
		3700	sub update_timer {
		3701	my ($self) = @_;
		3702
		3703	return unless $self->{timer};
		3704
		3705	if ($self->{visible}) {
		3706	$self->{timer}->start;
		3707	} else {
		3708	$self->{timer}->stop;
		3709	}
		3710	}
		3711
		3712	sub update_face {
		3713	my ($self) = @_;
		3714
		3715	if ($::CONN) {
		3716	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3717	if ($anim && @$anim) {
		3718	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3719	delete $self->{face_change_cb};
		3720
		3721	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3722	unless ($tex->{name} || $tex->{loading}) {
		3723	$tex->upload (sub { $self->reconfigure });
		3724	}
		3725	}
		3726	}
		3727	}
		3728	}
		3729	}
		3730
2927	sub size_request {	3731	sub size_request {
2928	(32, 8)	3732	my ($self) = @_;
		3733
		3734	if ($::CONN) {
		3735	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3736	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3737	if ($tex->{name}) {
		3738	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3739	} elsif (!$tex->{loading}) {
		3740	$tex->upload (sub { $self->reconfigure });
		3741	}
		3742	}
		3743
		3744	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3745	}
		3746	}
		3747
		3748	($self->{size_w} || 8, $self->{size_h} || 8)
2929	}	3749	}
2930		3750
2931	sub update {	3751	sub update {
2932	my ($self) = @_;	3752	my ($self) = @_;
2933		3753
2934	return unless $self->{visible};	3754	return unless $self->{visible};
2935		3755
2936	$self->SUPER::update;	3756	$self->SUPER::update;
2937	}	3757	}
2938		3758
		3759	sub invoke_visibility_change {
		3760	my ($self) = @_;
		3761
		3762	$self->update_timer;
		3763
		3764	0
		3765	}
		3766
2939	sub _draw {	3767	sub _draw {
2940	my ($self) = @_;	3768	my ($self) = @_;
2941		3769
2942	return unless $::CONN;	3770	$self->SUPER::_draw;
2943		3771
2944	my $face;	3772	if (my $tex = $self->{tex}) {
2945
2946	if ($self->{frame}) {
2947	my $anim = $::CONN->{anim}[$self->{anim}];
2948
2949	$face = $anim->[ $self->{frame} % @$anim ]
2950	if $anim && @$anim;
2951	}
2952
2953	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2954
2955	if ($tex) {
2956	glEnable GL_TEXTURE_2D;	3773	glEnable GL_TEXTURE_2D;
2957	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3774	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958	glColor 0, 0, 0, 1;	3775	glColor 0, 0, 0, 1;
2959	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3776	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2960	glDisable GL_TEXTURE_2D;	3777	glDisable GL_TEXTURE_2D;
…		…
2962	}	3779	}
2963		3780
2964	sub destroy {	3781	sub destroy {
2965	my ($self) = @_;	3782	my ($self) = @_;
2966		3783
2967	$self->{timer}->cancel	3784	(delete $self->{timer})->cancel
2968	if $self->{timer};	3785	if $self->{timer};
2969		3786
2970	$self->SUPER::destroy;	3787	$self->SUPER::destroy;
2971	}	3788	}
2972		3789
2973	#############################################################################	3790	#############################################################################
2974		3791
2975	package CFClient::UI::Buttonbar;	3792	package CFPlus::UI::Buttonbar;
2976		3793
2977	our @ISA = CFClient::UI::HBox::;	3794	our @ISA = CFPlus::UI::HBox::;
2978		3795
2979	# TODO: should actualyl wrap buttons and other goodies.	3796	# TODO: should actually wrap buttons and other goodies.
2980		3797
2981	#############################################################################	3798	#############################################################################
2982		3799
2983	package CFClient::UI::Menu;	3800	package CFPlus::UI::Menu;
2984		3801
2985	our @ISA = CFClient::UI::FancyFrame::;	3802	our @ISA = CFPlus::UI::Toplevel::;
2986		3803
2987	use CFClient::OpenGL;	3804	use CFPlus::OpenGL;
2988		3805
2989	sub new {	3806	sub new {
2990	my $class = shift;	3807	my $class = shift;
2991		3808
2992	my $self = $class->SUPER::new (	3809	my $self = $class->SUPER::new (
2993	items => [],	3810	items => [],
2994	z => 100,	3811	z => 100,
2995	@_,	3812	@_,
2996	);	3813	);
2997		3814
2998	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3815	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999		3816
3000	for my $item (@{ $self->{items} }) {	3817	for my $item (@{ $self->{items} }) {
3001	my ($widget, $cb, $tooltip) = @$item;	3818	my ($widget, $cb, $tooltip) = @$item;
3002		3819
3003	# handle various types of items, only text for now	3820	# handle various types of items, only text for now
3004	if (!ref $widget) {	3821	if (!ref $widget) {
		3822	if ($widget =~ /\t/) {
		3823	my ($left, $right) = split /\t/, $widget, 2;
		3824
3005	$widget = new CFClient::UI::Label	3825	$widget = new CFPlus::UI::HBox
3006	can_hover => 1,	3826	can_hover => 1,
3007	can_events => 1,	3827	can_events => 1,
		3828	tooltip => $tooltip,
		3829	children => [
		3830	(new CFPlus::UI::Label markup => $left, expand => 1),
		3831	(new CFPlus::UI::Label markup => $right, align => +1),
		3832	],
		3833	;
		3834
		3835	} else {
		3836	$widget = new CFPlus::UI::Label
		3837	can_hover => 1,
		3838	can_events => 1,
3008	markup => $widget,	3839	markup => $widget,
3009	tooltip => $tooltip	3840	tooltip => $tooltip;
		3841	}
3010	}	3842	}
3011		3843
3012	$self->{item}{$widget} = $item;	3844	$self->{item}{$widget} = $item;
3013		3845
3014	$self->{vbox}->add ($widget);	3846	$self->{vbox}->add ($widget);
…		…
3057	1	3889	1
3058	}	3890	}
3059		3891
3060	#############################################################################	3892	#############################################################################
3061		3893
3062	package CFClient::UI::Multiplexer;	3894	package CFPlus::UI::Multiplexer;
3063		3895
3064	our @ISA = CFClient::UI::Container::;	3896	our @ISA = CFPlus::UI::Container::;
3065		3897
3066	sub new {	3898	sub new {
3067	my $class = shift;	3899	my $class = shift;
3068		3900
3069	my $self = $class->SUPER::new (	3901	my $self = $class->SUPER::new (
…		…
3083		3915
3084	$self->{current} = $self->{children}[0]	3916	$self->{current} = $self->{children}[0]
3085	if @{ $self->{children} };	3917	if @{ $self->{children} };
3086	}	3918	}
3087		3919
		3920	sub get_current_page {
		3921	my ($self) = @_;
		3922
		3923	$self->{current}
		3924	}
		3925
3088	sub set_current_page {	3926	sub set_current_page {
3089	my ($self, $page_or_widget) = @_;	3927	my ($self, $page_or_widget) = @_;
3090		3928
3091	my $widget = ref $page_or_widget	3929	my $widget = ref $page_or_widget
3092	? $page_or_widget	3930	? $page_or_widget
…		…
3124	$self->{current}->draw;	3962	$self->{current}->draw;
3125	}	3963	}
3126		3964
3127	#############################################################################	3965	#############################################################################
3128		3966
3129	package CFClient::UI::Notebook;	3967	package CFPlus::UI::Notebook;
3130		3968
		3969	use CFPlus::OpenGL;
		3970
3131	our @ISA = CFClient::UI::VBox::;	3971	our @ISA = CFPlus::UI::VBox::;
3132		3972
3133	sub new {	3973	sub new {
3134	my $class = shift;	3974	my $class = shift;
3135		3975
3136	my $self = $class->SUPER::new (	3976	my $self = $class->SUPER::new (
3137	buttonbar => (new CFClient::UI::Buttonbar),	3977	buttonbar => (new CFPlus::UI::Buttonbar),
3138	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3978	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3979	active_outline => [.7, .7, 0.2],
3139	# filter => # will be put between multiplexer and $self	3980	# filter => # will be put between multiplexer and $self
3140	@_,	3981	@_,
3141	);	3982	);
3142		3983
3143	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3984	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3144	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3985	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3145		3986
		3987	{
		3988	Scalar::Util::weaken (my $wself = $self);
		3989
		3990	$self->{multiplexer}->connect (c_add => sub {
		3991	my ($mplex, $widgets) = @_;
		3992
		3993	for my $child (@$widgets) {
		3994	Scalar::Util::weaken $child;
		3995	$child->{c_tab_} ||= do {
		3996	my $tab =
		3997	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3998	? $child->{c_tab}
		3999	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4000
		4001	$tab->connect (activate => sub {
		4002	$wself->set_current_page ($child);
		4003	});
		4004
		4005	$tab
		4006	};
		4007
		4008	$self->{buttonbar}->add ($child->{c_tab_});
		4009	}
		4010	});
		4011
		4012	$self->{multiplexer}->connect (c_remove => sub {
		4013	my ($mplex, $widgets) = @_;
		4014
		4015	for my $child (@$widgets) {
		4016	$wself->{buttonbar}->remove ($child->{c_tab_});
		4017	}
		4018	});
		4019	}
		4020
3146	$self	4021	$self
3147	}	4022	}
3148		4023
3149	sub add {	4024	sub add {
		4025	my ($self, @widgets) = @_;
		4026
		4027	$self->{multiplexer}->add (@widgets)
		4028	}
		4029
		4030	sub remove {
		4031	my ($self, @widgets) = @_;
		4032
		4033	$self->{multiplexer}->remove (@widgets)
		4034	}
		4035
		4036	sub pages {
		4037	my ($self) = @_;
		4038	$self->{multiplexer}->children
		4039	}
		4040
		4041	sub add_tab {
3150	my ($self, $title, $widget, $tooltip) = @_;	4042	my ($self, $title, $widget, $tooltip) = @_;
3151		4043
3152	Scalar::Util::weaken $self;	4044	$title = [$title, $tooltip] unless ref $title;
		4045	$widget->{c_tab} = $title;
3153		4046
3154	$self->{buttonbar}->add (new CFClient::UI::Button
3155	markup => $title,
3156	tooltip => $tooltip,
3157	on_activate => sub { $self->set_current_page ($widget) },
3158	);
3159
3160	$self->{multiplexer}->add ($widget);	4047	$self->add ($widget);
		4048	}
		4049
		4050	sub get_current_page {
		4051	my ($self) = @_;
		4052
		4053	$self->{multiplexer}->get_current_page
3161	}	4054	}
3162		4055
3163	sub set_current_page {	4056	sub set_current_page {
3164	my ($self, $page) = @_;	4057	my ($self, $page) = @_;
3165		4058
3166	$self->{multiplexer}->set_current_page ($page);	4059	$self->{multiplexer}->set_current_page ($page);
3167	$self->emit (page_changed => $self->{multiplexer}{current});	4060	$self->emit (page_changed => $self->{multiplexer}{current});
3168	}	4061	}
3169		4062
		4063	sub _draw {
		4064	my ($self) = @_;
		4065
		4066	$self->SUPER::_draw ();
		4067
		4068	if (my $cur = $self->{multiplexer}{current}) {
		4069	if ($cur = $cur->{c_tab_}) {
		4070	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4071	$self->{buttonbar}{y} + $cur->{y};
		4072	glLineWidth 3;
		4073	#glEnable GL_BLEND;
		4074	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4075	glColor @{$self->{active_outline}};
		4076	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4077	glLineWidth 1;
		4078	#glDisable GL_BLEND;
		4079	}
		4080	}
		4081	}
		4082
3170	#############################################################################	4083	#############################################################################
3171		4084
3172	package CFClient::UI::Combobox;	4085	package CFPlus::UI::Selector;
3173		4086
3174	use utf8;	4087	use utf8;
3175		4088
3176	our @ISA = CFClient::UI::Button::;	4089	our @ISA = CFPlus::UI::Button::;
3177		4090
3178	sub new {	4091	sub new {
3179	my $class = shift;	4092	my $class = shift;
3180		4093
3181	my $self = $class->SUPER::new (	4094	my $self = $class->SUPER::new (
…		…
3198	my ($value, $title, $tooltip) = @$_;	4111	my ($value, $title, $tooltip) = @$_;
3199		4112
3200	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4113	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201	}	4114	}
3202		4115
3203	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4116	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204	}	4117	}
3205		4118
3206	sub _set_value {	4119	sub _set_value {
3207	my ($self, $value) = @_;	4120	my ($self, $value) = @_;
3208		4121
3209	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4122	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4123	$item ||= $self->{options}[0]
3210	or return;	4124	or return;
3211		4125
3212	$self->{value} = $item->[0];	4126	$self->{value} = $item->[0];
3213	$self->set_markup ("$item->[1] ⇓");	4127	$self->set_markup ("$item->[1] ⇓");
3214	$self->set_tooltip ($item->[2]);	4128	# $self->set_tooltip ($item->[2]);
3215	}	4129	}
3216		4130
3217	sub set_value {	4131	sub set_value {
3218	my ($self, $value) = @_;	4132	my ($self, $value) = @_;
3219		4133
…		…
3221		4135
3222	$self->_set_value ($value);	4136	$self->_set_value ($value);
3223	$self->emit (changed => $value);	4137	$self->emit (changed => $value);
3224	}	4138	}
3225		4139
		4140	sub set_options {
		4141	my ($self, $options) = @_;
		4142
		4143	$self->{options} = $options;
		4144	$self->_set_value ($self->{value});
		4145	}
		4146
3226	#############################################################################	4147	#############################################################################
3227		4148
3228	package CFClient::UI::Statusbox;	4149	package CFPlus::UI::Statusbox;
3229		4150
3230	our @ISA = CFClient::UI::VBox::;	4151	our @ISA = CFPlus::UI::VBox::;
3231		4152
3232	sub new {	4153	sub new {
3233	my $class = shift;	4154	my $class = shift;
3234		4155
3235	my $self = $class->SUPER::new (	4156	my $self = $class->SUPER::new (
3236	fontsize => 0.8,	4157	fontsize => 0.8,
3237	@_,	4158	@_,
3238	);	4159	);
3239		4160
3240	Scalar::Util::weaken (my $this = $self);	4161	CFPlus::weaken (my $this = $self);
3241		4162
3242	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4163	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3243		4164
3244	$self	4165	$self
3245	}	4166	}
3246		4167
3247	sub reorder {	4168	sub reorder {
3248	my ($self) = @_;	4169	my ($self) = @_;
3249	my $NOW = Time::HiRes::time;	4170	my $NOW = Time::HiRes::time;
3250		4171
3251	# freeze display when hovering over any label	4172	# freeze display when hovering over any label
3252	return if $CFClient::UI::TOOLTIP->{owner}	4173	return if $CFPlus::UI::TOOLTIP->{owner}
3253	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4174	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254	values %{ $self->{item} };	4175	values %{ $self->{item} };
3255		4176
3256	while (my ($k, $v) = each %{ $self->{item} }) {	4177	while (my ($k, $v) = each %{ $self->{item} }) {
3257	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4178	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258	}	4179	}
		4180
		4181	$self->{timer}->set (1, 1);
3259		4182
3260	my @widgets;	4183	my @widgets;
3261		4184
3262	my @items = sort {	4185	my @items = sort {
3263	$a->{pri} <=> $b->{pri}	4186	$a->{pri} <=> $b->{pri}
3264	or $b->{id} <=> $a->{id}	4187	or $b->{id} <=> $a->{id}
3265	} values %{ $self->{item} };	4188	} values %{ $self->{item} };
3266
3267	$self->{timer}->interval (1);
3268		4189
3269	my $count = 10 + 1;	4190	my $count = 10 + 1;
3270	for my $item (@items) {	4191	for my $item (@items) {
3271	last unless --$count;	4192	last unless --$count;
3272		4193
…		…
3279	for ($short) {	4200	for ($short) {
3280	s/^\s+//;	4201	s/^\s+//;
3281	s/\s+/ /g;	4202	s/\s+/ /g;
3282	}	4203	}
3283		4204
3284	new CFClient::UI::Label	4205	new CFPlus::UI::Label
3285	markup => $short,	4206	markup => $short,
3286	tooltip => $item->{tooltip},	4207	tooltip => $item->{tooltip},
3287	tooltip_font => $::FONT_PROP,	4208	tooltip_font => $::FONT_PROP,
3288	tooltip_width => 0.67,	4209	tooltip_width => 0.67,
3289	fontsize => $item->{fontsize} || $self->{fontsize},	4210	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3296	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4217	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3297	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4218	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3298	$label->update;	4219	$label->update;
3299	$label->set_max_size (undef, $label->{req_h} * $diff)	4220	$label->set_max_size (undef, $label->{req_h} * $diff)
3300	if $diff < 1;	4221	if $diff < 1;
3301	$self->{timer}->interval (1/30);	4222	$self->{timer}->set (1/30, 1/30);
3302	} else {	4223	} else {
3303	$label->{fg}[3] = $item->{fg}[3] || 1;	4224	$label->{fg}[3] = $item->{fg}[3] || 1;
3304	}	4225	}
3305		4226
3306	push @widgets, $label;	4227	push @widgets, $label;
…		…
3343	count => 1,	4264	count => 1,
3344	%arg,	4265	%arg,
3345	};	4266	};
3346	}	4267	}
3347		4268
		4269	$ROOT->on_refresh (reorder => sub {
3348	$self->reorder;	4270	$self->reorder;
		4271	});
3349	}	4272	}
3350		4273
3351	sub reconfigure {	4274	sub reconfigure {
3352	my ($self) = @_;	4275	my ($self) = @_;
3353		4276
…		…
3366	$self->SUPER::destroy;	4289	$self->SUPER::destroy;
3367	}	4290	}
3368		4291
3369	#############################################################################	4292	#############################################################################
3370		4293
3371	package CFClient::UI::Inventory;
3372
3373	our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375	sub new {
3376	my $class = shift;
3377
3378	my $self = $class->SUPER::new (
3379	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380	@_,
3381	);
3382
3383	$self
3384	}
3385
3386	sub set_items {
3387	my ($self, $items) = @_;
3388
3389	$self->{child}->clear;
3390	return unless $items;
3391
3392	my @items = sort {
3393	($a->{type} <=> $b->{type})
3394	or ($a->{name} cmp $b->{name})
3395	} @$items;
3396
3397	$self->{real_items} = \@items;
3398
3399	my $row = 0;
3400	for my $item (@items) {
3401	CFClient::Item::update_widgets $item;
3402
3403	$self->{child}->add (0, $row, $item->{face_widget});
3404	$self->{child}->add (1, $row, $item->{desc_widget});
3405	$self->{child}->add (2, $row, $item->{weight_widget});
3406
3407	$row++;
3408	}
3409	}
3410
3411	#############################################################################
3412
3413	package CFClient::UI::BindEditor;
3414
3415	our @ISA = CFClient::UI::FancyFrame::;
3416
3417	sub new {
3418	my $class = shift;
3419
3420	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422	$self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426	text => "start recording",
3427	tooltip => "Start/Stops recording of actions."
3428	."All subsequent actions after the recording started will be captured."
3429	."The actions are displayed after the record was stopped."
3430	."To bind the action you have to click on the 'Bind' button",
3431	on_activate => sub {
3432	unless ($self->{recording}) {
3433	$self->start;
3434	} else {
3435	$self->stop;
3436	}
3437	});
3438
3439	$vb->add (new CFClient::UI::Label text => "Actions:");
3440	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3443	$vb->add (my $hb = new CFClient::UI::HBox);
3444	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445	$hb->add (new CFClient::UI::Button
3446	text => "bind",
3447	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448	on_activate => sub {
3449	$self->ask_for_bind;
3450	});
3451
3452	$vb->add (my $hb = new CFClient::UI::HBox);
3453	$hb->add (new CFClient::UI::Button
3454	text => "ok",
3455	expand => 1,
3456	tooltip => "This closes the binding editor and saves the binding",
3457	on_activate => sub {
3458	$self->hide;
3459	$self->commit;
3460	});
3461
3462	$hb->add (new CFClient::UI::Button
3463	text => "cancel",
3464	expand => 1,
3465	tooltip => "This closes the binding editor without saving",
3466	on_activate => sub {
3467	$self->hide;
3468	$self->{binding_cancel}->()
3469	if $self->{binding_cancel};
3470	});
3471
3472	$self->update_binding_widgets;
3473
3474	$self
3475	}
3476
3477	sub commit {
3478	my ($self) = @_;
3479	my ($mod, $sym, $cmds) = $self->get_binding;
3480	if ($sym != 0 && @$cmds > 0) {
3481	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482	."'. Don't forget 'Save Config'!");
3483	$self->{binding_change}->($mod, $sym, $cmds)
3484	if $self->{binding_change};
3485	} else {
3486	$::STATUSBOX->add ("No action bound, no key or action specified!");
3487	$self->{binding_cancel}->()
3488	if $self->{binding_cancel};
3489	}
3490	}
3491
3492	sub start {
3493	my ($self) = @_;
3494
3495	$self->{rec_btn}->set_text ("stop recording");
3496	$self->{recording} = 1;
3497	$self->clear_command_list;
3498	$::CONN->start_record if $::CONN;
3499	}
3500
3501	sub stop {
3502	my ($self) = @_;
3503
3504	$self->{rec_btn}->set_text ("start recording");
3505	$self->{recording} = 0;
3506
3507	my $rec;
3508	$rec = $::CONN->stop_record if $::CONN;
3509	return unless ref $rec eq 'ARRAY';
3510	$self->set_command_list ($rec);
3511	}
3512
3513
3514	sub ask_for_bind_and_commit {
3515	my ($self) = @_;
3516	$self->ask_for_bind (1);
3517	}
3518
3519	sub ask_for_bind {
3520	my ($self, $commit, $end_cb) = @_;
3521
3522	CFClient::Binder::open_binding_dialog (sub {
3523	my ($mod, $sym) = @_;
3524	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525	$self->update_binding_widgets;
3526	$self->commit if $commit;
3527	$end_cb->() if $end_cb;
3528	});
3529	}
3530
3531	# $mod and $sym are the modifiers and key symbol
3532	# $cmds is a array ref of strings (the commands)
3533	# $cb is the callback that is executed on OK
3534	# $ccb is the callback that is executed on CANCEL and
3535	# when the binding was unsuccessful on OK
3536	sub set_binding {
3537	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539	$self->clear_command_list;
3540	$self->{recording} = 0;
3541	$self->{rec_btn}->set_text ("start recording");
3542
3543	$self->{binding} = [$mod, $sym];
3544	$self->{commands} = $cmds;
3545
3546	$self->{binding_change} = $cb;
3547	$self->{binding_cancel} = $ccb;
3548
3549	$self->update_binding_widgets;
3550	}
3551
3552	# this is a shortcut method that asks for a binding
3553	# and then just binds it.
3554	sub do_quick_binding {
3555	my ($self, $cmds, $end_cb) = @_;
3556	$self->set_binding (undef, undef, $cmds, sub {
3557	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558	});
3559	$self->ask_for_bind (1, $end_cb);
3560	}
3561
3562	sub update_binding_widgets {
3563	my ($self) = @_;
3564	my ($mod, $sym, $cmds) = $self->get_binding;
3565	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566	$self->set_command_list ($cmds);
3567	}
3568
3569	sub get_binding {
3570	my ($self) = @_;
3571	return (
3572	$self->{binding}->[0],
3573	$self->{binding}->[1],
3574	[ grep { defined $_ } @{$self->{commands}} ]
3575	);
3576	}
3577
3578	sub clear_command_list {
3579	my ($self) = @_;
3580	$self->{cmdbox}->clear ();
3581	}
3582
3583	sub set_command_list {
3584	my ($self, $cmds) = @_;
3585
3586	$self->{cmdbox}->clear ();
3587	$self->{commands} = $cmds;
3588
3589	my $idx = 0;
3590
3591	for (@$cmds) {
3592	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594	my $i = $idx;
3595	$hb->add (new CFClient::UI::Label text => $_);
3596	$hb->add (new CFClient::UI::Button
3597	text => "delete",
3598	tooltip => "Deletes the action from the record",
3599	on_activate => sub {
3600	$self->{cmdbox}->remove ($hb);
3601	$cmds->[$i] = undef;
3602	});
3603
3604
3605	$idx++
3606	}
3607	}
3608
3609	#############################################################################
3610
3611	package CFClient::UI::SpellList;
3612
3613	our @ISA = CFClient::UI::Table::;
3614
3615	sub new {
3616	my $class = shift;
3617
3618	my $self = $class->SUPER::new (
3619	binding => [],
3620	commands => [],
3621	@_,
3622	)
3623	}
3624
3625	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638	sub rebuild_spell_list {
3639	my ($self) = @_;
3640
3641	$CFClient::UI::ROOT->on_refresh ($self => sub {
3642	$self->clear;
3643
3644	return unless $::CONN;
3645
3646	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652	my $row = 0;
3653
3654	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655	my $spell = $self->{spell}{$_};
3656
3657	$row++;
3658
3659	my $spell_cb = sub {
3660	my ($widget, $ev) = @_;
3661
3662	if ($ev->{button} == 1) {
3663	$::CONN->user_send ("cast $spell->{name}");
3664	} elsif ($ev->{button} == 2) {
3665	$::CONN->user_send ("invoke $spell->{name}");
3666	} elsif ($ev->{button} == 3) {
3667	(new CFClient::UI::Menu
3668	items => [
3669	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671	],
3672	)->popup ($ev);
3673	} else {
3674	return 0;
3675	}
3676
3677	1
3678	};
3679
3680	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682	#TODO: add path info to tooltip
3683	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685	$self->add (0, $row, new CFClient::UI::Face
3686	face => $spell->{face},
3687	can_hover => 1,
3688	can_events => 1,
3689	tooltip => $tooltip,
3690	on_button_down => $spell_cb,
3691	);
3692
3693	$self->add (1, $row, new CFClient::UI::Label
3694	expand => 1,
3695	text => $spell->{name},
3696	can_hover => 1,
3697	can_events => 1,
3698	tooltip => $tooltip,
3699	on_button_down => $spell_cb,
3700	);
3701
3702	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706	}
3707	});
3708	}
3709
3710	sub add_spell {
3711	my ($self, $spell) = @_;
3712
3713	$self->{spell}->{$spell->{name}} = $spell;
3714	$self->rebuild_spell_list;
3715	}
3716
3717	sub remove_spell {
3718	my ($self, $spell) = @_;
3719
3720	delete $self->{spell}->{$spell->{name}};
3721	$self->rebuild_spell_list;
3722	}
3723
3724	sub clear_spells {
3725	my ($self) = @_;
3726
3727	$self->{spell} = {};
3728	$self->rebuild_spell_list;
3729	}
3730
3731	#############################################################################
3732
3733	package CFClient::UI::Root;	4294	package CFPlus::UI::Root;
3734		4295
3735	our @ISA = CFClient::UI::Container::;	4296	our @ISA = CFPlus::UI::Container::;
3736		4297
3737	use List::Util qw(min max);	4298	use List::Util qw(min max);
3738		4299
3739	use CFClient::OpenGL;	4300	use CFPlus::OpenGL;
3740		4301
3741	sub new {	4302	sub new {
3742	my $class = shift;	4303	my $class = shift;
3743		4304
3744	my $self = $class->SUPER::new (	4305	my $self = $class->SUPER::new (
3745	visible => 1,	4306	visible => 1,
3746	@_,	4307	@_,
3747	);	4308	);
3748		4309
3749	Scalar::Util::weaken ($self->{root} = $self);	4310	CFPlus::weaken ($self->{root} = $self);
3750		4311
3751	$self	4312	$self
3752	}	4313	}
3753		4314
3754	sub size_request {	4315	sub size_request {
…		…
3802	}	4363	}
3803		4364
3804	sub update {	4365	sub update {
3805	my ($self) = @_;	4366	my ($self) = @_;
3806		4367
3807	$::WANT_REFRESH++;	4368	$::WANT_REFRESH->start;
3808	}	4369	}
3809		4370
3810	sub add {	4371	sub add {
3811	my ($self, @children) = @_;	4372	my ($self, @children) = @_;
3812		4373
…		…
3849	while ($self->{refresh_hook}) {	4410	while ($self->{refresh_hook}) {
3850	$_->()	4411	$_->()
3851	for values %{delete $self->{refresh_hook}};	4412	for values %{delete $self->{refresh_hook}};
3852	}	4413	}
3853		4414
3854	if ($self->{realloc}) {	4415	while ($self->{realloc}) {
3855	my %queue;	4416	my %queue;
3856	my @queue;	4417	my @queue;
3857	my $widget;	4418	my $widget;
3858		4419
3859	outer:	4420	outer:
…		…
3906	}	4467	}
3907	}	4468	}
3908		4469
3909	delete $self->{realloc}{$widget+0};	4470	delete $self->{realloc}{$widget+0};
3910	}	4471	}
3911	}
3912		4472
3913	while (my $size_alloc = delete $self->{size_alloc}) {	4473	while (my $size_alloc = delete $self->{size_alloc}) {
3914	my @queue = sort { $b->{visible} <=> $a->{visible} }	4474	my @queue = sort { $a->{visible} <=> $b->{visible} }
3915	values %$size_alloc;	4475	values %$size_alloc;
3916		4476
3917	while () {	4477	while () {
3918	my $widget = pop @queue || last;	4478	my $widget = pop @queue || last;
3919		4479
3920	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4480	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921		4481
3922	$w = 0 if $w < 0;	4482	$w = max $widget->{min_w}, $w;
3923	$h = 0 if $h < 0;	4483	$h = max $widget->{min_h}, $h;
3924		4484
		4485	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4486	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4487
		4488	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4489	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4490
3925	$w = int $w + 0.5;	4491	$w = int $w + 0.5;
3926	$h = int $h + 0.5;	4492	$h = int $h + 0.5;
3927		4493
3928	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4494	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929	$widget->{old_w} = $widget->{w};	4495	$widget->{old_w} = $widget->{w};
3930	$widget->{old_h} = $widget->{h};	4496	$widget->{old_h} = $widget->{h};
3931		4497
3932	$widget->{w} = $w;	4498	$widget->{w} = $w;
3933	$widget->{h} = $h;	4499	$widget->{h} = $h;
3934		4500
3935	$widget->emit (size_allocate => $w, $h);	4501	$widget->emit (size_allocate => $w, $h);
		4502	}
3936	}	4503	}
3937	}	4504	}
3938	}	4505	}
3939		4506
3940	while ($self->{post_alloc_hook}) {	4507	while ($self->{post_alloc_hook}) {
3941	$_->()	4508	$_->()
3942	for values %{delete $self->{post_alloc_hook}};	4509	for values %{delete $self->{post_alloc_hook}};
3943	}	4510	}
3944
3945		4511
3946	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4512	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3947	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4513	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3948	glClear GL_COLOR_BUFFER_BIT;	4514	glClear GL_COLOR_BUFFER_BIT;
3949		4515
…		…
3952	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4518	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953	glMatrixMode GL_MODELVIEW;	4519	glMatrixMode GL_MODELVIEW;
3954	glLoadIdentity;	4520	glLoadIdentity;
3955		4521
3956	{	4522	{
3957	package CFClient::UI::Base;	4523	package CFPlus::UI::Base;
3958		4524
3959	($draw_x, $draw_y, $draw_w, $draw_h) =	4525	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960	(0, 0, $self->{w}, $self->{h});	4526	(0, 0, $self->{w}, $self->{h});
3961	}
3962		4527
3963	$self->_draw;	4528	$self->_draw;
		4529	}
3964	}	4530	}
3965		4531
3966	#############################################################################	4532	#############################################################################
3967		4533
3968	package CFClient::UI;	4534	package CFPlus::UI;
3969		4535
3970	$ROOT = new CFClient::UI::Root;	4536	$ROOT = new CFPlus::UI::Root;
3971	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4537	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972		4538
3973	1	4539	1
3974		4540

Diff Legend

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