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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.448 by root, Tue Dec 25 07:39:18 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, 1/60, 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
…		…
345	my ($self, $x, $y, $w, $h) = @_;	386	my ($self, $x, $y, $w, $h) = @_;
346		387
347	if ($self->{aspect}) {	388	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	389	my ($ow, $oh) = ($w, $h);
349		390
350	$w = List::Util::min $w, int $h * $self->{aspect};	391	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	392	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		393
353	# use alignment to adjust x, y	394	# use alignment to adjust x, y
354		395
355	$x += int 0.5 * ($ow - $w);	396	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	397	$y += int 0.5 * ($oh - $h);
…		…
397		438
398	return if $self->{tooltip} eq $tooltip;	439	return if $self->{tooltip} eq $tooltip;
399		440
400	$self->{tooltip} = $tooltip;	441	$self->{tooltip} = $tooltip;
401		442
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	443	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	444	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	445	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
405	}	446	}
406	}	447	}
407		448
408	# translate global coordinates to local coordinate system	449	# translate global coordinates to local coordinate system
409	sub coord2local {	450	sub coord2local {
410	my ($self, $x, $y) = @_;	451	my ($self, $x, $y) = @_;
411		452
		453	return (undef, undef) unless $self->{parent};
		454
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	455	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	456	}
414		457
415	# translate local coordinates to global coordinate system	458	# translate local coordinates to global coordinate system
416	sub coord2global {	459	sub coord2global {
417	my ($self, $x, $y) = @_;	460	my ($self, $x, $y) = @_;
418		461
		462	return (undef, undef) unless $self->{parent};
		463
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	464	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	465	}
421		466
422	sub invoke_focus_in {	467	sub invoke_focus_in {
423	my ($self) = @_;	468	my ($self) = @_;
424		469
425	return if $FOCUS == $self;	470	return if $FOCUS == $self;
426	return unless $self->{can_focus};	471	return unless $self->{can_focus};
427		472
428	my $focus = $FOCUS; $FOCUS = $self;	473	$FOCUS = $self;
429		474
430	$focus->update if $focus;	475	$self->update;
431	$FOCUS->update;
432		476
433	0	477	0
434	}	478	}
435		479
436	sub invoke_focus_out {	480	sub invoke_focus_out {
437	my ($self) = @_;	481	my ($self) = @_;
438		482
439	return unless $FOCUS == $self;	483	return unless $FOCUS == $self;
440		484
441	my $focus = $FOCUS; undef $FOCUS;	485	undef $FOCUS;
442		486
443	$focus->update if $focus; #?	487	$self->update;
444		488
445	$::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
446	unless $FOCUS;	490	unless $FOCUS;
447		491
448	0	492	0
449	}	493	}
450		494
451	sub grab_focus {	495	sub grab_focus {
452	my ($self) = @_;	496	my ($self) = @_;
453		497
		498	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	499	$self->emit ("focus_in");
455	}	500	}
456		501
457	sub invoke_mouse_motion { 1 }	502	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	503	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	504	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	505	sub invoke_key_up { 0 }
		506	sub invoke_mouse_wheel { 0 }
461		507
462	sub invoke_button_down {	508	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	509	my ($self, $ev, $x, $y) = @_;
464		510
465	$self->grab_focus;	511	$self->grab_focus;
466		512
467	1	513	0
468	}	514	}
469		515
470	sub connect {	516	sub connect {
471	my ($self, $signal, $cb) = @_;	517	my ($self, $signal, $cb) = @_;
472		518
473	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	}
474	}	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	);
475		539
476	sub emit {	540	sub emit {
477	my ($self, $signal, @args) = @_;	541	my ($self, $signal, @args) = @_;
478		542
479	#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
480	(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
481	|| ($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
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	560	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	561	}
484		562
485	sub find_widget {	563	#sub find_widget {
486	my ($self, $x, $y) = @_;	564	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		565
497	sub set_parent {	566	sub set_parent {
498	my ($self, $parent) = @_;	567	my ($self, $parent) = @_;
499		568
500	Scalar::Util::weaken ($self->{parent} = $parent);	569	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	570	$self->set_visible if $parent->{visible};
502	}	571	}
503		572
504	sub realloc {	573	sub realloc {
505	my ($self) = @_;	574	my ($self) = @_;
…		…
531		600
532	# 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
533	# functions seems pointless.	602	# functions seems pointless.
534	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
535		604
536	sub draw {	605	#sub draw {
537	my ($self) = @_;	606	#CFPlus.xs
538
539	return unless $self->{h} && $self->{w};
540
541	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};
544
545	# skip widgets that are entirely outside the drawing area
546	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549	glPushMatrix;
550	glTranslate $self->{x}, $self->{y}, 0;
551
552	if ($self == $HOVER && $self->{can_hover}) {
553	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554	glEnable GL_BLEND;
555	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556	glBegin GL_QUADS;
557	glVertex 0 , 0;
558	glVertex $self->{w}, 0;
559	glVertex $self->{w}, $self->{h};
560	glVertex 0 , $self->{h};
561	glEnd;
562	glDisable GL_BLEND;
563	}
564
565	if ($ENV{CFPLUS_DEBUG} & 1) {
566	glPushMatrix;
567	glColor 1, 1, 0, 1;
568	glTranslate 0.375, 0.375;
569	glBegin GL_LINE_LOOP;
570	glVertex 0 , 0;
571	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;
574	glEnd;
575	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}
578
579	$self->_draw;
580	glPopMatrix;
581	}
582		607
583	sub _draw {	608	sub _draw {
584	my ($self) = @_;	609	my ($self) = @_;
585		610
586	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
587	}	612	}
588		613
589	sub DESTROY {	614	sub DESTROY {
590	my ($self) = @_;	615	my ($self) = @_;
591		616
592	delete $WIDGET{$self+0};	617	return if CFPlus::in_destruct;
593		618
		619	local $@;
594	eval { $self->destroy };	620	eval { $self->destroy };
595	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};
596	}	624	}
597		625
598	#############################################################################	626	#############################################################################
599		627
600	package CFClient::UI::DrawBG;	628	package CFPlus::UI::DrawBG;
601		629
602	our @ISA = CFClient::UI::Base::;	630	our @ISA = CFPlus::UI::Base::;
603		631
604	use strict;	632	use strict;
605	use CFClient::OpenGL;	633	use CFPlus::OpenGL;
606		634
607	sub new {	635	sub new {
608	my $class = shift;	636	my $class = shift;
609
610	# range [value, low, high, page]
611		637
612	$class->SUPER::new (	638	$class->SUPER::new (
613	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
614	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
615	@_	641	@_
…		…
627	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
628		654
629	glEnable GL_BLEND;	655	glEnable GL_BLEND;
630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631	glColor_premultiply @$color;	657	glColor_premultiply @$color;
632
633	glBegin GL_QUADS;
634	glVertex 0 , 0;
635	glVertex 0 , $h;
636	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
637	glVertex $w, 0;
638	glEnd;
639
640	glDisable GL_BLEND;	659	glDisable GL_BLEND;
641	}	660	}
642	}	661	}
643		662
644	#############################################################################	663	#############################################################################
645		664
646	package CFClient::UI::Empty;	665	package CFPlus::UI::Empty;
647		666
648	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
649		668
650	sub new {	669	sub new {
651	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	671	$class->SUPER::new (can_events => 0, %arg);
653	}	672	}
…		…
660		679
661	sub draw { }	680	sub draw { }
662		681
663	#############################################################################	682	#############################################################################
664		683
665	package CFClient::UI::Container;	684	package CFPlus::UI::Container;
666		685
667	our @ISA = CFClient::UI::Base::;	686	our @ISA = CFPlus::UI::Base::;
668		687
669	sub new {	688	sub new {
670	my ($class, %arg) = @_;	689	my ($class, %arg) = @_;
671		690
672	my $children = delete $arg{children};	691	my $children = delete $arg{children};
…		…
676	can_events => 0,	695	can_events => 0,
677	%arg,	696	%arg,
678	);	697	);
679		698
680	$self->add (@$children)	699	$self->add (@$children)
681	if $children;	700	if $children && @$children;
682		701
683	$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;
684	}	711	}
685		712
686	sub add {	713	sub add {
687	my ($self, @widgets) = @_;	714	my ($self, @widgets) = @_;
688		715
689	$_->set_parent ($self)	716	$_->set_parent ($self)
690	for @widgets;	717	for @widgets;
691		718
		719	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	720	use sort 'stable';
693		721
694	$self->{children} = [	722	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	723	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	724	@{$self->{children}}, @widgets
697	];	725	];
698		726
699	$self->realloc;	727	$self->realloc;
		728
		729	$self->emit (c_add => \@widgets);
		730
		731	map $_+0, @widgets
700	}	732	}
701		733
702	sub children {	734	sub children {
703	@{ $_[0]{children} }	735	@{ $_[0]{children} }
704	}	736	}
705		737
706	sub remove {	738	sub remove {
707	my ($self, $child) = @_;	739	my ($self, @widgets) = @_;
708		740
		741	$self->emit (c_remove => \@widgets);
		742
		743	for my $child (@widgets) {
709	delete $child->{parent};	744	delete $child->{parent};
710	$child->hide;	745	$child->hide;
711
712	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	746	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		747	}
713		748
714	$self->realloc;	749	$self->realloc;
715	}	750	}
716		751
717	sub clear {	752	sub clear {
718	my ($self) = @_;	753	my ($self) = @_;
719		754
720	my $children = delete $self->{children};	755	my $children = $self->{children};
721	$self->{children} = [];	756	$self->{children} = [];
722		757
723	for (@$children) {	758	for (@$children) {
724	delete $_->{parent};	759	delete $_->{parent};
725	$_->hide;	760	$_->hide;
…		…
745	}	780	}
746		781
747	sub _draw {	782	sub _draw {
748	my ($self) = @_;	783	my ($self) = @_;
749		784
750	$_->draw for @{$self->{children}};	785	$_->draw for $self->visible_children;
751	}	786	}
752		787
753	#############################################################################	788	#############################################################################
754		789
755	package CFClient::UI::Bin;	790	package CFPlus::UI::Bin;
756		791
757	our @ISA = CFClient::UI::Container::;	792	our @ISA = CFPlus::UI::Container::;
758		793
759	sub new {	794	sub new {
760	my ($class, %arg) = @_;	795	my ($class, %arg) = @_;
761		796
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	797	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		798
764	$class->SUPER::new (children => [$child], %arg)	799	$class->SUPER::new (children => [$child], %arg)
765	}	800	}
766		801
767	sub add {	802	sub add {
768	my ($self, $child) = @_;	803	my ($self, $child) = @_;
769		804
770	$self->SUPER::remove ($_) for @{ $self->{children} };	805	$self->clear;
771	$self->SUPER::add ($child);	806	$self->SUPER::add ($child);
772	}	807	}
773		808
774	sub remove {	809	sub remove {
775	my ($self, $widget) = @_;	810	my ($self, $widget) = @_;
776		811
777	$self->SUPER::remove ($widget);	812	$self->SUPER::remove ($widget);
778		813
779	$self->{children} = [new CFClient::UI::Empty]	814	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	815	unless @{$self->{children}};
781	}	816	}
782		817
783	sub child { $_[0]->{children}[0] }	818	sub child { $_[0]->{children}[0] }
784		819
…		…
793		828
794	1	829	1
795	}	830	}
796		831
797	#############################################################################	832	#############################################################################
798
799	# back-buffered drawing area	833	# back-buffered drawing area
800		834
801	package CFClient::UI::Window;	835	package CFPlus::UI::Window;
802		836
803	our @ISA = CFClient::UI::Bin::;	837	our @ISA = CFPlus::UI::Bin::;
804		838
805	use CFClient::OpenGL;	839	use CFPlus::OpenGL;
806		840
807	sub new {	841	sub new {
808	my ($class, %arg) = @_;	842	my ($class, %arg) = @_;
809		843
810	my $self = $class->SUPER::new (%arg);	844	my $self = $class->SUPER::new (%arg);
…		…
832	}	866	}
833		867
834	sub render_child {	868	sub render_child {
835	my ($self) = @_;	869	my ($self) = @_;
836		870
837	$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 {
838	glClearColor 0, 0, 0, 0;	872	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	873	glClear GL_COLOR_BUFFER_BIT;
840		874
841	{	875	{
842	package CFClient::UI::Base;	876	package CFPlus::UI::Base;
843		877
844	($draw_x, $draw_y, $draw_w, $draw_h) =	878	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	879	(0, 0, $self->{w}, $self->{h});
		880
		881	$self->_render;
846	}	882	}
847
848	$self->_render;
849	};	883	};
850	}	884	}
851		885
852	sub _draw {	886	sub _draw {
853	my ($self) = @_;	887	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		888
857	my $tex = $self->{texture}	889	my $tex = $self->{texture}
858	or return;	890	or return;
859		891
860	glEnable GL_TEXTURE_2D;	892	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	894	glColor 0, 0, 0, 1;
863		895
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	896	$tex->draw_quad_alpha_premultiplied (0, 0);
865		897
866	glDisable GL_TEXTURE_2D;	898	glDisable GL_TEXTURE_2D;
867	}	899	}
868		900
869	#############################################################################	901	#############################################################################
870		902
871	package CFClient::UI::ViewPort;	903	package CFPlus::UI::ViewPort;
872		904
		905	use List::Util qw(min max);
		906
873	our @ISA = CFClient::UI::Window::;	907	our @ISA = CFPlus::UI::Window::;
874		908
875	sub new {	909	sub new {
876	my $class = shift;	910	my $class = shift;
877		911
878	$class->SUPER::new (	912	$class->SUPER::new (
…		…
885	sub size_request {	919	sub size_request {
886	my ($self) = @_;	920	my ($self) = @_;
887		921
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		923
890	$w = 10 if $self->{scroll_x};	924	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	925	$h = 1 if $self->{scroll_y};
892		926
893	($w, $h)	927	($w, $h)
894	}	928	}
895		929
896	sub invoke_size_allocate {	930	sub invoke_size_allocate {
…		…
908	}	942	}
909		943
910	sub set_offset {	944	sub set_offset {
911	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
912		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}) {
913	$self->{view_x} = int $x;	951	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	952	$self->{view_y} = $y;
915		953
		954	$self->emit (changed => $x, $y);
916	$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	}
917	}	975	}
918		976
919	# 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
920	sub coord2local {	978	sub coord2local {
921	my ($self, $x, $y) = @_;	979	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	994	my ($self, $x, $y) = @_;
937		995
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	998	) {
941	$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})
942	} else {	1000	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1002	}
945	}	1003	}
946		1004
947	sub _render {	1005	sub _render {
948	my ($self) = @_;	1006	my ($self) = @_;
949		1007
950	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};
951	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};
952		1010
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1011	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1012
955	$self->SUPER::_render;	1013	$self->SUPER::_render;
956	}	1014	}
957		1015
958	#############################################################################	1016	#############################################################################
959		1017
960	package CFClient::UI::ScrolledWindow;	1018	package CFPlus::UI::ScrolledWindow;
961		1019
962	our @ISA = CFClient::UI::HBox::;	1020	our @ISA = CFPlus::UI::Table::;
963		1021
964	sub new {	1022	sub new {
965	my ($class, %arg) = @_;	1023	my ($class, %arg) = @_;
966		1024
967	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
968		1026
969	my $self;	1027	my $self;
970		1028
971	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,
972	vertical => 1,	1043	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1045	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1046	$self->{vpos} = $_[1];
		1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1048	},
977	;	1049	;
978		1050
979	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1052	scroll_x => 0,
		1053	scroll_y => 1,
		1054	can_events => 1,
981	slider => $slider,	1055	hslider => $hslider,
		1056	vslider => $vslider,
		1057	col_expand => [1, 0],
		1058	row_expand => [1, 0],
982	%arg,	1059	%arg,
983	);	1060	);
984		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
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add ($self->{vp});
		1084
986	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
987		1086
988	$self	1087	$self
989	}	1088	}
990		1089
…		…
992	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
993		1092
994	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
995	}	1094	}
996		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
997	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 {
998	my ($self) = @_;	1131	my ($self, $ev) = @_;
999		1132
1000	$self->SUPER::update;	1133	$self->grab_focus;
1001		1134
1002	# todo: overwrite size_allocate of child	1135	my $ox = $self->{vp}{view_x};
1003	my $child = $self->{vp}->child;	1136	my $oy = $self->{vp}{view_y};
1004	$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
1005	}	1187	}
1006		1188
1007	sub invoke_size_allocate {	1189	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1190	my ($self, $w, $h) = @_;
1009		1191
1010	my $child = $self->{vp}->child;	1192	$self->update_slider;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013	$self->SUPER::invoke_size_allocate ($w, $h)	1193	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1194	}
1015		1195
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1196	#############################################################################
1020		1197
1021	package CFClient::UI::Frame;	1198	package CFPlus::UI::Frame;
1022		1199
1023	our @ISA = CFClient::UI::Bin::;	1200	our @ISA = CFPlus::UI::Bin::;
1024		1201
1025	use CFClient::OpenGL;	1202	use CFPlus::OpenGL;
1026		1203
1027	sub new {	1204	sub new {
1028	my $class = shift;	1205	my $class = shift;
1029		1206
1030	$class->SUPER::new (	1207	$class->SUPER::new (
…		…
1040	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1041		1218
1042	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1043	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1044	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1045
1046	glBegin GL_QUADS;
1047	glVertex 0 , 0;
1048	glVertex 0 , $h;
1049	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1050	glVertex $w, 0;
1051	glEnd;
1052
1053	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1054	}	1224	}
1055		1225
1056	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1057	}	1227	}
1058		1228
1059	#############################################################################	1229	#############################################################################
1060		1230
1061	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1062		1232
1063	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1064		1234
1065	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;
1066		1336
1067	my $bg =	1337	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1070		1340
1071	my @border =	1341	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	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);
1074		1348
1075	sub new {	1349	sub new {
1076	my ($class, %arg) = @_;	1350	my ($class, %arg) = @_;
1077		1351
1078	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1353	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1354	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1355	border => 0.6,
1082	can_events => 1,	1356	can_events => 1,
1083	min_w => 16,	1357	min_w => 64,
1084	min_h => 16,	1358	min_h => 32,
1085	%arg,	1359	%arg,
1086	);	1360	);
1087		1361
1088	$self->{title_widget} = new CFClient::UI::Label	1362	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1363	align => 0,
1090	valign => 1,	1364	valign => 1,
1091	text => $self->{title},	1365	text => $self->{title},
1092	fontsize => $self->{border},	1366	fontsize => $self->{border},
1093	if exists $self->{title};	1367	if exists $self->{title};
1094		1368
1095	if ($self->{has_close_button}) {	1369	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1370	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1371	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1372	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1373	on_activate => sub { $self->emit ("delete") };
1100		1374
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1375	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1376	}
1103		1377
1104	$self	1378	$self
1105	}	1379	}
1106		1380
1107	sub add {	1381	sub add {
1108	my ($self, @widgets) = @_;	1382	my ($self, @widgets) = @_;
1109		1383
1110	$self->SUPER::add (@widgets);	1384	$self->SUPER::add (@widgets);
1111	$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};
1112	$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};
1113	}	1387	}
1114		1388
1115	sub border {	1389	sub border {
1116	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
1117	}	1400	}
1118		1401
1119	sub size_request {	1402	sub size_request {
1120	my ($self) = @_;	1403	my ($self) = @_;
1121		1404
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1433	$self->child->configure ($border, $border, $w, $h);
1151		1434
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1435	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1436	if $self->{close_button};
1154		1437
		1438	1
		1439	}
		1440
		1441	sub invoke_delete {
		1442	my ($self) = @_;
		1443
		1444	$self->hide;
		1445
1155	1	1446	1
1156	}	1447	}
1157		1448
1158	sub invoke_button_down {	1449	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1450	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1509
1219	! ! $self->{motion}	1510	! ! $self->{motion}
1220	}	1511	}
1221		1512
		1513	sub invoke_visibility_change {
		1514	my ($self, $visible) = @_;
		1515
		1516	delete $self->{motion} unless $visible;
		1517
		1518	0
		1519	}
		1520
1222	sub _draw {	1521	sub _draw {
1223	my ($self) = @_;	1522	my ($self) = @_;
1224		1523
1225	my $child = $self->{children}[0];	1524	my $child = $self->{children}[0];
1226		1525
…		…
1231	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232		1531
1233	my $border = $self->border;	1532	my $border = $self->border;
1234		1533
1235	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1236	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239	$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);
1240		1553
1241	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1243		1556
1244	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1263	if $self->{close_button};	1576	if $self->{close_button};
1264	}	1577	}
1265		1578
1266	#############################################################################	1579	#############################################################################
1267		1580
1268	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1269		1582
1270	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1271		1584
1272	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1273		1586
1274	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1275		1588
1276	sub new {	1589	sub new {
1277	my $class = shift;	1590	my $class = shift;
1278		1591
1279	$class->SUPER::new (	1592	$class->SUPER::new (
1280	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1281	@_,	1595	@_,
1282	)	1596	)
1283	}	1597	}
1284		1598
1285	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}
1288
1289	sub add {	1599	sub add {
1290	my ($self, $x, $y, $child) = @_;	1600	my ($self, @widgets) = @_;
1291		1601
1292	$child->set_parent ($self);	1602	for my $child (@widgets) {
1293	$self->{children}[$y][$x] = $child;	1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
1294		1606
1295	$self->realloc;	1607	$self->SUPER::add (@widgets);
1296	}	1608	}
1297		1609
1298	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 {
1299	my ($self, $child) = @_;	1628	my ($self) = @_;
1300		1629
1301	# TODO: not yet implemented	1630	my (@w, @h);
1302	}
1303
1304	# TODO: move to container class maybe? send children a signal on removal?
1305	sub clear {
1306	my ($self) = @_;
1307		1631
1308	my @children = $self->children;	1632	my @children = $self->children;
1309	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	}
1310		1643	}
1311	for (@children) {
1312	delete $_->{parent};
1313	$_->hide;
1314	}
1315		1644
1316	$self->realloc;	1645	# second pass, rows
1317	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1318
1319	sub get_wh {
1320	my ($self) = @_;
1321
1322	my (@w, @h);
1323
1324	for my $y (0 .. $#{$self->{children}}) {
1325	my $row = $self->{children}[$y]
1326	or next;
1327
1328	for my $x (0 .. $#$row) {
1329	my $widget = $row->[$x]
1330	or next;
1331	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1332		1648
1333	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1334	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335	}	1653	}
1336	}	1654	}
1337		1655
1338	(\@w, \@h)	1656	(\@w, \@h)
1339	}	1657	}
…		…
1355	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1356		1674
1357	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1358	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1359		1677
1360	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1361	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1362	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1363	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1364		1682
1365	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1684
1369	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
1370	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1371		1694
1372	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373		1697
1374	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1375	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)};
1376	or next;
1377		1700
1378	my $x = 0;	1701	$widget->configure (
1379	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380		1704	);
1381	for my $c (0 .. $#$row) {	1705	}
1382	my $col_w = $ws->[$c];
1383		1706
1384	if (my $widget = $row->[$c]) {	1707	1
1385	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1386	}
1387		1709
1388	$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};
1389	}	1737	}
		1738	}
1390		1739
1391	$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});
1392	}	1771	}
1393		1772
1394	1	1773	1
1395	}	1774	}
1396		1775
1397	sub find_widget {
1398	my ($self, $x, $y) = @_;
1399
1400	$x -= $self->{x};
1401	$y -= $self->{y};
1402
1403	my $res;
1404
1405	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1406	$res = $_->find_widget ($x, $y)
1407	and return $res;
1408	}
1409
1410	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1411	}
1412
1413	sub _draw {
1414	my ($self) = @_;
1415
1416	for (grep $_, @{$self->{children}}) {
1417	$_->draw for grep $_, @$_;
1418	}
1419	}
1420
1421	#############################################################################	1776	#############################################################################
1422		1777
1423	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1424		1779
1425	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1426		1781
1427	sub size_request {	1782	sub size_request {
1428	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1429		1786
1430	$self->{vertical}	1787	$self->{vertical}
1431	? (	1788	? (
1432	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1433	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1434	)	1791	)
1435	: (	1792	: (
1436	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1437	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1438	)	1795	)
1439	}	1796	}
1440		1797
1441	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1442	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1821	for 0 .. $#children;
1465	}	1822	}
1466	}	1823	}
1467		1824
1468	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1469		1826
1470	my $pos = 0;	1827	my $pos = 0;
1471	for (0 .. $#children) {	1828	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1473	$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));
…		…
1478	1	1835	1
1479	}	1836	}
1480		1837
1481	#############################################################################	1838	#############################################################################
1482		1839
1483	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1484		1841
1485	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1486		1843
1487	sub new {	1844	sub new {
1488	my $class = shift;	1845	my $class = shift;
1489		1846
1490	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1493	)	1850	)
1494	}	1851	}
1495		1852
1496	#############################################################################	1853	#############################################################################
1497		1854
1498	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1499		1856
1500	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1501		1858
1502	sub new {	1859	sub new {
1503	my $class = shift;	1860	my $class = shift;
1504		1861
1505	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1508	)	1865	)
1509	}	1866	}
1510		1867
1511	#############################################################################	1868	#############################################################################
1512		1869
1513	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1514		1871
1515	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1516		1873
1517	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1518		1875
1519	sub new {	1876	sub new {
1520	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1521		1878
1522	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1882	#active_bg => none
1526	#font => default_font	1883	#font => default_font
1527	#text => initial text	1884	#text => initial text
1528	#markup => initial narkup	1885	#markup => initial narkup
1529	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1530	ellipsise => 3, # end	1888	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1890	fontsize => 1,
1533	align => -1,	1891	align => -1,
1534	valign => -1,	1892	valign => -1,
1535	padding_x => 2,	1893	padding_x => 2,
1536	padding_y => 2,	1894	padding_y => 2,
1537	can_events => 0,	1895	can_events => 0,
1538	%arg	1896	%arg
1539	);	1897	);
1540		1898
1541	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1902	$self->{template} = $layout;
1545	}	1903	}
1546		1904
1547	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1551	}	1909	}
1552		1910
1553	$self	1911	$self
1554	}	1912	}
1555		1913
1556	sub escape($) {
1557	local $_ = $_[0];
1558
1559	s/&/&amp;/g;
1560	s/>/&gt;/g;
1561	s/</&lt;/g;
1562
1563	$_
1564	}
1565
1566	sub update {	1914	sub update {
1567	my ($self) = @_;	1915	my ($self) = @_;
1568		1916
1569	delete $self->{texture};	1917	delete $self->{texture};
1570	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1575		1923
1576	delete $self->{ox};	1924	delete $self->{ox};
1577	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1578	}	1926	}
1579		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1580	sub set_text {	1934	sub set_text {
1581	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1582		1936
1583	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
1585		1939
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1940	$self->{layout}->set_text ($text);
1588		1941
1589	delete $self->{size_req};	1942	delete $self->{size_req};
1590	$self->realloc;	1943	$self->realloc;
1591	$self->update;	1944	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1950	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1951	$self->{text} = "M$markup";
1599		1952
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1953	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1954
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1955	$self->{layout}->set_markup ($markup);
1604		1956
1605	delete $self->{size_req};	1957	delete $self->{size_req};
1606	$self->realloc;	1958	$self->realloc;
1607	$self->update;	1959	$self->update;
…		…
1609		1961
1610	sub size_request {	1962	sub size_request {
1611	my ($self) = @_;	1963	my ($self) = @_;
1612		1964
1613	$self->{size_req} ||= do {	1965	$self->{size_req} ||= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1614	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1615	$self->{layout}->set_width ($self->{max_w} || -1);	1969	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1616	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
1617	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1618	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1619		1973
1620	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
1621		1975
1622	if (exists $self->{template}) {	1976	if (exists $self->{template}) {
1623	$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);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1979	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1980
1626	my ($w2, $h2) = $self->{template}->size;	1981	my ($w2, $h2) = $self->{template}->size;
1627		1982
1628	$w = List::Util::max $w, $w2;	1983	$w = List::Util::max $w, $w2;
…		…
1652		2007
1653	sub set_fontsize {	2008	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	2009	my ($self, $fontsize) = @_;
1655		2010
1656	$self->{fontsize} = $fontsize;	2011	$self->{fontsize} = $fontsize;
		2012	delete $self->{size_req};
1657	delete $self->{texture};	2013	delete $self->{texture};
1658		2014
1659	$self->realloc;	2015	$self->realloc;
1660	}	2016	}
1661		2017
1662	sub reconfigure {	2018	sub reconfigure {
1663	my ($self) = @_;	2019	my ($self) = @_;
1664		2020
1665	delete $self->{size_req};	2021	delete $self->{size_req};
		2022	delete $self->{texture};
1666		2023
1667	$self->SUPER::reconfigure;	2024	$self->SUPER::reconfigure;
1668	}	2025	}
1669		2026
1670	sub _draw {	2027	sub _draw {
1671	my ($self) = @_;	2028	my ($self) = @_;
1672		2029
1673	$self->SUPER::_draw; # draw background, if applicable	2030	$self->SUPER::_draw; # draw background, if applicable
1674		2031
1675	my $tex = $self->{texture} ||= do {	2032	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	2033	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	2034	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	2035	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	2036	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2037	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2038	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		2039
1683	new_from_layout CFClient::Texture $self->{layout}	2040	[$self->{layout}->size]
1684	};	2041	};
1685		2042
1686	unless (exists $self->{ox}) {	2043	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2044	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2045	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
1690		2047
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694	};	2053	};
1695		2054
1696	glEnable GL_TEXTURE_2D;	2055	# unless ($self->{list}) {
1697		2056	# $self->{list} = CFPlus::OpenGL::glGenList;
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2057	# CFPlus::OpenGL::glNewList $self->{list};
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2058	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1700		2059	# CFPlus::OpenGL::glEndList;
1701	if ($tex->{format} == GL_ALPHA) {
1702	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703	glColor @{$self->{fg}};
1704	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705	} else {
1706	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708	}	2060	# }
		2061	#
		2062	# CFPlus::OpenGL::glCallList $self->{list};
1709		2063
1710	glDisable GL_TEXTURE_2D;	2064	$self->{layout}->draw;
1711	}	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	#}
1712		2074
1713	#############################################################################	2075	#############################################################################
1714		2076
1715	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1716		2078
1717	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1718		2080
1719	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1720		2082
1721	sub new {	2083	sub new {
1722	my $class = shift;	2084	my $class = shift;
1723		2085
1724	$class->SUPER::new (	2086	$class->SUPER::new (
1725	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
1726	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
1727	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
1728	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
1729	can_hover => 1,	2093	can_hover => 1,
1730	can_focus => 1,	2094	can_focus => 1,
1731	valign => 0,	2095	valign => 0,
1732	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1733	#text => ...	2098	#text => ...
1734	#hidden => "*",	2099	#hidden => "*",
1735	@_	2100	@_
1736	)	2101	)
1737	}	2102	}
…		…
1782	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1784		2149
1785	my $text = $self->get_text;	2150	my $text = $self->get_text;
1786		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1787	if ($uni == 8) {	2154	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} 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 = "";
1796	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2178	$self->emit ('escape');
1801	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2183	} else {
1804	return 0;	2184	return 0;
1805	}	2185	}
1806		2186
1807	$self->_set_text ($text);	2187	$self->_set_text ($text);
1808		2188
1809	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1810		2191
1811	1	2192	1
1812	}	2193	}
1813		2194
1814	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1826		2207
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2208	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2209
1829	# byte-index to char-index	2210	# byte-index to char-index
1830	my $text = $self->{text};	2211	my $text = $self->{text};
1831	utf8::encode $text;	2212	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2213	$self->{cursor} = length $text;
1833		2214
1834	$self->_set_text ($self->{text});	2215	$self->_set_text ($self->{text});
1835	$self->update;	2216	$self->update;
1836		2217
1837	1	2218	1
…		…
1856	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
1857	}	2238	}
1858		2239
1859	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
1860	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1861	glBegin GL_QUADS;
1862	glVertex 0 , 0;
1863	glVertex 0 , $self->{h};
1864	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
1865	glVertex $self->{w}, 0;
1866	glEnd;
1867	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
1868		2244
1869	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
1870		2246
1871	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
1873		2249
1874	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
1875	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
1876	utf8::encode $text;	2252	utf8::encode $text;
1877		2253
1878	@$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);
1879	}	2255	}
1880		2256
1881	glColor @{$self->{fg}};	2257	glColor_premultiply @{$self->{active_fg}};
1882	glBegin GL_LINES;	2258	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1884	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};
1885	glEnd;	2261	glEnd;
1886	}
1887	}
1888		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
1889	package CFClient::UI::Entry;	2281	package CFPlus::UI::Entry;
1890		2282
1891	our @ISA = CFClient::UI::EntryBase::;	2283	our @ISA = CFPlus::UI::EntryBase::;
1892		2284
1893	use CFClient::OpenGL;	2285	use CFPlus::OpenGL;
1894		2286
1895	sub invoke_key_down {	2287	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2288	my ($self, $ev) = @_;
1897		2289
1898	my $sym = $ev->{sym};	2290	my $sym = $ev->{sym};
1899		2291
1900	if ($sym == 13) {	2292	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2293	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2294	my $txt = $self->get_text;
1903		2295
1904	$self->{history_pointer} = -1;	2296	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2297	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2298	$self->emit (activate => $txt);
1907	$self->update;	2299	$self->update;
1908		2300
1909	} elsif ($sym == CFClient::SDLK_UP) {	2301	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2302	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2303	$self->{history_saveback} = $self->get_text;
1912	}	2304	}
1913	if (@{$self->{history} || []} > 0) {	2305	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2306	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2308	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2309	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2311	}
1920		2312
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2313	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2314	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2315	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2316
1925	if ($self->{history_pointer} >= 0) {	2317	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2318	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2327	1
1936	}	2328	}
1937		2329
1938	#############################################################################	2330	#############################################################################
1939		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
1940	package CFClient::UI::Button;	2371	package CFPlus::UI::ButtonBin;
1941		2372
1942	our @ISA = CFClient::UI::Label::;	2373	our @ISA = CFPlus::UI::Bin::;
1943		2374
1944	use CFClient::OpenGL;	2375	use CFPlus::OpenGL;
1945		2376
1946	my @tex =	2377	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2379	qw(b1_button_inactive.png b1_button_active.png);
1949		2380
1950	sub new {	2381	sub new {
1951	my $class = shift;	2382	my $class = shift;
1952		2383
1953	$class->SUPER::new (	2384	$class->SUPER::new (
1954	padding_x => 4,
1955	padding_y => 4,
1956	fg => [1, 1, 1],
1957	active_fg => [0, 0, 1],
1958	can_hover => 1,	2385	can_hover => 1,
1959	align => 0,	2386	align => 0,
1960	valign => 0,	2387	valign => 0,
1961	can_events => 1,	2388	can_events => 1,
1962	@_	2389	@_
…		…
1974	}	2401	}
1975		2402
1976	sub _draw {	2403	sub _draw {
1977	my ($self) = @_;	2404	my ($self) = @_;
1978		2405
1979	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1980
1981	glEnable GL_TEXTURE_2D;	2406	glEnable GL_TEXTURE_2D;
1982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983	glColor 0, 0, 0, 1;	2408	glColor 0, 0, 0, 1;
1984		2409
		2410	my $tex = $tex[$GRAB == $self];
1985	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2411	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986		2412
1987	glDisable GL_TEXTURE_2D;	2413	glDisable GL_TEXTURE_2D;
1988		2414
1989	$self->SUPER::_draw;	2415	$self->SUPER::_draw;
1990	}	2416	}
1991		2417
1992	#############################################################################	2418	#############################################################################
1993		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
1994	package CFClient::UI::ImageButton;	2625	package CFPlus::UI::ImageButton;
1995		2626
1996	our @ISA = CFClient::UI::Image::;	2627	our @ISA = CFPlus::UI::Image::;
1997		2628
1998	use CFClient::OpenGL;	2629	use CFPlus::OpenGL;
1999		2630
2000	my %textures;	2631	my %textures;
2001		2632
2002	sub new {	2633	sub new {
2003	my $class = shift;	2634	my $class = shift;
…		…
2013	can_events => 1,	2644	can_events => 1,
2014	@_	2645	@_
2015	);	2646	);
2016	}	2647	}
2017		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
		2653	}
		2654
2018	sub invoke_button_up {	2655	sub invoke_button_up {
2019	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2020		2657
2021	$self->emit ("activate")	2658	$self->emit ("activate")
2022	if $x >= 0 && $x < $self->{w}	2659	if $x >= 0 && $x < $self->{w}
…		…
2025	1	2662	1
2026	}	2663	}
2027		2664
2028	#############################################################################	2665	#############################################################################
2029		2666
2030	package CFClient::UI::CheckBox;
2031
2032	our @ISA = CFClient::UI::DrawBG::;
2033
2034	my @tex =
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038	use CFClient::OpenGL;
2039
2040	sub new {
2041	my $class = shift;
2042
2043	$class->SUPER::new (
2044	padding_x => 2,
2045	padding_y => 2,
2046	fg => [1, 1, 1],
2047	active_fg => [1, 1, 0],
2048	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],
2050	state => 0,
2051	can_hover => 1,
2052	@_
2053	)
2054	}
2055
2056	sub size_request {
2057	my ($self) = @_;
2058
2059	(6) x 2
2060	}
2061
2062	sub invoke_button_down {
2063	my ($self, $ev, $x, $y) = @_;
2064
2065	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067	$self->{state} = !$self->{state};
2068	$self->emit (changed => $self->{state});
2069	} else {
2070	return 0
2071	}
2072
2073	1
2074	}
2075
2076	sub _draw {
2077	my ($self) = @_;
2078
2079	$self->SUPER::_draw;
2080
2081	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083	my ($w, $h) = @$self{qw(w h)};
2084
2085	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089	my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091	glEnable GL_TEXTURE_2D;
2092	$tex->draw_quad_alpha (0, 0, $s, $s);
2093	glDisable GL_TEXTURE_2D;
2094	}
2095
2096	#############################################################################
2097
2098	package CFClient::UI::Image;	2667	package CFPlus::UI::VGauge;
2099		2668
2100	our @ISA = CFClient::UI::Base::;	2669	our @ISA = CFPlus::UI::Base::;
2101
2102	use CFClient::OpenGL;
2103
2104	our %texture_cache;
2105
2106	sub new {
2107	my $class = shift;
2108
2109	my $self = $class->SUPER::new (
2110	can_events => 0,
2111	@_,
2112	);
2113
2114	$self->{path}
2115	or Carp::croak "required attribute 'path' not set";
2116
2117	$self->{tex} = $texture_cache{$self->{path}} ||=
2118	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120	Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124	$self
2125	}
2126
2127	sub size_request {
2128	my ($self) = @_;
2129
2130	($self->{tex}{w}, $self->{tex}{h})
2131	}
2132
2133	sub _draw {
2134	my ($self) = @_;
2135
2136	my $tex = $self->{tex};
2137
2138	my ($w, $h) = ($self->{w}, $self->{h});
2139
2140	if ($self->{rot90}) {
2141	glRotate 90, 0, 0, 1;
2142	glTranslate 0, -$self->{w}, 0;
2143
2144	($w, $h) = ($h, $w);
2145	}
2146
2147	glEnable GL_TEXTURE_2D;
2148	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150	$tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::VGauge;
2158
2159	our @ISA = CFClient::UI::Base::;
2160		2670
2161	use List::Util qw(min max);	2671	use List::Util qw(min max);
2162		2672
2163	use CFClient::OpenGL;	2673	use CFPlus::OpenGL;
2164		2674
2165	my %tex = (	2675	my %tex = (
2166	food => [	2676	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2677	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2678	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2679	],
2170	grace => [	2680	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2681	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	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/
2173	],	2683	],
2174	hp => [	2684	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2685	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2686	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2687	],
2178	mana => [	2688	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2689	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180	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/
2181	],	2691	],
2182	);	2692	);
2183		2693
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2694	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2754	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2755	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2756
2247	my $h1 = $self->{h} * (1 - $ycut1);	2757	my $h1 = $self->{h} * (1 - $ycut1);
2248	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);
2249		2762
2250	glEnable GL_BLEND;	2763	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2764	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2765	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2766	glEnable GL_TEXTURE_2D;
…		…
2272		2785
2273	if ($t3) {	2786	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2787	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2788	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2789	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2790	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2791	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2792	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2793	glEnd;
2281	}	2794	}
2282		2795
2283	glDisable GL_BLEND;	2796	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2285	}	2798	}
2286		2799
2287	#############################################################################	2800	#############################################################################
2288		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
2289	package CFClient::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2290		2941
2291	our @ISA = CFClient::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2292		2943
2293	sub new {	2944	sub new {
2294	my ($class, %arg) = @_;	2945	my ($class, %arg) = @_;
2295		2946
2296	my $self = $class->SUPER::new (	2947	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2949	can_hover => 1,
2299	can_events => 1,	2950	can_events => 1,
2300	%arg,	2951	%arg,
2301	);	2952	);
2302		2953
2303	$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");
2304	$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);
2305	$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");
2306		2957
2307	$self	2958	$self
2308	}	2959	}
2309		2960
2310	sub set_fontsize {	2961	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2982	$self->{value}->set_text ($val);
2332	}	2983	}
2333		2984
2334	#############################################################################	2985	#############################################################################
2335		2986
2336	package CFClient::UI::Slider;	2987	package CFPlus::UI::Slider;
2337		2988
2338	use strict;	2989	use strict;
2339		2990
2340	use CFClient::OpenGL;	2991	use CFPlus::OpenGL;
2341		2992
2342	our @ISA = CFClient::UI::DrawBG::;	2993	our @ISA = CFPlus::UI::DrawBG::;
2343		2994
2344	my @tex =	2995	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2996	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2997	qw(s1_slider.png s1_slider_bg.png);
2347		2998
2348	sub new {	2999	sub new {
2349	my $class = shift;	3000	my $class = shift;
2350		3001
…		…
2418		3069
2419	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2420		3071
2421	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2422		3073
2423	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2424	}	3077	}
2425		3078
2426	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2427	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2428		3081
…		…
2435		3088
2436	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3089	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437	} else {	3090	} else {
2438	return 0;	3091	return 0;
2439	}	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);
2440		3105
2441	1	3106	1
2442	}	3107	}
2443		3108
2444	sub update {	3109	sub update {
…		…
2495	glDisable GL_TEXTURE_2D;	3160	glDisable GL_TEXTURE_2D;
2496	}	3161	}
2497		3162
2498	#############################################################################	3163	#############################################################################
2499		3164
2500	package CFClient::UI::ValSlider;	3165	package CFPlus::UI::ValSlider;
2501		3166
2502	our @ISA = CFClient::UI::HBox::;	3167	our @ISA = CFPlus::UI::HBox::;
2503		3168
2504	sub new {	3169	sub new {
2505	my ($class, %arg) = @_;	3170	my ($class, %arg) = @_;
2506		3171
2507	my $range = delete $arg{range};	3172	my $range = delete $arg{range};
2508		3173
2509	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3175	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3176	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	3177	to_value => sub { shift },
2513	from_value => sub { shift },	3178	from_value => sub { shift },
2514	%arg,	3179	%arg,
2515	);	3180	);
2516		3181
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	3201	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	3202	sub set_value { shift->{slider}->set_value (@_) }
2538		3203
2539	#############################################################################	3204	#############################################################################
2540		3205
2541	package CFClient::UI::TextScroller;	3206	package CFPlus::UI::TextScroller;
2542		3207
2543	our @ISA = CFClient::UI::HBox::;	3208	our @ISA = CFPlus::UI::HBox::;
2544		3209
2545	use CFClient::OpenGL;	3210	use CFPlus::OpenGL;
2546		3211
2547	sub new {	3212	sub new {
2548	my $class = shift;	3213	my $class = shift;
2549		3214
2550	my $self = $class->SUPER::new (	3215	my $self = $class->SUPER::new (
2551	fontsize => 1,	3216	fontsize => 1,
2552	can_events => 0,	3217	can_events => 1,
2553	indent => 0,	3218	indent => 0,
2554	#font => default_font	3219	#font => default_font
2555	@_,	3220	@_,
2556		3221
2557	layout => (new CFClient::Layout 1),	3222	layout => (new CFPlus::Layout),
2558	par => [],	3223	par => [],
		3224	max_par => 0,
2559	height => 0,	3225	height => 0,
2560	children => [	3226	children => [
2561	(new CFClient::UI::Empty expand => 1),	3227	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	3228	(new CFPlus::UI::Slider vertical => 1),
2563	],	3229	],
2564	);	3230	);
2565		3231
2566	$self->{children}[1]->connect (changed => sub { $self->update });	3232	$self->{children}[1]->connect (changed => sub { $self->update });
2567		3233
…		…
2576	}	3242	}
2577		3243
2578	sub size_request {	3244	sub size_request {
2579	my ($self) = @_;	3245	my ($self) = @_;
2580		3246
2581	my ($empty, $slider) = @{ $self->{children} };	3247	my ($empty, $slider) = $self->visible_children;
2582		3248
2583	local $self->{children} = [$empty, $slider];	3249	local $self->{children} = [$empty, $slider];
2584	$self->SUPER::size_request	3250	$self->SUPER::size_request
2585	}	3251	}
2586		3252
…		…
2597		3263
2598	$self->reflow;	3264	$self->reflow;
2599		3265
2600	local $self->{children} = [$empty, $slider];	3266	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	3267	$self->SUPER::invoke_size_allocate ($w, $h)
		3268	}
		3269
		3270	sub invoke_mouse_wheel {
		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
2602	}	3278	}
2603		3279
2604	sub get_layout {	3280	sub get_layout {
2605	my ($self, $para) = @_;	3281	my ($self, $para) = @_;
2606		3282
…		…
2634		3310
2635	# todo: base offset on lines or so, not on pixels	3311	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	3312	$self->{children}[1]->set_value ($offset);
2637	}	3313	}
2638		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
2639	sub clear {	3330	sub clear {
2640	my ($self) = @_;	3331	my ($self) = @_;
2641		3332
2642	my (undef, undef, @other) = @{ $self->{children} };	3333	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	3334	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	3337	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	3339	}
2649		3340
2650	sub add_paragraph {	3341	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	3342	my $self = shift;
2652		3343
2653	my ($text, @w) = ref $para ? @$para : $para;	3344	for my $para (@_) {
2654
2655	$para = {	3345	$para = {
		3346	fg => [1, 1, 1, 1],
		3347	indent => 0,
		3348	markup => "",
		3349	widget => [],
		3350	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	3351	w => 1e10,
2657	wrapped => 1,	3352	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	3353	};
2663		3354
2664	$self->add (@w) if @w;	3355	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	3356	push @{$self->{par}}, $para;
		3357	}
		3358
		3359	if (my $max = $self->{max_par}) {
		3360	shift @{$self->{par}} while @{$self->{par}} > $max;
		3361	}
2666		3362
2667	$self->{need_reflow}++;	3363	$self->{need_reflow}++;
2668	$self->update;	3364	$self->update;
2669	}	3365	}
2670		3366
2671	sub scroll_to_bottom {	3367	sub scroll_to_bottom {
2672	my ($self) = @_;	3368	my ($self) = @_;
2673		3369
2674	$self->{scroll_to_bottom} = 1;	3370	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	3371	$self->update;
2676	}	3372	}
2677		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
		3396	$self->{height} = $height;
		3397	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3398
		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	}
		3405	}
		3406
2678	sub update {	3407	sub update {
2679	my ($self) = @_;	3408	my ($self) = @_;
2680		3409
2681	$self->SUPER::update;	3410	$self->SUPER::update;
2682		3411
2683	return unless $self->{h} > 0;	3412	return unless $self->{h} > 0;
2684		3413
2685	delete $self->{texture};	3414	delete $self->{texture};
2686		3415
2687	$ROOT->on_post_alloc ($self => sub {	3416	$ROOT->on_post_alloc ($self => sub {
		3417	$self->force_uptodate;
		3418
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3419	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		3420
2690	if (delete $self->{need_reflow}) {
2691	my $height = 0;
2692
2693	for my $para (@{$self->{par}}) {
2694	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695	my $layout = $self->get_layout ($para);
2696	my ($w, $h) = $layout->size;
2697
2698	$para->{w} = $w + $para->{indent};
2699	$para->{h} = $h;
2700	$para->{wrapped} = $layout->has_wrapped;
2701	}
2702
2703	$height += $para->{h};
2704	}
2705
2706	$self->{height} = $height;
2707
2708	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710	delete $self->{texture};
2711	}
2712
2713	if (delete $self->{scroll_to_bottom}) {
2714	$self->{children}[1]->set_value (1e10);
2715	}
2716
2717	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3421	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	3422	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	3423	glClear GL_COLOR_BUFFER_BIT;
2720		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;
2721	my $top = int $self->{children}[1]{range}[0];	3433	my $top = int $self->{children}[1]{range}[0];
2722		3434
2723	my $y0 = $top;	3435	my $y0 = $top;
2724	my $y1 = $top + $H;	3436	my $y1 = $top + $H;
2725		3437
2726	my $y = 0;
2727
2728	glEnable GL_BLEND;
2729	#TODO# not correct in windows where rgba is forced off
2730	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732	for my $para (@{$self->{par}}) {	3438	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	3439	my $h = $para->{h};
		3440	my $y = $para->{y};
2734		3441
2735	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	3443	my $layout = $self->get_layout ($para);
2738		3444
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	3445	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3446	$layout->draw;
2743		3447
2744	if (my @w = @{ $para->{widget} }) {	3448	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3449	my @s = $layout->get_shapes;
2746		3450
2747	for (@w) {	3451	for (@w) {
…		…
2753	$_->draw;	3457	$_->draw;
2754	}	3458	}
2755	}	3459	}
2756	}	3460	}
2757		3461
2758	$y += $h;	3462	$paridx++;
		3463	$top_paragraph ||= $paridx if $y >= $top;
2759	}	3464	}
2760		3465
2761	glDisable GL_BLEND;	3466	$self->{top_paragraph} = $top_paragraph;
2762	};	3467	};
2763	});	3468	});
2764	}	3469	}
2765		3470
2766	sub reconfigure {	3471	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3489	$self->{children}[1]->draw;
2785	}	3490	}
2786		3491
2787	#############################################################################	3492	#############################################################################
2788		3493
2789	package CFClient::UI::Animator;	3494	package CFPlus::UI::Animator;
2790		3495
2791	use CFClient::OpenGL;	3496	use CFPlus::OpenGL;
2792		3497
2793	our @ISA = CFClient::UI::Bin::;	3498	our @ISA = CFPlus::UI::Bin::;
2794		3499
2795	sub moveto {	3500	sub moveto {
2796	my ($self, $x, $y) = @_;	3501	my ($self, $x, $y) = @_;
2797		3502
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3503	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3531	glPopMatrix;
2827	}	3532	}
2828		3533
2829	#############################################################################	3534	#############################################################################
2830		3535
2831	package CFClient::UI::Flopper;	3536	package CFPlus::UI::Flopper;
2832		3537
2833	our @ISA = CFClient::UI::Button::;	3538	our @ISA = CFPlus::UI::Button::;
2834		3539
2835	sub new {	3540	sub new {
2836	my $class = shift;	3541	my $class = shift;
2837		3542
2838	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3555	$self->{other}->toggle_visibility;
2851	}	3556	}
2852		3557
2853	#############################################################################	3558	#############################################################################
2854		3559
2855	package CFClient::UI::Tooltip;	3560	package CFPlus::UI::Tooltip;
2856		3561
2857	our @ISA = CFClient::UI::Bin::;	3562	our @ISA = CFPlus::UI::Bin::;
2858		3563
2859	use CFClient::OpenGL;	3564	use CFPlus::OpenGL;
2860		3565
2861	sub new {	3566	sub new {
2862	my $class = shift;	3567	my $class = shift;
2863		3568
2864	$class->SUPER::new (	3569	$class->SUPER::new (
…		…
2868	}	3573	}
2869		3574
2870	sub set_tooltip_from {	3575	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
2872		3577
2873	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 =~ /^#(.*)$/;
2874		3583
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
2877	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
2879	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
2880	}	3589	}
2881		3590
2882	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
2884		3593
2885	$self->add (new CFClient::UI::Label	3594	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3595	markup => $tip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3597	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3598	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3599	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3600	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3601	);
2893	}	3602	}
2894		3603
…		…
2913		3622
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3623	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3624	my $widget = $self->{owner}
2916	or return;	3625	or return;
2917		3626
		3627	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3628	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3629
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3630	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3631	if $x + $self->{w} > $self->{root}{w};
2922		3632
2923	$self->move_abs ($x, $y);	3633	$self->move_abs ($x, $y);
		3634	} else {
		3635	$self->hide;
		3636	}
2924	});	3637	});
2925	}	3638	}
2926		3639
2927	sub _draw {	3640	sub _draw {
2928	my ($self) = @_;	3641	my ($self) = @_;
2929		3642
2930	glTranslate 0.375, 0.375;
2931
2932	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
2933		3644
2934	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
2935	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
2936	glVertex 0 , 0;
2937	glVertex 0 , $h;
2938	glVertex $w, $h;
2939	glVertex $w, 0;
2940	glEnd;
2941		3647
2942	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
2943	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
2944	glVertex 0 , 0;
2945	glVertex 0 , $h;
2946	glVertex $w, $h;
2947	glVertex $w, 0;
2948	glEnd;
2949		3650
2950	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
2951		3652
2952	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
2953	}	3654	}
2954		3655
2955	#############################################################################	3656	#############################################################################
2956		3657
2957	package CFClient::UI::Face;	3658	package CFPlus::UI::Face;
2958		3659
2959	our @ISA = CFClient::UI::Base::;	3660	our @ISA = CFPlus::UI::DrawBG::;
2960		3661
2961	use CFClient::OpenGL;	3662	use CFPlus::OpenGL;
2962		3663
2963	sub new {	3664	sub new {
2964	my $class = shift;	3665	my $class = shift;
2965		3666
2966	my $self = $class->SUPER::new (	3667	my $self = $class->SUPER::new (
		3668	size_w => 32,
		3669	size_h => 8,
2967	aspect => 1,	3670	aspect => 1,
2968	can_events => 0,	3671	can_events => 0,
2969	@_,	3672	@_,
2970	);	3673	);
2971		3674
2972	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
2973	Scalar::Util::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
2974		3677
2975	$self->{timer} = Event->timer (	3678	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2976	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3679	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2977	hard => 1,	3680	return unless $::CONN;
2978	interval => $self->{animspeed},	3681
2979	cb => sub {	3682	my $w = $widget
		3683	or return;
		3684
2980	++$widget->{frame};	3685	++$w->{frame};
		3686	$w->update_face;
		3687
		3688	# somehow, $widget can go away
2981	$widget->update;	3689	$w->update;
2982	},	3690	$w->update_timer;
2983	);	3691	};
		3692
		3693	$self->update_face;
		3694	$self->update_timer;
2984	}	3695	}
2985		3696
2986	$self	3697	$self
2987	}	3698	}
2988		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
2989	sub size_request {	3731	sub size_request {
2990	(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)
2991	}	3749	}
2992		3750
2993	sub update {	3751	sub update {
2994	my ($self) = @_;	3752	my ($self) = @_;
2995		3753
2996	return unless $self->{visible};	3754	return unless $self->{visible};
2997		3755
2998	$self->SUPER::update;	3756	$self->SUPER::update;
2999	}	3757	}
3000		3758
		3759	sub invoke_visibility_change {
		3760	my ($self) = @_;
		3761
		3762	$self->update_timer;
		3763
		3764	0
		3765	}
		3766
3001	sub _draw {	3767	sub _draw {
3002	my ($self) = @_;	3768	my ($self) = @_;
3003		3769
3004	return unless $::CONN;	3770	$self->SUPER::_draw;
3005		3771
3006	my $face;	3772	if (my $tex = $self->{tex}) {
3007
3008	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011	$face = $anim->[ $self->{frame} % @$anim ]
3012	if $anim && @$anim;
3013	}
3014
3015	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3016
3017	if ($tex) {
3018	glEnable GL_TEXTURE_2D;	3773	glEnable GL_TEXTURE_2D;
3019	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3774	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020	glColor 0, 0, 0, 1;	3775	glColor 0, 0, 0, 1;
3021	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3776	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022	glDisable GL_TEXTURE_2D;	3777	glDisable GL_TEXTURE_2D;
…		…
3024	}	3779	}
3025		3780
3026	sub destroy {	3781	sub destroy {
3027	my ($self) = @_;	3782	my ($self) = @_;
3028		3783
3029	$self->{timer}->cancel	3784	(delete $self->{timer})->cancel
3030	if $self->{timer};	3785	if $self->{timer};
3031		3786
3032	$self->SUPER::destroy;	3787	$self->SUPER::destroy;
3033	}	3788	}
3034		3789
3035	#############################################################################	3790	#############################################################################
3036		3791
3037	package CFClient::UI::Buttonbar;	3792	package CFPlus::UI::Buttonbar;
3038		3793
3039	our @ISA = CFClient::UI::HBox::;	3794	our @ISA = CFPlus::UI::HBox::;
3040		3795
3041	# TODO: should actualyl wrap buttons and other goodies.	3796	# TODO: should actually wrap buttons and other goodies.
3042		3797
3043	#############################################################################	3798	#############################################################################
3044		3799
3045	package CFClient::UI::Menu;	3800	package CFPlus::UI::Menu;
3046		3801
3047	our @ISA = CFClient::UI::FancyFrame::;	3802	our @ISA = CFPlus::UI::Toplevel::;
3048		3803
3049	use CFClient::OpenGL;	3804	use CFPlus::OpenGL;
3050		3805
3051	sub new {	3806	sub new {
3052	my $class = shift;	3807	my $class = shift;
3053		3808
3054	my $self = $class->SUPER::new (	3809	my $self = $class->SUPER::new (
3055	items => [],	3810	items => [],
3056	z => 100,	3811	z => 100,
3057	@_,	3812	@_,
3058	);	3813	);
3059		3814
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3815	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3816
3062	for my $item (@{ $self->{items} }) {	3817	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3818	my ($widget, $cb, $tooltip) = @$item;
3064		3819
3065	# handle various types of items, only text for now	3820	# handle various types of items, only text for now
3066	if (!ref $widget) {	3821	if (!ref $widget) {
		3822	if ($widget =~ /\t/) {
		3823	my ($left, $right) = split /\t/, $widget, 2;
		3824
3067	$widget = new CFClient::UI::Label	3825	$widget = new CFPlus::UI::HBox
3068	can_hover => 1,	3826	can_hover => 1,
3069	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,
3070	markup => $widget,	3839	markup => $widget,
3071	tooltip => $tooltip	3840	tooltip => $tooltip;
		3841	}
3072	}	3842	}
3073		3843
3074	$self->{item}{$widget} = $item;	3844	$self->{item}{$widget} = $item;
3075		3845
3076	$self->{vbox}->add ($widget);	3846	$self->{vbox}->add ($widget);
…		…
3119	1	3889	1
3120	}	3890	}
3121		3891
3122	#############################################################################	3892	#############################################################################
3123		3893
3124	package CFClient::UI::Multiplexer;	3894	package CFPlus::UI::Multiplexer;
3125		3895
3126	our @ISA = CFClient::UI::Container::;	3896	our @ISA = CFPlus::UI::Container::;
3127		3897
3128	sub new {	3898	sub new {
3129	my $class = shift;	3899	my $class = shift;
3130		3900
3131	my $self = $class->SUPER::new (	3901	my $self = $class->SUPER::new (
…		…
3145		3915
3146	$self->{current} = $self->{children}[0]	3916	$self->{current} = $self->{children}[0]
3147	if @{ $self->{children} };	3917	if @{ $self->{children} };
3148	}	3918	}
3149		3919
		3920	sub get_current_page {
		3921	my ($self) = @_;
		3922
		3923	$self->{current}
		3924	}
		3925
3150	sub set_current_page {	3926	sub set_current_page {
3151	my ($self, $page_or_widget) = @_;	3927	my ($self, $page_or_widget) = @_;
3152		3928
3153	my $widget = ref $page_or_widget	3929	my $widget = ref $page_or_widget
3154	? $page_or_widget	3930	? $page_or_widget
…		…
3186	$self->{current}->draw;	3962	$self->{current}->draw;
3187	}	3963	}
3188		3964
3189	#############################################################################	3965	#############################################################################
3190		3966
3191	package CFClient::UI::Notebook;	3967	package CFPlus::UI::Notebook;
3192		3968
		3969	use CFPlus::OpenGL;
		3970
3193	our @ISA = CFClient::UI::VBox::;	3971	our @ISA = CFPlus::UI::VBox::;
3194		3972
3195	sub new {	3973	sub new {
3196	my $class = shift;	3974	my $class = shift;
3197		3975
3198	my $self = $class->SUPER::new (	3976	my $self = $class->SUPER::new (
3199	buttonbar => (new CFClient::UI::Buttonbar),	3977	buttonbar => (new CFPlus::UI::Buttonbar),
3200	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3978	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3979	active_outline => [.7, .7, 0.2],
3201	# filter => # will be put between multiplexer and $self	3980	# filter => # will be put between multiplexer and $self
3202	@_,	3981	@_,
3203	);	3982	);
3204		3983
3205	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3984	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3985	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207		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
3208	$self	4021	$self
3209	}	4022	}
3210		4023
3211	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 {
3212	my ($self, $title, $widget, $tooltip) = @_;	4042	my ($self, $title, $widget, $tooltip) = @_;
3213		4043
3214	Scalar::Util::weaken $self;	4044	$title = [$title, $tooltip] unless ref $title;
		4045	$widget->{c_tab} = $title;
3215		4046
3216	$self->{buttonbar}->add (new CFClient::UI::Button
3217	markup => $title,
3218	tooltip => $tooltip,
3219	on_activate => sub { $self->set_current_page ($widget) },
3220	);
3221
3222	$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
3223	}	4054	}
3224		4055
3225	sub set_current_page {	4056	sub set_current_page {
3226	my ($self, $page) = @_;	4057	my ($self, $page) = @_;
3227		4058
3228	$self->{multiplexer}->set_current_page ($page);	4059	$self->{multiplexer}->set_current_page ($page);
3229	$self->emit (page_changed => $self->{multiplexer}{current});	4060	$self->emit (page_changed => $self->{multiplexer}{current});
3230	}	4061	}
3231		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
3232	#############################################################################	4083	#############################################################################
3233		4084
3234	package CFClient::UI::Combobox;	4085	package CFPlus::UI::Selector;
3235		4086
3236	use utf8;	4087	use utf8;
3237		4088
3238	our @ISA = CFClient::UI::Button::;	4089	our @ISA = CFPlus::UI::Button::;
3239		4090
3240	sub new {	4091	sub new {
3241	my $class = shift;	4092	my $class = shift;
3242		4093
3243	my $self = $class->SUPER::new (	4094	my $self = $class->SUPER::new (
…		…
3260	my ($value, $title, $tooltip) = @$_;	4111	my ($value, $title, $tooltip) = @$_;
3261		4112
3262	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4113	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263	}	4114	}
3264		4115
3265	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4116	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266	}	4117	}
3267		4118
3268	sub _set_value {	4119	sub _set_value {
3269	my ($self, $value) = @_;	4120	my ($self, $value) = @_;
3270		4121
3271	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4122	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4123	$item ||= $self->{options}[0]
3272	or return;	4124	or return;
3273		4125
3274	$self->{value} = $item->[0];	4126	$self->{value} = $item->[0];
3275	$self->set_markup ("$item->[1] ⇓");	4127	$self->set_markup ("$item->[1] ⇓");
3276	$self->set_tooltip ($item->[2]);	4128	# $self->set_tooltip ($item->[2]);
3277	}	4129	}
3278		4130
3279	sub set_value {	4131	sub set_value {
3280	my ($self, $value) = @_;	4132	my ($self, $value) = @_;
3281		4133
…		…
3283		4135
3284	$self->_set_value ($value);	4136	$self->_set_value ($value);
3285	$self->emit (changed => $value);	4137	$self->emit (changed => $value);
3286	}	4138	}
3287		4139
		4140	sub set_options {
		4141	my ($self, $options) = @_;
		4142
		4143	$self->{options} = $options;
		4144	$self->_set_value ($self->{value});
		4145	}
		4146
3288	#############################################################################	4147	#############################################################################
3289		4148
3290	package CFClient::UI::Statusbox;	4149	package CFPlus::UI::Statusbox;
3291		4150
3292	our @ISA = CFClient::UI::VBox::;	4151	our @ISA = CFPlus::UI::VBox::;
3293		4152
3294	sub new {	4153	sub new {
3295	my $class = shift;	4154	my $class = shift;
3296		4155
3297	my $self = $class->SUPER::new (	4156	my $self = $class->SUPER::new (
3298	fontsize => 0.8,	4157	fontsize => 0.8,
3299	@_,	4158	@_,
3300	);	4159	);
3301		4160
3302	Scalar::Util::weaken (my $this = $self);	4161	CFPlus::weaken (my $this = $self);
3303		4162
3304	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4163	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3305		4164
3306	$self	4165	$self
3307	}	4166	}
3308		4167
3309	sub reorder {	4168	sub reorder {
3310	my ($self) = @_;	4169	my ($self) = @_;
3311	my $NOW = Time::HiRes::time;	4170	my $NOW = Time::HiRes::time;
3312		4171
3313	# freeze display when hovering over any label	4172	# freeze display when hovering over any label
3314	return if $CFClient::UI::TOOLTIP->{owner}	4173	return if $CFPlus::UI::TOOLTIP->{owner}
3315	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4174	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316	values %{ $self->{item} };	4175	values %{ $self->{item} };
3317		4176
3318	while (my ($k, $v) = each %{ $self->{item} }) {	4177	while (my ($k, $v) = each %{ $self->{item} }) {
3319	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4178	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320	}	4179	}
…		…
3323		4182
3324	my @items = sort {	4183	my @items = sort {
3325	$a->{pri} <=> $b->{pri}	4184	$a->{pri} <=> $b->{pri}
3326	or $b->{id} <=> $a->{id}	4185	or $b->{id} <=> $a->{id}
3327	} values %{ $self->{item} };	4186	} values %{ $self->{item} };
3328
3329	$self->{timer}->interval (1);
3330		4187
3331	my $count = 10 + 1;	4188	my $count = 10 + 1;
3332	for my $item (@items) {	4189	for my $item (@items) {
3333	last unless --$count;	4190	last unless --$count;
3334		4191
…		…
3341	for ($short) {	4198	for ($short) {
3342	s/^\s+//;	4199	s/^\s+//;
3343	s/\s+/ /g;	4200	s/\s+/ /g;
3344	}	4201	}
3345		4202
3346	new CFClient::UI::Label	4203	new CFPlus::UI::Label
3347	markup => $short,	4204	markup => $short,
3348	tooltip => $item->{tooltip},	4205	tooltip => $item->{tooltip},
3349	tooltip_font => $::FONT_PROP,	4206	tooltip_font => $::FONT_PROP,
3350	tooltip_width => 0.67,	4207	tooltip_width => 0.67,
3351	fontsize => $item->{fontsize} || $self->{fontsize},	4208	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3358	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4215	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4216	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360	$label->update;	4217	$label->update;
3361	$label->set_max_size (undef, $label->{req_h} * $diff)	4218	$label->set_max_size (undef, $label->{req_h} * $diff)
3362	if $diff < 1;	4219	if $diff < 1;
3363	$self->{timer}->interval (1/30);	4220	$self->{timer}->set (1/30, 1/30);
3364	} else {	4221	} else {
3365	$label->{fg}[3] = $item->{fg}[3] || 1;	4222	$label->{fg}[3] = $item->{fg}[3] || 1;
3366	}	4223	}
3367		4224
3368	push @widgets, $label;	4225	push @widgets, $label;
…		…
3405	count => 1,	4262	count => 1,
3406	%arg,	4263	%arg,
3407	};	4264	};
3408	}	4265	}
3409		4266
		4267	$ROOT->on_refresh (reorder => sub {
3410	$self->reorder;	4268	$self->reorder;
		4269	});
3411	}	4270	}
3412		4271
3413	sub reconfigure {	4272	sub reconfigure {
3414	my ($self) = @_;	4273	my ($self) = @_;
3415		4274
…		…
3428	$self->SUPER::destroy;	4287	$self->SUPER::destroy;
3429	}	4288	}
3430		4289
3431	#############################################################################	4290	#############################################################################
3432		4291
3433	package CFClient::UI::Inventory;
3434
3435	our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437	sub new {
3438	my $class = shift;
3439
3440	my $self = $class->SUPER::new (
3441	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442	@_,
3443	);
3444
3445	$self
3446	}
3447
3448	sub set_items {
3449	my ($self, $items) = @_;
3450
3451	$self->{child}->clear;
3452	return unless $items;
3453
3454	my @items = sort {
3455	($a->{type} <=> $b->{type})
3456	or ($a->{name} cmp $b->{name})
3457	} @$items;
3458
3459	$self->{real_items} = \@items;
3460
3461	my $row = 0;
3462	for my $item (@items) {
3463	CFClient::Item::update_widgets $item;
3464
3465	$self->{child}->add (0, $row, $item->{face_widget});
3466	$self->{child}->add (1, $row, $item->{desc_widget});
3467	$self->{child}->add (2, $row, $item->{weight_widget});
3468
3469	$row++;
3470	}
3471	}
3472
3473	#############################################################################
3474
3475	package CFClient::UI::BindEditor;
3476
3477	our @ISA = CFClient::UI::FancyFrame::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484	$self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488	text => "start recording",
3489	tooltip => "Start/Stops recording of actions."
3490	."All subsequent actions after the recording started will be captured."
3491	."The actions are displayed after the record was stopped."
3492	."To bind the action you have to click on the 'Bind' button",
3493	on_activate => sub {
3494	unless ($self->{recording}) {
3495	$self->start;
3496	} else {
3497	$self->stop;
3498	}
3499	});
3500
3501	$vb->add (new CFClient::UI::Label text => "Actions:");
3502	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3505	$vb->add (my $hb = new CFClient::UI::HBox);
3506	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507	$hb->add (new CFClient::UI::Button
3508	text => "bind",
3509	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510	on_activate => sub {
3511	$self->ask_for_bind;
3512	});
3513
3514	$vb->add (my $hb = new CFClient::UI::HBox);
3515	$hb->add (new CFClient::UI::Button
3516	text => "ok",
3517	expand => 1,
3518	tooltip => "This closes the binding editor and saves the binding",
3519	on_activate => sub {
3520	$self->hide;
3521	$self->commit;
3522	});
3523
3524	$hb->add (new CFClient::UI::Button
3525	text => "cancel",
3526	expand => 1,
3527	tooltip => "This closes the binding editor without saving",
3528	on_activate => sub {
3529	$self->hide;
3530	$self->{binding_cancel}->()
3531	if $self->{binding_cancel};
3532	});
3533
3534	$self->update_binding_widgets;
3535
3536	$self
3537	}
3538
3539	sub cfg_bind {
3540	my ($self, $mod, $sym, $cmds) = @_;
3541	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542	::update_bindings ();
3543	}
3544
3545	sub cfg_unbind {
3546	my ($self, $mod, $sym, $cmds) = @_;
3547	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548	::update_bindings ();
3549	}
3550
3551	sub commit {
3552	my ($self) = @_;
3553	my ($mod, $sym, $cmds) = $self->get_binding;
3554	if ($sym != 0 && @$cmds > 0) {
3555	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556	."'. Don't forget 'Save Config'!");
3557	$self->{binding_change}->($mod, $sym, $cmds)
3558	if $self->{binding_change};
3559	} else {
3560	$::STATUSBOX->add ("No action bound, no key or action specified!");
3561	$self->{binding_cancel}->()
3562	if $self->{binding_cancel};
3563	}
3564	}
3565
3566	sub start {
3567	my ($self) = @_;
3568
3569	$self->{rec_btn}->set_text ("stop recording");
3570	$self->{recording} = 1;
3571	$self->clear_command_list;
3572	$::CONN->start_record if $::CONN;
3573	}
3574
3575	sub stop {
3576	my ($self) = @_;
3577
3578	$self->{rec_btn}->set_text ("start recording");
3579	$self->{recording} = 0;
3580
3581	my $rec;
3582	$rec = $::CONN->stop_record if $::CONN;
3583	return unless ref $rec eq 'ARRAY';
3584	$self->set_command_list ($rec);
3585	}
3586
3587
3588	sub ask_for_bind_and_commit {
3589	my ($self) = @_;
3590	$self->ask_for_bind (1);
3591	}
3592
3593	sub ask_for_bind {
3594	my ($self, $commit, $end_cb) = @_;
3595
3596	CFClient::Binder::open_binding_dialog (sub {
3597	my ($mod, $sym) = @_;
3598	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599	$self->update_binding_widgets;
3600	$self->commit if $commit;
3601	$end_cb->() if $end_cb;
3602	});
3603	}
3604
3605	# $mod and $sym are the modifiers and key symbol
3606	# $cmds is a array ref of strings (the commands)
3607	# $cb is the callback that is executed on OK
3608	# $ccb is the callback that is executed on CANCEL and
3609	# when the binding was unsuccessful on OK
3610	sub set_binding {
3611	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613	$self->clear_command_list;
3614	$self->{recording} = 0;
3615	$self->{rec_btn}->set_text ("start recording");
3616
3617	$self->{binding} = [$mod, $sym];
3618	$self->{commands} = $cmds;
3619
3620	$self->{binding_change} = $cb;
3621	$self->{binding_cancel} = $ccb;
3622
3623	$self->update_binding_widgets;
3624	}
3625
3626	# this is a shortcut method that asks for a binding
3627	# and then just binds it.
3628	sub do_quick_binding {
3629	my ($self, $cmds, $end_cb) = @_;
3630	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631	$self->ask_for_bind (1, $end_cb);
3632	}
3633
3634	sub update_binding_widgets {
3635	my ($self) = @_;
3636	my ($mod, $sym, $cmds) = $self->get_binding;
3637	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638	$self->set_command_list ($cmds);
3639	}
3640
3641	sub get_binding {
3642	my ($self) = @_;
3643	return (
3644	$self->{binding}->[0],
3645	$self->{binding}->[1],
3646	[ grep { defined $_ } @{$self->{commands}} ]
3647	);
3648	}
3649
3650	sub clear_command_list {
3651	my ($self) = @_;
3652	$self->{cmdbox}->clear ();
3653	}
3654
3655	sub set_command_list {
3656	my ($self, $cmds) = @_;
3657
3658	$self->{cmdbox}->clear ();
3659	$self->{commands} = $cmds;
3660
3661	my $idx = 0;
3662
3663	for (@$cmds) {
3664	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666	my $i = $idx;
3667	$hb->add (new CFClient::UI::Label text => $_);
3668	$hb->add (new CFClient::UI::Button
3669	text => "delete",
3670	tooltip => "Deletes the action from the record",
3671	on_activate => sub {
3672	$self->{cmdbox}->remove ($hb);
3673	$cmds->[$i] = undef;
3674	});
3675
3676
3677	$idx++
3678	}
3679	}
3680
3681	#############################################################################
3682
3683	package CFClient::UI::SpellList;
3684
3685	our @ISA = CFClient::UI::Table::;
3686
3687	sub new {
3688	my $class = shift;
3689
3690	my $self = $class->SUPER::new (
3691	binding => [],
3692	commands => [],
3693	@_,
3694	)
3695	}
3696
3697	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710	sub rebuild_spell_list {
3711	my ($self) = @_;
3712
3713	$CFClient::UI::ROOT->on_refresh ($self => sub {
3714	$self->clear;
3715
3716	return unless $::CONN;
3717
3718	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724	my $row = 0;
3725
3726	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727	my $spell = $self->{spell}{$_};
3728
3729	$row++;
3730
3731	my $spell_cb = sub {
3732	my ($widget, $ev) = @_;
3733
3734	if ($ev->{button} == 1) {
3735	$::CONN->user_send ("cast $spell->{name}");
3736	} elsif ($ev->{button} == 2) {
3737	$::CONN->user_send ("invoke $spell->{name}");
3738	} elsif ($ev->{button} == 3) {
3739	(new CFClient::UI::Menu
3740	items => [
3741	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743	],
3744	)->popup ($ev);
3745	} else {
3746	return 0;
3747	}
3748
3749	1
3750	};
3751
3752	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754	#TODO: add path info to tooltip
3755	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757	$self->add (0, $row, new CFClient::UI::Face
3758	face => $spell->{face},
3759	can_hover => 1,
3760	can_events => 1,
3761	tooltip => $tooltip,
3762	on_button_down => $spell_cb,
3763	);
3764
3765	$self->add (1, $row, new CFClient::UI::Label
3766	expand => 1,
3767	text => $spell->{name},
3768	can_hover => 1,
3769	can_events => 1,
3770	tooltip => $tooltip,
3771	on_button_down => $spell_cb,
3772	);
3773
3774	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778	}
3779	});
3780	}
3781
3782	sub add_spell {
3783	my ($self, $spell) = @_;
3784
3785	$self->{spell}->{$spell->{name}} = $spell;
3786	$self->rebuild_spell_list;
3787	}
3788
3789	sub remove_spell {
3790	my ($self, $spell) = @_;
3791
3792	delete $self->{spell}->{$spell->{name}};
3793	$self->rebuild_spell_list;
3794	}
3795
3796	sub clear_spells {
3797	my ($self) = @_;
3798
3799	$self->{spell} = {};
3800	$self->rebuild_spell_list;
3801	}
3802
3803	#############################################################################
3804
3805	package CFClient::UI::Root;	4292	package CFPlus::UI::Root;
3806		4293
3807	our @ISA = CFClient::UI::Container::;	4294	our @ISA = CFPlus::UI::Container::;
3808		4295
3809	use List::Util qw(min max);	4296	use List::Util qw(min max);
3810		4297
3811	use CFClient::OpenGL;	4298	use CFPlus::OpenGL;
3812		4299
3813	sub new {	4300	sub new {
3814	my $class = shift;	4301	my $class = shift;
3815		4302
3816	my $self = $class->SUPER::new (	4303	my $self = $class->SUPER::new (
3817	visible => 1,	4304	visible => 1,
3818	@_,	4305	@_,
3819	);	4306	);
3820		4307
3821	Scalar::Util::weaken ($self->{root} = $self);	4308	CFPlus::weaken ($self->{root} = $self);
3822		4309
3823	$self	4310	$self
3824	}	4311	}
3825		4312
3826	sub size_request {	4313	sub size_request {
…		…
3874	}	4361	}
3875		4362
3876	sub update {	4363	sub update {
3877	my ($self) = @_;	4364	my ($self) = @_;
3878		4365
3879	$::WANT_REFRESH++;	4366	$::WANT_REFRESH->start;
3880	}	4367	}
3881		4368
3882	sub add {	4369	sub add {
3883	my ($self, @children) = @_;	4370	my ($self, @children) = @_;
3884		4371
…		…
3921	while ($self->{refresh_hook}) {	4408	while ($self->{refresh_hook}) {
3922	$_->()	4409	$_->()
3923	for values %{delete $self->{refresh_hook}};	4410	for values %{delete $self->{refresh_hook}};
3924	}	4411	}
3925		4412
3926	if ($self->{realloc}) {	4413	while ($self->{realloc}) {
3927	my %queue;	4414	my %queue;
3928	my @queue;	4415	my @queue;
3929	my $widget;	4416	my $widget;
3930		4417
3931	outer:	4418	outer:
…		…
3978	}	4465	}
3979	}	4466	}
3980		4467
3981	delete $self->{realloc}{$widget+0};	4468	delete $self->{realloc}{$widget+0};
3982	}	4469	}
3983	}
3984		4470
3985	while (my $size_alloc = delete $self->{size_alloc}) {	4471	while (my $size_alloc = delete $self->{size_alloc}) {
3986	my @queue = sort { $b->{visible} <=> $a->{visible} }	4472	my @queue = sort { $a->{visible} <=> $b->{visible} }
3987	values %$size_alloc;	4473	values %$size_alloc;
3988		4474
3989	while () {	4475	while () {
3990	my $widget = pop @queue || last;	4476	my $widget = pop @queue || last;
3991		4477
3992	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4478	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993		4479
3994	$w = 0 if $w < 0;	4480	$w = max $widget->{min_w}, $w;
3995	$h = 0 if $h < 0;	4481	$h = max $widget->{min_h}, $h;
3996		4482
		4483	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4484	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4485
		4486	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4487	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4488
3997	$w = int $w + 0.5;	4489	$w = int $w + 0.5;
3998	$h = int $h + 0.5;	4490	$h = int $h + 0.5;
3999		4491
4000	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4492	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001	$widget->{old_w} = $widget->{w};	4493	$widget->{old_w} = $widget->{w};
4002	$widget->{old_h} = $widget->{h};	4494	$widget->{old_h} = $widget->{h};
4003		4495
4004	$widget->{w} = $w;	4496	$widget->{w} = $w;
4005	$widget->{h} = $h;	4497	$widget->{h} = $h;
4006		4498
4007	$widget->emit (size_allocate => $w, $h);	4499	$widget->emit (size_allocate => $w, $h);
		4500	}
4008	}	4501	}
4009	}	4502	}
4010	}	4503	}
4011		4504
4012	while ($self->{post_alloc_hook}) {	4505	while ($self->{post_alloc_hook}) {
4013	$_->()	4506	$_->()
4014	for values %{delete $self->{post_alloc_hook}};	4507	for values %{delete $self->{post_alloc_hook}};
4015	}	4508	}
4016
4017		4509
4018	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4510	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4019	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4511	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4020	glClear GL_COLOR_BUFFER_BIT;	4512	glClear GL_COLOR_BUFFER_BIT;
4021		4513
…		…
4024	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4516	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025	glMatrixMode GL_MODELVIEW;	4517	glMatrixMode GL_MODELVIEW;
4026	glLoadIdentity;	4518	glLoadIdentity;
4027		4519
4028	{	4520	{
4029	package CFClient::UI::Base;	4521	package CFPlus::UI::Base;
4030		4522
4031	($draw_x, $draw_y, $draw_w, $draw_h) =	4523	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032	(0, 0, $self->{w}, $self->{h});	4524	(0, 0, $self->{w}, $self->{h});
4033	}
4034		4525
4035	$self->_draw;	4526	$self->_draw;
		4527	}
4036	}	4528	}
4037		4529
4038	#############################################################################	4530	#############################################################################
4039		4531
4040	package CFClient::UI;	4532	package CFPlus::UI;
4041		4533
4042	$ROOT = new CFClient::UI::Root;	4534	$ROOT = new CFPlus::UI::Root;
4043	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4535	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044		4536
4045	1	4537	1
4046		4538

Diff Legend

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