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

Diff Legend

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