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

Diff Legend

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