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

Diff Legend

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