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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 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) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$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;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$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};	252	$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};	253	$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};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
335	sub size_request {	365	sub size_request {
336	require Carp;	366	require Carp;
337	Carp::confess "size_request is abstract";	367	Carp::confess "size_request is abstract";
338	}	368	}
339		369
		370	sub baseline_shift {
		371	0
		372	}
		373
340	sub configure {	374	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
342		376
343	if ($self->{aspect}) {	377	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
345		379
346	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		382
349	# use alignment to adjust x, y	383	# use alignment to adjust x, y
350		384
351	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
393		427
394	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
395		429
396	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
397		431
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	435	}
402	}	436	}
403		437
404	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
405	sub coord2local {	439	sub coord2local {
406	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
407		441
		442	Carp::confess unless $self->{parent};#d#
		443
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	445	}
410		446
411	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
412	sub coord2global {	448	sub coord2global {
413	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
414		450
		451	Carp::confess unless $self->{parent};#d#
		452
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	454	}
417		455
418	sub invoke_focus_in {	456	sub invoke_focus_in {
419	my ($self) = @_;	457	my ($self) = @_;
420		458
421	return if $FOCUS == $self;	459	return if $FOCUS == $self;
422	return unless $self->{can_focus};	460	return unless $self->{can_focus};
423		461
424	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
425		463
426	$focus->update if $focus;	464	$self->update;
427	$FOCUS->update;
428		465
429	0	466	0
430	}	467	}
431		468
432	sub invoke_focus_out {	469	sub invoke_focus_out {
433	my ($self) = @_;	470	my ($self) = @_;
434		471
435	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
436		473
437	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
438		475
439	$focus->update if $focus; #?	476	$self->update;
440		477
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	479	unless $FOCUS;
443		480
444	0	481	0
445	}	482	}
446		483
447	sub grab_focus {	484	sub grab_focus {
448	my ($self) = @_;	485	my ($self) = @_;
449		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	488	$self->emit ("focus_in");
451	}	489	}
452		490
453	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
457		496
458	sub invoke_button_down {	497	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
460		499
461	$self->grab_focus;	500	$self->grab_focus;
462		501
463	1	502	0
464	}	503	}
465		504
466	sub connect {	505	sub connect {
467	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
468		507
469	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
470	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
471		528
472	sub emit {	529	sub emit {
473	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
474		531
475	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	550	}
480		551
481	sub find_widget {	552	sub find_widget {
482	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
483		554
…		…
491	}	562	}
492		563
493	sub set_parent {	564	sub set_parent {
494	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
495		566
496	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
498	}	569	}
499		570
500	sub realloc {	571	sub realloc {
501	my ($self) = @_;	572	my ($self) = @_;
…		…
535	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
536		607
537	# update screen rectangle	608	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};	609	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};	610	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542		611
543	# skip widgets that are entirely outside the drawing area	612	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546		615
…		…
569	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
572	glEnd;	641	glEnd;
573	glPopMatrix;	642	glPopMatrix;
574	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575	}	644	}
576		645
577	$self->_draw;	646	$self->_draw;
578	glPopMatrix;	647	glPopMatrix;
579	}	648	}
…		…
582	my ($self) = @_;	651	my ($self) = @_;
583		652
584	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
585	}	654	}
586		655
		656	my $cntx;#d#
587	sub DESTROY {	657	sub DESTROY {
588	my ($self) = @_;	658	my ($self) = @_;
589		659
590	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
591		661
592	eval { $self->destroy };	662	eval { $self->destroy };
593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
594	}	666	}
595		667
596	#############################################################################	668	#############################################################################
597		669
598	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
599		671
600	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
601		673
602	use strict;	674	use strict;
603	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
604		676
605	sub new {	677	sub new {
606	my $class = shift;	678	my $class = shift;
607		679
608	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
639	}	711	}
640	}	712	}
641		713
642	#############################################################################	714	#############################################################################
643		715
644	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
645		717
646	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
647		719
648	sub new {	720	sub new {
649	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
651	}	723	}
…		…
658		730
659	sub draw { }	731	sub draw { }
660		732
661	#############################################################################	733	#############################################################################
662		734
663	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
664		736
665	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
666		738
667	sub new {	739	sub new {
668	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
669		741
670	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
679	if $children;	751	if $children;
680		752
681	$self	753	$self
682	}	754	}
683		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
684	sub add {	764	sub add {
685	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
686		766
687	$_->set_parent ($self)	767	$_->set_parent ($self)
688	for @widgets;	768	for @widgets;
…		…
748	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
749	}	829	}
750		830
751	#############################################################################	831	#############################################################################
752		832
753	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
754		834
755	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
756		836
757	sub new {	837	sub new {
758	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
759		839
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		841
762	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
763	}	843	}
764		844
765	sub add {	845	sub add {
…		…
772	sub remove {	852	sub remove {
773	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
774		854
775	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
776		856
777	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	858	unless @{$self->{children}};
779	}	859	}
780		860
781	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
782		862
…		…
794		874
795	#############################################################################	875	#############################################################################
796		876
797	# back-buffered drawing area	877	# back-buffered drawing area
798		878
799	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
800		880
801	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
802		882
803	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
804		884
805	sub new {	885	sub new {
806	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
807		887
808	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
830	}	910	}
831		911
832	sub render_child {	912	sub render_child {
833	my ($self) = @_;	913	my ($self) = @_;
834		914
835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
838		918
839	{	919	{
840	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
841		921
842	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
844	}	926	}
845
846	$self->_render;
847	};	927	};
848	}	928	}
849		929
850	sub _draw {	930	sub _draw {
851	my ($self) = @_;	931	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		932
855	my $tex = $self->{texture}	933	my $tex = $self->{texture}
856	or return;	934	or return;
857		935
858	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
861		939
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
863		941
864	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
865	}	943	}
866		944
867	#############################################################################	945	#############################################################################
868		946
869	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
870		948
871	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
872		950
873	sub new {	951	sub new {
874	my $class = shift;	952	my $class = shift;
875		953
876	$class->SUPER::new (	954	$class->SUPER::new (
…		…
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1016	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1018	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1020	}
943	}	1021	}
944		1022
945	sub _render {	1023	sub _render {
946	my ($self) = @_;	1024	my ($self) = @_;
947		1025
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1028
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1030
953	$self->SUPER::_render;	1031	$self->SUPER::_render;
954	}	1032	}
955		1033
956	#############################################################################	1034	#############################################################################
957		1035
958	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
959		1037
960	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
961		1039
962	sub new {	1040	sub new {
963	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
964		1042
965	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
966		1044
967	my $self;	1045	my $self;
968		1046
969	my $slider = new CFClient::UI::Slider	1047	my $hslider = new CFPlus::UI::Slider
		1048	vertical => 0,
		1049	range => [0, 0, 1, 0.01], # HACK fix
		1050	on_changed => sub {
		1051	$self->{hpos} = $_[1];
		1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1053	},
		1054	;
		1055
		1056	my $vslider = new CFPlus::UI::Slider
970	vertical => 1,	1057	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1059	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1062	},
975	;	1063	;
976		1064
977	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1066	vp => (new CFPlus::UI::ViewPort expand => 1),
		1067	can_events => 1,
979	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
980	%arg,	1072	%arg,
981	);	1073	);
982		1074
		1075	$self->SUPER::add (0, 0, $self->{vp});
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
984	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
985		1080
986	$self	1081	$self
987	}	1082	}
		1083
		1084	#TODO# update range on size_allocate depending on child
988		1085
989	sub add {	1086	sub add {
990	my ($self, $widget) = @_;	1087	my ($self, $widget) = @_;
991		1088
992	$self->{vp}->add ($self->{child} = $widget);	1089	$self->{vp}->add ($self->{child} = $widget);
993	}	1090	}
994		1091
		1092	sub invoke_mouse_wheel {
		1093	my ($self, $ev) = @_;
		1094
		1095	return 0 unless $ev->{dy}; # only vertical movements
		1096
		1097	$self->{vslider}->emit (mouse_wheel => $ev);
		1098
		1099	1
		1100	}
		1101
		1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
		1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107	#$self->{hslider}->set_visibility ($w1 != $w2);
		1108
		1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
		1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1111	#$self->{vslider}->set_visibility ($h1 != $h2);
		1112	}
		1113
995	sub update {	1114	sub update {
996	my ($self) = @_;	1115	my ($self) = @_;
997		1116
998	$self->SUPER::update;	1117	$self->SUPER::update;
999		1118	$self->update_slider;
1000	# todo: overwrite size_allocate of child
1001	my $child = $self->{vp}->child;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003	}	1119	}
1004		1120
1005	sub invoke_size_allocate {	1121	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
1007		1123
1008	my $child = $self->{vp}->child;	1124	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1125	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1126	}
1013		1127
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1128	#############################################################################
1018		1129
1019	package CFClient::UI::Frame;	1130	package CFPlus::UI::Frame;
1020		1131
1021	our @ISA = CFClient::UI::Bin::;	1132	our @ISA = CFPlus::UI::Bin::;
1022		1133
1023	use CFClient::OpenGL;	1134	use CFPlus::OpenGL;
1024		1135
1025	sub new {	1136	sub new {
1026	my $class = shift;	1137	my $class = shift;
1027		1138
1028	$class->SUPER::new (	1139	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1165	$self->SUPER::_draw;
1055	}	1166	}
1056		1167
1057	#############################################################################	1168	#############################################################################
1058		1169
1059	package CFClient::UI::FancyFrame;	1170	package CFPlus::UI::FancyFrame;
1060		1171
1061	our @ISA = CFClient::UI::Bin::;	1172	our @ISA = CFPlus::UI::Bin::;
1062		1173
1063	use CFClient::OpenGL;	1174	use CFPlus::OpenGL;
		1175
		1176	sub new {
		1177	my ($class, %arg) = @_;
		1178
		1179	if ((exists $arg{label}) && !ref $arg{label}) {
		1180	$arg{label} = new CFPlus::UI::Label
		1181	align => 1,
		1182	valign => 0,
		1183	text => $arg{label},
		1184	fontsize => ($arg{border} || 0.8) * 0.75;
		1185	}
		1186
		1187	my $self = $class->SUPER::new (
		1188	# label => "",
		1189	fg => [0.6, 0.3, 0.1],
		1190	border => 0.8,
		1191	style => 'single',
		1192	%arg,
		1193	);
		1194
		1195	$self
		1196	}
		1197
		1198	sub add {
		1199	my ($self, @widgets) = @_;
		1200
		1201	$self->SUPER::add (@widgets);
		1202	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1203	}
		1204
		1205	sub border {
		1206	int $_[0]{border} * $::FONTSIZE
		1207	}
		1208
		1209	sub size_request {
		1210	my ($self) = @_;
		1211
		1212	($self->{label_w}, undef) = $self->{label}->size_request
		1213	if $self->{label};
		1214
		1215	my ($w, $h) = $self->SUPER::size_request;
		1216
		1217	(
		1218	$w + $self->border * 2,
		1219	$h + $self->border * 2,
		1220	)
		1221	}
		1222
		1223	sub invoke_size_allocate {
		1224	my ($self, $w, $h) = @_;
		1225
		1226	my $border = $self->border;
		1227
		1228	$w -= List::Util::max 0, $border * 2;
		1229	$h -= List::Util::max 0, $border * 2;
		1230
		1231	if (my $label = $self->{label}) {
		1232	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1233	$label->{h} = List::Util::min $h, $border;
		1234	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1235	}
		1236
		1237	$self->child->configure ($border, $border, $w, $h);
		1238
		1239	1
		1240	}
		1241
		1242	sub _draw {
		1243	my ($self) = @_;
		1244
		1245	my $child = $self->{children}[0];
		1246
		1247	my $border = $self->border;
		1248	my ($w, $h) = ($self->{w}, $self->{h});
		1249
		1250	$child->draw;
		1251
		1252	glColor @{$self->{fg}};
		1253	glBegin GL_LINE_STRIP;
		1254	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1255	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1256	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1257	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1258	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1259	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1260	glEnd;
		1261
		1262	if ($self->{label}) {
		1263	glTranslate $border * 2, 0;
		1264	$self->{label}->_draw;
		1265	}
		1266	}
		1267
		1268	#############################################################################
		1269
		1270	package CFPlus::UI::Toplevel;
		1271
		1272	our @ISA = CFPlus::UI::Bin::;
		1273
		1274	use CFPlus::OpenGL;
1064		1275
1065	my $bg =	1276	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1277	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1278	mipmap => 1, wrap => 1;
1068		1279
1069	my @border =	1280	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1283
1073	sub new {	1284	sub new {
1074	my ($class, %arg) = @_;	1285	my ($class, %arg) = @_;
1075		1286
1076	my $self = $class->SUPER::new (	1287	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1288	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1289	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1290	border => 0.6,
1080	can_events => 1,	1291	can_events => 1,
1081	min_w => 16,	1292	min_w => 64,
1082	min_h => 16,	1293	min_h => 32,
1083	%arg,	1294	%arg,
1084	);	1295	);
1085		1296
1086	$self->{title_widget} = new CFClient::UI::Label	1297	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1298	align => 0,
1088	valign => 1,	1299	valign => 1,
1089	text => $self->{title},	1300	text => $self->{title},
1090	fontsize => $self->{border},	1301	fontsize => $self->{border},
1091	if exists $self->{title};	1302	if exists $self->{title};
1092		1303
1093	if ($self->{has_close_button}) {	1304	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1305	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1306	new CFPlus::UI::ImageButton
1096	path => 'x1_close.png',	1307	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1308	on_activate => sub { $self->emit ("delete") };
1098		1309
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1310	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1311	}
1101		1312
1102	$self	1313	$self
1103	}	1314	}
1104		1315
1105	sub add {	1316	sub add {
1106	my ($self, @widgets) = @_;	1317	my ($self, @widgets) = @_;
1107		1318
1108	$self->SUPER::add (@widgets);	1319	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1320	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1321	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1322	}
1112		1323
1113	sub border {	1324	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1325	int $_[0]{border} * $::FONTSIZE
1115	}	1326	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1359	$self->child->configure ($border, $border, $w, $h);
1149		1360
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1361	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1362	if $self->{close_button};
1152		1363
		1364	1
		1365	}
		1366
		1367	sub invoke_delete {
		1368	my ($self) = @_;
		1369
		1370	$self->hide;
		1371
1153	1	1372	1
1154	}	1373	}
1155		1374
1156	sub invoke_button_down {	1375	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1376	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1434	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1435
1217	! ! $self->{motion}	1436	! ! $self->{motion}
1218	}	1437	}
1219		1438
		1439	sub invoke_visibility_change {
		1440	my ($self, $visible) = @_;
		1441
		1442	delete $self->{motion} unless $visible;
		1443
		1444	0
		1445	}
		1446
1220	sub _draw {	1447	sub _draw {
1221	my ($self) = @_;	1448	my ($self) = @_;
1222		1449
1223	my $child = $self->{children}[0];	1450	my $child = $self->{children}[0];
1224		1451
…		…
1261	if $self->{close_button};	1488	if $self->{close_button};
1262	}	1489	}
1263		1490
1264	#############################################################################	1491	#############################################################################
1265		1492
1266	package CFClient::UI::Table;	1493	package CFPlus::UI::Table;
1267		1494
1268	our @ISA = CFClient::UI::Base::;	1495	our @ISA = CFPlus::UI::Base::;
1269		1496
1270	use List::Util qw(max sum);	1497	use List::Util qw(max sum);
1271		1498
1272	use CFClient::OpenGL;	1499	use CFPlus::OpenGL;
1273		1500
1274	sub new {	1501	sub new {
1275	my $class = shift;	1502	my $class = shift;
1276		1503
1277	$class->SUPER::new (	1504	$class->SUPER::new (
1278	col_expand => [],	1505	col_expand => [],
		1506	row_expand => [],
1279	@_,	1507	@_,
1280	)	1508	)
1281	}	1509	}
1282		1510
1283	sub children {	1511	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}	1513	}
1286		1514
1287	sub add {	1515	sub add {
1288	my ($self, $x, $y, $child) = @_;	1516	my ($self) = shift;
1289		1517
		1518	while (@_) {
		1519	my ($x, $y, $child) = splice @_, 0, 3, ();
1290	$child->set_parent ($self);	1520	$child->set_parent ($self);
1291	$self->{children}[$y][$x] = $child;	1521	$self->{children}[$y][$x] = $child;
		1522	}
1292		1523
		1524	$self->{force_realloc} = 1;
		1525	$self->{force_size_alloc} = 1;
1293	$self->realloc;	1526	$self->realloc;
1294	}	1527	}
1295		1528
1296	sub remove {	1529	sub remove {
1297	my ($self, $child) = @_;	1530	my ($self, $child) = @_;
…		…
1353	my ($ws, $hs) = $self->get_wh;	1586	my ($ws, $hs) = $self->get_wh;
1354		1587
1355	my $req_w = (sum @$ws) || 1;	1588	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1589	my $req_h = (sum @$hs) || 1;
1357		1590
1358	# TODO: nicer code && do row_expand	1591	# TODO: nicer code
1359	my @col_expand = @{$self->{col_expand}};	1592	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1593	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1594	my $col_expand = (sum @col_expand) || 1;
1362		1595
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1597
1367	CFClient::UI::harmonize $ws;	1598	CFPlus::UI::harmonize $ws;
		1599
		1600	my @row_expand = @{$self->{row_expand}};
		1601	@row_expand = (1) x @$ws unless @row_expand;
		1602	my $row_expand = (sum @row_expand) || 1;
		1603
		1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1605
1368	CFClient::UI::harmonize $hs;	1606	CFPlus::UI::harmonize $hs;
1369		1607
1370	my $y;	1608	my $y;
1371		1609
1372	for my $r (0 .. $#{$self->{children}}) {	1610	for my $r (0 .. $#{$self->{children}}) {
1373	my $row = $self->{children}[$r]	1611	my $row = $self->{children}[$r]
…		…
1416	}	1654	}
1417	}	1655	}
1418		1656
1419	#############################################################################	1657	#############################################################################
1420		1658
1421	package CFClient::UI::Box;	1659	package CFPlus::UI::Box;
1422		1660
1423	our @ISA = CFClient::UI::Container::;	1661	our @ISA = CFPlus::UI::Container::;
1424		1662
1425	sub size_request {	1663	sub size_request {
1426	my ($self) = @_;	1664	my ($self) = @_;
1427		1665
1428	$self->{vertical}	1666	$self->{vertical}
…		…
1461	$req[$_] += $space * $children[$_]{expand}	1699	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#children;	1700	for 0 .. $#children;
1463	}	1701	}
1464	}	1702	}
1465		1703
1466	CFClient::UI::harmonize \@req;	1704	CFPlus::UI::harmonize \@req;
1467		1705
1468	my $pos = 0;	1706	my $pos = 0;
1469	for (0 .. $#children) {	1707	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1708	my $alloc = $req[$_];
1471	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1709	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1476	1	1714	1
1477	}	1715	}
1478		1716
1479	#############################################################################	1717	#############################################################################
1480		1718
1481	package CFClient::UI::HBox;	1719	package CFPlus::UI::HBox;
1482		1720
1483	our @ISA = CFClient::UI::Box::;	1721	our @ISA = CFPlus::UI::Box::;
1484		1722
1485	sub new {	1723	sub new {
1486	my $class = shift;	1724	my $class = shift;
1487		1725
1488	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1491	)	1729	)
1492	}	1730	}
1493		1731
1494	#############################################################################	1732	#############################################################################
1495		1733
1496	package CFClient::UI::VBox;	1734	package CFPlus::UI::VBox;
1497		1735
1498	our @ISA = CFClient::UI::Box::;	1736	our @ISA = CFPlus::UI::Box::;
1499		1737
1500	sub new {	1738	sub new {
1501	my $class = shift;	1739	my $class = shift;
1502		1740
1503	$class->SUPER::new (	1741	$class->SUPER::new (
…		…
1506	)	1744	)
1507	}	1745	}
1508		1746
1509	#############################################################################	1747	#############################################################################
1510		1748
1511	package CFClient::UI::Label;	1749	package CFPlus::UI::Label;
1512		1750
1513	our @ISA = CFClient::UI::DrawBG::;	1751	our @ISA = CFPlus::UI::DrawBG::;
1514		1752
1515	use CFClient::OpenGL;	1753	use CFPlus::OpenGL;
1516		1754
1517	sub new {	1755	sub new {
1518	my ($class, %arg) = @_;	1756	my ($class, %arg) = @_;
1519		1757
1520	my $self = $class->SUPER::new (	1758	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1761	#active_bg => none
1524	#font => default_font	1762	#font => default_font
1525	#text => initial text	1763	#text => initial text
1526	#markup => initial narkup	1764	#markup => initial narkup
1527	#max_w => maximum pixel width	1765	#max_w => maximum pixel width
		1766	#style => 0, # render flags
1528	ellipsise => 3, # end	1767	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1768	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1769	fontsize => 1,
1531	align => -1,	1770	align => -1,
1532	valign => -1,	1771	valign => -1,
1533	padding_x => 2,	1772	padding_x => 2,
1534	padding_y => 2,	1773	padding_y => 2,
1535	can_events => 0,	1774	can_events => 0,
1536	%arg	1775	%arg
1537	);	1776	);
1538		1777
1539	if (exists $self->{template}) {	1778	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1779	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1780	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1781	$self->{template} = $layout;
1543	}	1782	}
1544		1783
1545	if (exists $self->{markup}) {	1784	if (exists $self->{markup}) {
…		…
1549	}	1788	}
1550		1789
1551	$self	1790	$self
1552	}	1791	}
1553		1792
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1793	sub update {
1565	my ($self) = @_;	1794	my ($self) = @_;
1566		1795
1567	delete $self->{texture};	1796	delete $self->{texture};
1568	$self->SUPER::update;	1797	$self->SUPER::update;
…		…
1579	my ($self, $text) = @_;	1808	my ($self, $text) = @_;
1580		1809
1581	return if $self->{text} eq "T$text";	1810	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1811	$self->{text} = "T$text";
1583		1812
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1813	$self->{layout}->set_text ($text);
1586		1814
1587	delete $self->{size_req};	1815	delete $self->{size_req};
1588	$self->realloc;	1816	$self->realloc;
1589	$self->update;	1817	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1823	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1824	$self->{text} = "M$markup";
1597		1825
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1826	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1827
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1828	$self->{layout}->set_markup ($markup);
1602		1829
1603	delete $self->{size_req};	1830	delete $self->{size_req};
1604	$self->realloc;	1831	$self->realloc;
1605	$self->update;	1832	$self->update;
…		…
1617		1844
1618	my ($w, $h) = $self->{layout}->size;	1845	my ($w, $h) = $self->{layout}->size;
1619		1846
1620	if (exists $self->{template}) {	1847	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	1848	$self->{template}->set_font ($self->{font}) if $self->{font};
		1849	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1850	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1851
1624	my ($w2, $h2) = $self->{template}->size;	1852	my ($w2, $h2) = $self->{template}->size;
1625		1853
1626	$w = List::Util::max $w, $w2;	1854	$w = List::Util::max $w, $w2;
…		…
1631	};	1859	};
1632		1860
1633	@{ $self->{size_req} }	1861	@{ $self->{size_req} }
1634	}	1862	}
1635		1863
		1864	sub baseline_shift {
		1865	$_[0]{layout}->descent
		1866	}
		1867
1636	sub invoke_size_allocate {	1868	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	1869	my ($self, $w, $h) = @_;
1638		1870
1639	delete $self->{ox};	1871	delete $self->{ox};
1640		1872
…		…
1646		1878
1647	sub set_fontsize {	1879	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	1880	my ($self, $fontsize) = @_;
1649		1881
1650	$self->{fontsize} = $fontsize;	1882	$self->{fontsize} = $fontsize;
		1883	delete $self->{size_req};
1651	delete $self->{texture};	1884	delete $self->{texture};
1652		1885
1653	$self->realloc;	1886	$self->realloc;
1654	}	1887	}
1655		1888
1656	sub reconfigure {	1889	sub reconfigure {
1657	my ($self) = @_;	1890	my ($self) = @_;
1658		1891
1659	delete $self->{size_req};	1892	delete $self->{size_req};
		1893	delete $self->{texture};
1660		1894
1661	$self->SUPER::reconfigure;	1895	$self->SUPER::reconfigure;
1662	}	1896	}
1663		1897
1664	sub _draw {	1898	sub _draw {
1665	my ($self) = @_;	1899	my ($self) = @_;
1666		1900
1667	$self->SUPER::_draw; # draw background, if applicable	1901	$self->SUPER::_draw; # draw background, if applicable
1668		1902
1669	my $tex = $self->{texture} ||= do {	1903	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	1904	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	1905	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	1906	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	1907	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1908	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1909	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		1910
1677	new_from_layout CFClient::Texture $self->{layout}	1911	[$self->{layout}->size]
1678	};	1912	};
1679		1913
1680	unless (exists $self->{ox}) {	1914	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1915	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1916	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	1917	: ($self->{w} - $size->[0]) * 0.5);
1684		1918
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1919	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1920	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	1921	: ($self->{h} - $size->[1]) * 0.5);
1688	};	1922	};
1689		1923
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1924	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1925	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		1926
1695	if ($tex->{format} == GL_ALPHA) {	1927	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	1928	}
1706		1929
1707	#############################################################################	1930	#############################################################################
1708		1931
1709	package CFClient::UI::EntryBase;	1932	package CFPlus::UI::EntryBase;
1710		1933
1711	our @ISA = CFClient::UI::Label::;	1934	our @ISA = CFPlus::UI::Label::;
1712		1935
1713	use CFClient::OpenGL;	1936	use CFPlus::OpenGL;
1714		1937
1715	sub new {	1938	sub new {
1716	my $class = shift;	1939	my $class = shift;
1717		1940
1718	$class->SUPER::new (	1941	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	1945	active_fg => [0, 0, 0],
1723	can_hover => 1,	1946	can_hover => 1,
1724	can_focus => 1,	1947	can_focus => 1,
1725	valign => 0,	1948	valign => 0,
1726	can_events => 1,	1949	can_events => 1,
		1950	ellipsise => 0,
1727	#text => ...	1951	#text => ...
1728	#hidden => "*",	1952	#hidden => "*",
1729	@_	1953	@_
1730	)	1954	)
1731	}	1955	}
…		…
1776	my $sym = $ev->{sym};	2000	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2001	my $uni = $ev->{unicode};
1778		2002
1779	my $text = $self->get_text;	2003	my $text = $self->get_text;
1780		2004
		2005	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2006
1781	if ($uni == 8) {	2007	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2008	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2009	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2010	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2011	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2012	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2013	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2014	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2015	} elsif ($sym == CFPlus::SDLK_HOME) {
		2016	# what a hack
		2017	$self->{cursor} =
		2018	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2019	? length $1
		2020	: 0;
		2021	} elsif ($sym == CFPlus::SDLK_END) {
		2022	# uh, again
		2023	$self->{cursor} =
		2024	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2025	? $self->{cursor} + length $1
		2026	: length $self->{text};
		2027	} elsif ($uni == 21) { # ctrl-u
		2028	$text = "";
1790	$self->{cursor} = 0;	2029	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2030	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2031	$self->emit ('escape');
1795	} elsif ($uni) {	2032	} elsif ($uni == 0x0d) {
		2033	substr $text, $self->{cursor}++, 0, "\012";
		2034	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2035	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2036	} else {
1798	return 0;	2037	return 0;
1799	}	2038	}
1800		2039
1801	$self->_set_text ($text);	2040	$self->_set_text ($text);
1802		2041
1803	$self->realloc;	2042	$self->realloc;
		2043	$self->update;
1804		2044
1805	1	2045	1
1806	}	2046	}
1807		2047
1808	sub invoke_focus_in {	2048	sub invoke_focus_in {
…		…
1820		2060
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2061	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2062
1823	# byte-index to char-index	2063	# byte-index to char-index
1824	my $text = $self->{text};	2064	my $text = $self->{text};
1825	utf8::encode $text;	2065	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2066	$self->{cursor} = length $text;
1827		2067
1828	$self->_set_text ($self->{text});	2068	$self->_set_text ($self->{text});
1829	$self->update;	2069	$self->update;
1830		2070
1831	1	2071	1
…		…
1870	utf8::encode $text;	2110	utf8::encode $text;
1871		2111
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2112	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2113	}
1874		2114
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2115	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2116	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2117	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2118	glEnd;
1880	}	2119	}
1881	}	2120	}
1882		2121
		2122	#############################################################################
		2123
1883	package CFClient::UI::Entry;	2124	package CFPlus::UI::Entry;
1884		2125
1885	our @ISA = CFClient::UI::EntryBase::;	2126	our @ISA = CFPlus::UI::EntryBase::;
1886		2127
1887	use CFClient::OpenGL;	2128	use CFPlus::OpenGL;
1888		2129
1889	sub invoke_key_down {	2130	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2131	my ($self, $ev) = @_;
1891		2132
1892	my $sym = $ev->{sym};	2133	my $sym = $ev->{sym};
1893		2134
1894	if ($sym == 13) {	2135	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2136	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2137	my $txt = $self->get_text;
1897		2138
1898	$self->{history_pointer} = -1;	2139	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2140	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2141	$self->emit (activate => $txt);
1901	$self->update;	2142	$self->update;
1902		2143
1903	} elsif ($sym == CFClient::SDLK_UP) {	2144	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2145	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2146	$self->{history_saveback} = $self->get_text;
1906	}	2147	}
1907	if (@{$self->{history} || []} > 0) {	2148	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2149	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2151	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2152	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2153	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2154	}
1914		2155
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2156	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2157	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2158	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2159
1919	if ($self->{history_pointer} >= 0) {	2160	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2161	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2170	1
1930	}	2171	}
1931		2172
1932	#############################################################################	2173	#############################################################################
1933		2174
		2175	package CFPlus::UI::TextEdit;
		2176
		2177	our @ISA = CFPlus::UI::EntryBase::;
		2178
		2179	use CFPlus::OpenGL;
		2180
		2181	sub move_cursor_ver {
		2182	my ($self, $dy) = @_;
		2183
		2184	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2185
		2186	$y += $dy;
		2187
		2188	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2189	$self->{cursor} = $index;
		2190	delete $self->{cur_h};
		2191	$self->update;
		2192	return;
		2193	}
		2194	}
		2195
		2196	sub invoke_key_down {
		2197	my ($self, $ev) = @_;
		2198
		2199	my $sym = $ev->{sym};
		2200
		2201	if ($sym == CFPlus::SDLK_UP) {
		2202	$self->move_cursor_ver (-1);
		2203	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2204	$self->move_cursor_ver (+1);
		2205	} else {
		2206	return $self->SUPER::invoke_key_down ($ev)
		2207	}
		2208
		2209	1
		2210	}
		2211
		2212	#############################################################################
		2213
1934	package CFClient::UI::Button;	2214	package CFPlus::UI::Button;
1935		2215
1936	our @ISA = CFClient::UI::Label::;	2216	our @ISA = CFPlus::UI::Label::;
1937		2217
1938	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
1939		2219
1940	my @tex =	2220	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2222	qw(b1_button_active.png);
1943		2223
1944	sub new {	2224	sub new {
1945	my $class = shift;	2225	my $class = shift;
1946		2226
…		…
1983	$self->SUPER::_draw;	2263	$self->SUPER::_draw;
1984	}	2264	}
1985		2265
1986	#############################################################################	2266	#############################################################################
1987		2267
		2268	package CFPlus::UI::CheckBox;
		2269
		2270	our @ISA = CFPlus::UI::DrawBG::;
		2271
		2272	my @tex =
		2273	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2274	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2275
		2276	use CFPlus::OpenGL;
		2277
		2278	sub new {
		2279	my $class = shift;
		2280
		2281	$class->SUPER::new (
		2282	padding_x => 2,
		2283	padding_y => 2,
		2284	fg => [1, 1, 1],
		2285	active_fg => [1, 1, 0],
		2286	bg => [0, 0, 0, 0.2],
		2287	active_bg => [1, 1, 1, 0.5],
		2288	state => 0,
		2289	can_hover => 1,
		2290	@_
		2291	)
		2292	}
		2293
		2294	sub size_request {
		2295	my ($self) = @_;
		2296
		2297	(6) x 2
		2298	}
		2299
		2300	sub toggle {
		2301	my ($self) = @_;
		2302
		2303	$self->{state} = !$self->{state};
		2304	$self->emit (changed => $self->{state});
		2305	$self->update;
		2306	}
		2307
		2308	sub invoke_button_down {
		2309	my ($self, $ev, $x, $y) = @_;
		2310
		2311	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2312	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2313	$self->toggle;
		2314	} else {
		2315	return 0
		2316	}
		2317
		2318	1
		2319	}
		2320
		2321	sub _draw {
		2322	my ($self) = @_;
		2323
		2324	$self->SUPER::_draw;
		2325
		2326	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2327
		2328	my ($w, $h) = @$self{qw(w h)};
		2329
		2330	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2331
		2332	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2333
		2334	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2335
		2336	glEnable GL_TEXTURE_2D;
		2337	$tex->draw_quad_alpha (0, 0, $s, $s);
		2338	glDisable GL_TEXTURE_2D;
		2339	}
		2340
		2341	#############################################################################
		2342
		2343	package CFPlus::UI::Image;
		2344
		2345	our @ISA = CFPlus::UI::Base::;
		2346
		2347	use CFPlus::OpenGL;
		2348
		2349	our %texture_cache;
		2350
		2351	sub new {
		2352	my $class = shift;
		2353
		2354	my $self = $class->SUPER::new (
		2355	can_events => 0,
		2356	@_,
		2357	);
		2358
		2359	$self->{path} || $self->{tex}
		2360	or Carp::croak "'path' or 'tex' attributes required";
		2361
		2362	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2363	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2364
		2365	CFPlus::weaken $texture_cache{$self->{path}};
		2366
		2367	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2368
		2369	$self
		2370	}
		2371
		2372	sub STORABLE_freeze {
		2373	my ($self, $cloning) = @_;
		2374
		2375	$self->{path}
		2376	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2377
		2378	$self->{path}
		2379	}
		2380
		2381	sub STORABLE_attach {
		2382	my ($self, $cloning, $path) = @_;
		2383
		2384	$self->new (path => $path)
		2385	}
		2386
		2387	sub size_request {
		2388	my ($self) = @_;
		2389
		2390	($self->{tex}{w}, $self->{tex}{h})
		2391	}
		2392
		2393	sub _draw {
		2394	my ($self) = @_;
		2395
		2396	my $tex = $self->{tex};
		2397
		2398	my ($w, $h) = ($self->{w}, $self->{h});
		2399
		2400	if ($self->{rot90}) {
		2401	glRotate 90, 0, 0, 1;
		2402	glTranslate 0, -$self->{w}, 0;
		2403
		2404	($w, $h) = ($h, $w);
		2405	}
		2406
		2407	glEnable GL_TEXTURE_2D;
		2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2409
		2410	$tex->draw_quad (0, 0, $w, $h);
		2411
		2412	glDisable GL_TEXTURE_2D;
		2413	}
		2414
		2415	#############################################################################
		2416
1988	package CFClient::UI::ImageButton;	2417	package CFPlus::UI::ImageButton;
1989		2418
1990	our @ISA = CFClient::UI::Image::;	2419	our @ISA = CFPlus::UI::Image::;
1991		2420
1992	use CFClient::OpenGL;	2421	use CFPlus::OpenGL;
1993		2422
1994	my %textures;	2423	my %textures;
1995		2424
1996	sub new {	2425	sub new {
1997	my $class = shift;	2426	my $class = shift;
…		…
2019	1	2448	1
2020	}	2449	}
2021		2450
2022	#############################################################################	2451	#############################################################################
2023		2452
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2453	package CFPlus::UI::VGauge;
2093		2454
2094	our @ISA = CFClient::UI::Base::;	2455	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097
2098	our %texture_cache;
2099
2100	sub new {
2101	my $class = shift;
2102
2103	my $self = $class->SUPER::new (
2104	can_events => 0,
2105	@_,
2106	);
2107
2108	$self->{path}
2109	or Carp::croak "required attribute 'path' not set";
2110
2111	$self->{tex} = $texture_cache{$self->{path}} ||=
2112	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113
2114	Scalar::Util::weaken $texture_cache{$self->{path}};
2115
2116	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118	$self
2119	}
2120
2121	sub size_request {
2122	my ($self) = @_;
2123
2124	($self->{tex}{w}, $self->{tex}{h})
2125	}
2126
2127	sub _draw {
2128	my ($self) = @_;
2129
2130	my $tex = $self->{tex};
2131
2132	my ($w, $h) = ($self->{w}, $self->{h});
2133
2134	if ($self->{rot90}) {
2135	glRotate 90, 0, 0, 1;
2136	glTranslate 0, -$self->{w}, 0;
2137
2138	($w, $h) = ($h, $w);
2139	}
2140
2141	glEnable GL_TEXTURE_2D;
2142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2143
2144	$tex->draw_quad_alpha (0, 0, $w, $h);
2145
2146	glDisable GL_TEXTURE_2D;
2147	}
2148
2149	#############################################################################
2150
2151	package CFClient::UI::VGauge;
2152
2153	our @ISA = CFClient::UI::Base::;
2154		2456
2155	use List::Util qw(min max);	2457	use List::Util qw(min max);
2156		2458
2157	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
2158		2460
2159	my %tex = (	2461	my %tex = (
2160	food => [	2462	food => [
2161	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2463	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2464	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163	],	2465	],
2164	grace => [	2466	grace => [
2165	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2467	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2166	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2468	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167	],	2469	],
2168	hp => [	2470	hp => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2471	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2472	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171	],	2473	],
2172	mana => [	2474	mana => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2475	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2476	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175	],	2477	],
2176	);	2478	);
2177		2479
2178	# eg. VGauge->new (gauge => 'food'), default gauge: food	2480	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2238	my $ycut1 = max 0, min 1, $ycut;	2540	my $ycut1 = max 0, min 1, $ycut;
2239	my $ycut2 = max 0, min 1, $ycut - 1;	2541	my $ycut2 = max 0, min 1, $ycut - 1;
2240		2542
2241	my $h1 = $self->{h} * (1 - $ycut1);	2543	my $h1 = $self->{h} * (1 - $ycut1);
2242	my $h2 = $self->{h} * (1 - $ycut2);	2544	my $h2 = $self->{h} * (1 - $ycut2);
		2545	my $h3 = $self->{h};
		2546
		2547	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243		2548
2244	glEnable GL_BLEND;	2549	glEnable GL_BLEND;
2245	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2550	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2551	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247	glEnable GL_TEXTURE_2D;	2552	glEnable GL_TEXTURE_2D;
…		…
2266		2571
2267	if ($t3) {	2572	if ($t3) {
2268	glBindTexture GL_TEXTURE_2D, $t3->{name};	2573	glBindTexture GL_TEXTURE_2D, $t3->{name};
2269	glBegin GL_QUADS;	2574	glBegin GL_QUADS;
2270	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2575	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2576	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2577	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2578	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274	glEnd;	2579	glEnd;
2275	}	2580	}
2276		2581
2277	glDisable GL_BLEND;	2582	glDisable GL_BLEND;
2278	glDisable GL_TEXTURE_2D;	2583	glDisable GL_TEXTURE_2D;
2279	}	2584	}
2280		2585
2281	#############################################################################	2586	#############################################################################
2282		2587
2283	package CFClient::UI::Gauge;	2588	package CFPlus::UI::Gauge;
2284		2589
2285	our @ISA = CFClient::UI::VBox::;	2590	our @ISA = CFPlus::UI::VBox::;
2286		2591
2287	sub new {	2592	sub new {
2288	my ($class, %arg) = @_;	2593	my ($class, %arg) = @_;
2289		2594
2290	my $self = $class->SUPER::new (	2595	my $self = $class->SUPER::new (
…		…
2292	can_hover => 1,	2597	can_hover => 1,
2293	can_events => 1,	2598	can_events => 1,
2294	%arg,	2599	%arg,
2295	);	2600	);
2296		2601
2297	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2602	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2298	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2603	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2299	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2604	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2300		2605
2301	$self	2606	$self
2302	}	2607	}
2303		2608
2304	sub set_fontsize {	2609	sub set_fontsize {
…		…
2325	$self->{value}->set_text ($val);	2630	$self->{value}->set_text ($val);
2326	}	2631	}
2327		2632
2328	#############################################################################	2633	#############################################################################
2329		2634
2330	package CFClient::UI::Slider;	2635	package CFPlus::UI::Slider;
2331		2636
2332	use strict;	2637	use strict;
2333		2638
2334	use CFClient::OpenGL;	2639	use CFPlus::OpenGL;
2335		2640
2336	our @ISA = CFClient::UI::DrawBG::;	2641	our @ISA = CFPlus::UI::DrawBG::;
2337		2642
2338	my @tex =	2643	my @tex =
2339	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2644	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340	qw(s1_slider.png s1_slider_bg.png);	2645	qw(s1_slider.png s1_slider_bg.png);
2341		2646
2342	sub new {	2647	sub new {
2343	my $class = shift;	2648	my $class = shift;
2344		2649
…		…
2433	}	2738	}
2434		2739
2435	1	2740	1
2436	}	2741	}
2437		2742
		2743	sub invoke_mouse_wheel {
		2744	my ($self, $ev) = @_;
		2745
		2746	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2747
		2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2749
		2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2751
		2752	! ! $delta
		2753	}
		2754
2438	sub update {	2755	sub update {
2439	my ($self) = @_;	2756	my ($self) = @_;
2440		2757
2441	delete $self->{knob_w};	2758	delete $self->{knob_w};
2442	$self->SUPER::update;	2759	$self->SUPER::update;
…		…
2489	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2490	}	2807	}
2491		2808
2492	#############################################################################	2809	#############################################################################
2493		2810
2494	package CFClient::UI::ValSlider;	2811	package CFPlus::UI::ValSlider;
2495		2812
2496	our @ISA = CFClient::UI::HBox::;	2813	our @ISA = CFPlus::UI::HBox::;
2497		2814
2498	sub new {	2815	sub new {
2499	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2500		2817
2501	my $range = delete $arg{range};	2818	my $range = delete $arg{range};
2502		2819
2503	my $self = $class->SUPER::new (	2820	my $self = $class->SUPER::new (
2504	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2821	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2822	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506	to_value => sub { shift },	2823	to_value => sub { shift },
2507	from_value => sub { shift },	2824	from_value => sub { shift },
2508	%arg,	2825	%arg,
2509	);	2826	);
2510		2827
…		…
2530	sub set_range { shift->{slider}->set_range (@_) }	2847	sub set_range { shift->{slider}->set_range (@_) }
2531	sub set_value { shift->{slider}->set_value (@_) }	2848	sub set_value { shift->{slider}->set_value (@_) }
2532		2849
2533	#############################################################################	2850	#############################################################################
2534		2851
2535	package CFClient::UI::TextScroller;	2852	package CFPlus::UI::TextScroller;
2536		2853
2537	our @ISA = CFClient::UI::HBox::;	2854	our @ISA = CFPlus::UI::HBox::;
2538		2855
2539	use CFClient::OpenGL;	2856	use CFPlus::OpenGL;
2540		2857
2541	sub new {	2858	sub new {
2542	my $class = shift;	2859	my $class = shift;
2543		2860
2544	my $self = $class->SUPER::new (	2861	my $self = $class->SUPER::new (
2545	fontsize => 1,	2862	fontsize => 1,
2546	can_events => 0,	2863	can_events => 1,
2547	indent => 0,	2864	indent => 0,
2548	#font => default_font	2865	#font => default_font
2549	@_,	2866	@_,
2550		2867
2551	layout => (new CFClient::Layout 1),	2868	layout => (new CFPlus::Layout),
2552	par => [],	2869	par => [],
		2870	max_par => 0,
2553	height => 0,	2871	height => 0,
2554	children => [	2872	children => [
2555	(new CFClient::UI::Empty expand => 1),	2873	(new CFPlus::UI::Empty expand => 1),
2556	(new CFClient::UI::Slider vertical => 1),	2874	(new CFPlus::UI::Slider vertical => 1),
2557	],	2875	],
2558	);	2876	);
2559		2877
2560	$self->{children}[1]->connect (changed => sub { $self->update });	2878	$self->{children}[1]->connect (changed => sub { $self->update });
2561		2879
…		…
2567		2885
2568	$self->{fontsize} = $fontsize;	2886	$self->{fontsize} = $fontsize;
2569	$self->reflow;	2887	$self->reflow;
2570	}	2888	}
2571		2889
2572	sub visible_children {	2890	sub size_request {
2573	my ($self) = @_;	2891	my ($self) = @_;
2574		2892
2575	@{$self->{children}}[0,1]	2893	my ($empty, $slider) = @{ $self->{children} };
		2894
		2895	local $self->{children} = [$empty, $slider];
		2896	$self->SUPER::size_request
2576	}	2897	}
2577		2898
2578	sub invoke_size_allocate {	2899	sub invoke_size_allocate {
2579	my ($self, $w, $h) = @_;	2900	my ($self, $w, $h) = @_;
2580		2901
2581	my (undef, undef, @other) = @{ $self->{children} };	2902	my ($empty, $slider, @other) = @{ $self->{children} };
2582	$_->configure (@$_{qw(x y req_w req_h)}) for @other;	2903	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583		2904
2584	$self->{layout}->set_font ($self->{font}) if $self->{font};	2905	$self->{layout}->set_font ($self->{font}) if $self->{font};
2585	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2906	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586	$self->{layout}->set_width ($self->{children}[0]{w});	2907	$self->{layout}->set_width ($empty->{w});
2587	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2908	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588		2909
2589	$self->reflow;	2910	$self->reflow;
2590		2911
		2912	local $self->{children} = [$empty, $slider];
2591	$self->SUPER::invoke_size_allocate ($w, $h)	2913	$self->SUPER::invoke_size_allocate ($w, $h)
		2914	}
		2915
		2916	sub invoke_mouse_wheel {
		2917	my ($self, $ev) = @_;
		2918
		2919	return 0 unless $ev->{dy}; # only vertical movements
		2920
		2921	$self->{children}[1]->emit (mouse_wheel => $ev);
		2922
		2923	1
2592	}	2924	}
2593		2925
2594	sub get_layout {	2926	sub get_layout {
2595	my ($self, $para) = @_;	2927	my ($self, $para) = @_;
2596		2928
2597	my $layout = $self->{layout};	2929	my $layout = $self->{layout};
2598		2930
2599	$layout->set_font ($self->{font}) if $self->{font};	2931	$layout->set_font ($self->{font}) if $self->{font};
		2932	$layout->set_foreground (@{$para->{fg}});
2600	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2933	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601	$layout->set_width ($self->{children}[0]{w} - $para->{indent});	2934	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2935	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603	$layout->set_markup ($para->{markup});	2936	$layout->set_markup ($para->{markup});
2604	$layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});	2937
		2938	$layout->set_shapes (
		2939	map
		2940	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2941	@{$para->{widget}}
		2942	);
2605		2943
2606	$layout	2944	$layout
2607	}	2945	}
2608		2946
2609	sub reflow {	2947	sub reflow {
…		…
2616	sub set_offset {	2954	sub set_offset {
2617	my ($self, $offset) = @_;	2955	my ($self, $offset) = @_;
2618		2956
2619	# todo: base offset on lines or so, not on pixels	2957	# todo: base offset on lines or so, not on pixels
2620	$self->{children}[1]->set_value ($offset);	2958	$self->{children}[1]->set_value ($offset);
		2959	}
		2960
		2961	sub current_paragraph {
		2962	my ($self) = @_;
		2963
		2964	$self->{top_paragraph} - 1
		2965	}
		2966
		2967	sub scroll_to {
		2968	my ($self, $para) = @_;
		2969
		2970	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2971
		2972	$self->{scroll_to} = $para;
		2973	$self->update;
2621	}	2974	}
2622		2975
2623	sub clear {	2976	sub clear {
2624	my ($self) = @_;	2977	my ($self) = @_;
2625		2978
…		…
2630	$self->{height} = 0;	2983	$self->{height} = 0;
2631	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2984	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632	}	2985	}
2633		2986
2634	sub add_paragraph {	2987	sub add_paragraph {
2635	my ($self, $color, $para, $indent) = @_;	2988	my $self = shift;
2636		2989
2637	my ($text, @w) = ref $para ? @$para : $para;	2990	for my $para (@_) {
2638
2639	$para = {	2991	$para = {
		2992	fg => [1, 1, 1, 1],
		2993	indent => 0,
		2994	markup => "",
		2995	widget => [],
		2996	ref $para ? %$para : (markup => $para),
2640	w => 1e10,	2997	w => 1e10,
2641	wrapped => 1,	2998	wrapped => 1,
2642	fg => $color,
2643	indent => $indent,
2644	markup => $text,
2645	widget => \@w,
2646	};	2999	};
2647		3000
2648	$self->add (@w) if @w;	3001	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649	push @{$self->{par}}, $para;	3002	push @{$self->{par}}, $para;
		3003	}
		3004
		3005	if (my $max = $self->{max_par}) {
		3006	shift @{$self->{par}} while @{$self->{par}} > $max;
		3007	}
2650		3008
2651	$self->{need_reflow}++;	3009	$self->{need_reflow}++;
2652	$self->update;	3010	$self->update;
2653	}	3011	}
2654		3012
2655	sub scroll_to_bottom {	3013	sub scroll_to_bottom {
2656	my ($self) = @_;	3014	my ($self) = @_;
2657		3015
2658	$self->{scroll_to_bottom} = 1;	3016	$self->{scroll_to} = $#{$self->{par}};
2659	$self->update;	3017	$self->update;
2660	}	3018	}
2661		3019
		3020	sub force_uptodate {
		3021	my ($self) = @_;
		3022
		3023	if (delete $self->{need_reflow}) {
		3024	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3025
		3026	my $height = 0;
		3027
		3028	for my $para (@{$self->{par}}) {
		3029	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3030	my $layout = $self->get_layout ($para);
		3031	my ($w, $h) = $layout->size;
		3032
		3033	$para->{w} = $w + $para->{indent};
		3034	$para->{h} = $h;
		3035	$para->{wrapped} = $layout->has_wrapped;
		3036	}
		3037
		3038	$para->{y} = $height;
		3039	$height += $para->{h};
		3040	}
		3041
		3042	$self->{height} = $height;
		3043	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3044
		3045	delete $self->{texture};
		3046	}
		3047
		3048	if (my $paridx = delete $self->{scroll_to}) {
		3049	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3050	}
		3051	}
		3052
2662	sub update {	3053	sub update {
2663	my ($self) = @_;	3054	my ($self) = @_;
2664		3055
2665	$self->SUPER::update;	3056	$self->SUPER::update;
2666		3057
2667	return unless $self->{h} > 0;	3058	return unless $self->{h} > 0;
2668		3059
2669	delete $self->{texture};	3060	delete $self->{texture};
2670		3061
2671	$ROOT->on_post_alloc ($self => sub {	3062	$ROOT->on_post_alloc ($self => sub {
		3063	$self->force_uptodate;
		3064
2672	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3065	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673		3066
2674	if (delete $self->{need_reflow}) {
2675	my $height = 0;
2676
2677	for my $para (@{$self->{par}}) {
2678	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679	my $layout = $self->get_layout ($para);
2680	my ($w, $h) = $layout->size;
2681
2682	$para->{w} = $w + $para->{indent};
2683	$para->{h} = $h;
2684	$para->{wrapped} = $layout->has_wrapped;
2685	}
2686
2687	$height += $para->{h};
2688	}
2689
2690	$self->{height} = $height;
2691
2692	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2693
2694	delete $self->{texture};
2695	}
2696
2697	if (delete $self->{scroll_to_bottom}) {
2698	$self->{children}[1]->set_value (1e10);
2699	}
2700
2701	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3067	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702	glClearColor 0, 0, 0, 0;	3068	glClearColor 0, 0, 0, 0;
2703	glClear GL_COLOR_BUFFER_BIT;	3069	glClear GL_COLOR_BUFFER_BIT;
2704		3070
		3071	package CFPlus::UI::Base;
		3072	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3073	(0, 0, $self->{w}, $self->{h});
		3074
		3075	my $top = int $self->{children}[1]{range}[0];
		3076
		3077	my $paridx = 0;
		3078	my $top_paragraph;
2705	my $top = int $self->{children}[1]{range}[0];	3079	my $top = int $self->{children}[1]{range}[0];
2706		3080
2707	my $y0 = $top;	3081	my $y0 = $top;
2708	my $y1 = $top + $H;	3082	my $y1 = $top + $H;
2709		3083
2710	my $y = 0;
2711
2712	glEnable GL_BLEND;
2713	#TODO# not correct in windows where rgba is forced off
2714	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716	for my $para (@{$self->{par}}) {	3084	for my $para (@{$self->{par}}) {
2717	my $h = $para->{h};	3085	my $h = $para->{h};
		3086	my $y = $para->{y};
2718		3087
2719	if ($y0 < $y + $h && $y < $y1) {	3088	if ($y0 < $y + $h && $y < $y1) {
2720
2721	my $layout = $self->get_layout ($para);	3089	my $layout = $self->get_layout ($para);
2722		3090
2723	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725	glRasterPos $para->{indent}, $y - $y0;	3091	$layout->render ($para->{indent}, $y - $y0);
2726	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727		3092
2728	if (my @w = @{ $para->{widget} }) {	3093	if (my @w = @{ $para->{widget} }) {
2729	my @s = $layout->get_shapes;	3094	my @s = $layout->get_shapes;
2730		3095
2731	for (@w) {	3096	for (@w) {
…		…
2737	$_->draw;	3102	$_->draw;
2738	}	3103	}
2739	}	3104	}
2740	}	3105	}
2741		3106
2742	$y += $h;	3107	$paridx++;
		3108	$top_paragraph ||= $paridx if $y >= $top;
2743	}	3109	}
2744		3110
2745	glDisable GL_BLEND;	3111	$self->{top_paragraph} = $top_paragraph;
2746	};	3112	};
2747	});	3113	});
2748	}	3114	}
2749		3115
2750	sub reconfigure {	3116	sub reconfigure {
…		…
2768	$self->{children}[1]->draw;	3134	$self->{children}[1]->draw;
2769	}	3135	}
2770		3136
2771	#############################################################################	3137	#############################################################################
2772		3138
2773	package CFClient::UI::Animator;	3139	package CFPlus::UI::Animator;
2774		3140
2775	use CFClient::OpenGL;	3141	use CFPlus::OpenGL;
2776		3142
2777	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2778		3144
2779	sub moveto {	3145	sub moveto {
2780	my ($self, $x, $y) = @_;	3146	my ($self, $x, $y) = @_;
2781		3147
2782	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3148	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2810	glPopMatrix;	3176	glPopMatrix;
2811	}	3177	}
2812		3178
2813	#############################################################################	3179	#############################################################################
2814		3180
2815	package CFClient::UI::Flopper;	3181	package CFPlus::UI::Flopper;
2816		3182
2817	our @ISA = CFClient::UI::Button::;	3183	our @ISA = CFPlus::UI::Button::;
2818		3184
2819	sub new {	3185	sub new {
2820	my $class = shift;	3186	my $class = shift;
2821		3187
2822	my $self = $class->SUPER::new (	3188	my $self = $class->SUPER::new (
…		…
2834	$self->{other}->toggle_visibility;	3200	$self->{other}->toggle_visibility;
2835	}	3201	}
2836		3202
2837	#############################################################################	3203	#############################################################################
2838		3204
2839	package CFClient::UI::Tooltip;	3205	package CFPlus::UI::Tooltip;
2840		3206
2841	our @ISA = CFClient::UI::Bin::;	3207	our @ISA = CFPlus::UI::Bin::;
2842		3208
2843	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2844		3210
2845	sub new {	3211	sub new {
2846	my $class = shift;	3212	my $class = shift;
2847		3213
2848	$class->SUPER::new (	3214	$class->SUPER::new (
…		…
2851	)	3217	)
2852	}	3218	}
2853		3219
2854	sub set_tooltip_from {	3220	sub set_tooltip_from {
2855	my ($self, $widget) = @_;	3221	my ($self, $widget) = @_;
		3222
		3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3224	if $widget->{tooltip} =~ /^#(.*)$/;
2856		3225
2857	my $tooltip = $widget->{tooltip};	3226	my $tooltip = $widget->{tooltip};
2858		3227
2859	if ($ENV{CFPLUS_DEBUG} & 2) {	3228	if ($ENV{CFPLUS_DEBUG} & 2) {
2860	$tooltip .= "\n\n" . (ref $widget) . "\n"	3229	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2864	}	3233	}
2865		3234
2866	$tooltip =~ s/^\n+//;	3235	$tooltip =~ s/^\n+//;
2867	$tooltip =~ s/\n+$//;	3236	$tooltip =~ s/\n+$//;
2868		3237
2869	$self->add (new CFClient::UI::Label	3238	$self->add (new CFPlus::UI::Label
2870	markup => $tooltip,	3239	markup => $tooltip,
2871	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3240	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872	fontsize => 0.8,	3241	fontsize => 0.8,
2873	fg => [0, 0, 0, 1],	3242	style => 1, # FLAG_INVERSE
2874	ellipsise => 0,	3243	ellipsise => 0,
2875	font => ($widget->{tooltip_font} || $::FONT_PROP),	3244	font => ($widget->{tooltip_font} || $::FONT_PROP),
2876	);	3245	);
2877	}	3246	}
2878		3247
…		…
2897		3266
2898	$self->{root}->on_post_alloc ("move_$self" => sub {	3267	$self->{root}->on_post_alloc ("move_$self" => sub {
2899	my $widget = $self->{owner}	3268	my $widget = $self->{owner}
2900	or return;	3269	or return;
2901		3270
		3271	if ($widget->{visible}) {
2902	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3272	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903		3273
2904	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3274	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905	if $x + $self->{w} > $self->{root}{w};	3275	if $x + $self->{w} > $self->{root}{w};
2906		3276
2907	$self->move_abs ($x, $y);	3277	$self->move_abs ($x, $y);
		3278	} else {
		3279	$self->hide;
		3280	}
2908	});	3281	});
2909	}	3282	}
2910		3283
2911	sub _draw {	3284	sub _draw {
2912	my ($self) = @_;	3285	my ($self) = @_;
…		…
2936	$self->SUPER::_draw;	3309	$self->SUPER::_draw;
2937	}	3310	}
2938		3311
2939	#############################################################################	3312	#############################################################################
2940		3313
2941	package CFClient::UI::Face;	3314	package CFPlus::UI::Face;
2942		3315
2943	our @ISA = CFClient::UI::Base::;	3316	our @ISA = CFPlus::UI::DrawBG::;
2944		3317
2945	use CFClient::OpenGL;	3318	use CFPlus::OpenGL;
2946		3319
2947	sub new {	3320	sub new {
2948	my $class = shift;	3321	my $class = shift;
2949		3322
2950	my $self = $class->SUPER::new (	3323	my $self = $class->SUPER::new (
…		…
2952	can_events => 0,	3325	can_events => 0,
2953	@_,	3326	@_,
2954	);	3327	);
2955		3328
2956	if ($self->{anim} && $self->{animspeed}) {	3329	if ($self->{anim} && $self->{animspeed}) {
2957	Scalar::Util::weaken (my $widget = $self);	3330	CFPlus::weaken (my $widget = $self);
2958		3331
2959	$self->{timer} = Event->timer (	3332	$self->{timer} = Event->timer (
2960	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961	hard => 1,	3334	hard => 1,
2962	interval => $self->{animspeed},	3335	interval => $self->{animspeed},
…		…
2985	sub _draw {	3358	sub _draw {
2986	my ($self) = @_;	3359	my ($self) = @_;
2987		3360
2988	return unless $::CONN;	3361	return unless $::CONN;
2989		3362
		3363	$self->SUPER::_draw;
		3364
2990	my $face;	3365	my $face;
2991		3366
2992	if ($self->{frame}) {	3367	if ($self->{frame}) {
2993	my $anim = $::CONN->{anim}[$self->{anim}];	3368	my $anim = $::CONN->{anim}[$self->{anim}];
2994		3369
…		…
3016	$self->SUPER::destroy;	3391	$self->SUPER::destroy;
3017	}	3392	}
3018		3393
3019	#############################################################################	3394	#############################################################################
3020		3395
3021	package CFClient::UI::Buttonbar;	3396	package CFPlus::UI::Buttonbar;
3022		3397
3023	our @ISA = CFClient::UI::HBox::;	3398	our @ISA = CFPlus::UI::HBox::;
3024		3399
3025	# TODO: should actualyl wrap buttons and other goodies.	3400	# TODO: should actually wrap buttons and other goodies.
3026		3401
3027	#############################################################################	3402	#############################################################################
3028		3403
3029	package CFClient::UI::Menu;	3404	package CFPlus::UI::Menu;
3030		3405
3031	our @ISA = CFClient::UI::FancyFrame::;	3406	our @ISA = CFPlus::UI::Toplevel::;
3032		3407
3033	use CFClient::OpenGL;	3408	use CFPlus::OpenGL;
3034		3409
3035	sub new {	3410	sub new {
3036	my $class = shift;	3411	my $class = shift;
3037		3412
3038	my $self = $class->SUPER::new (	3413	my $self = $class->SUPER::new (
3039	items => [],	3414	items => [],
3040	z => 100,	3415	z => 100,
3041	@_,	3416	@_,
3042	);	3417	);
3043		3418
3044	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3419	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045		3420
3046	for my $item (@{ $self->{items} }) {	3421	for my $item (@{ $self->{items} }) {
3047	my ($widget, $cb, $tooltip) = @$item;	3422	my ($widget, $cb, $tooltip) = @$item;
3048		3423
3049	# handle various types of items, only text for now	3424	# handle various types of items, only text for now
3050	if (!ref $widget) {	3425	if (!ref $widget) {
		3426	if ($widget =~ /\t/) {
		3427	my ($left, $right) = split /\t/, $widget, 2;
		3428
3051	$widget = new CFClient::UI::Label	3429	$widget = new CFPlus::UI::HBox
3052	can_hover => 1,	3430	can_hover => 1,
3053	can_events => 1,	3431	can_events => 1,
		3432	tooltip => $tooltip,
		3433	children => [
		3434	(new CFPlus::UI::Label markup => $left, expand => 1),
		3435	(new CFPlus::UI::Label markup => $right, align => +1),
		3436	],
		3437	;
		3438
		3439	} else {
		3440	$widget = new CFPlus::UI::Label
		3441	can_hover => 1,
		3442	can_events => 1,
3054	markup => $widget,	3443	markup => $widget,
3055	tooltip => $tooltip	3444	tooltip => $tooltip;
		3445	}
3056	}	3446	}
3057		3447
3058	$self->{item}{$widget} = $item;	3448	$self->{item}{$widget} = $item;
3059		3449
3060	$self->{vbox}->add ($widget);	3450	$self->{vbox}->add ($widget);
…		…
3103	1	3493	1
3104	}	3494	}
3105		3495
3106	#############################################################################	3496	#############################################################################
3107		3497
3108	package CFClient::UI::Multiplexer;	3498	package CFPlus::UI::Multiplexer;
3109		3499
3110	our @ISA = CFClient::UI::Container::;	3500	our @ISA = CFPlus::UI::Container::;
3111		3501
3112	sub new {	3502	sub new {
3113	my $class = shift;	3503	my $class = shift;
3114		3504
3115	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
…		…
3129		3519
3130	$self->{current} = $self->{children}[0]	3520	$self->{current} = $self->{children}[0]
3131	if @{ $self->{children} };	3521	if @{ $self->{children} };
3132	}	3522	}
3133		3523
		3524	sub get_current_page {
		3525	my ($self) = @_;
		3526
		3527	$self->{current}
		3528	}
		3529
3134	sub set_current_page {	3530	sub set_current_page {
3135	my ($self, $page_or_widget) = @_;	3531	my ($self, $page_or_widget) = @_;
3136		3532
3137	my $widget = ref $page_or_widget	3533	my $widget = ref $page_or_widget
3138	? $page_or_widget	3534	? $page_or_widget
…		…
3170	$self->{current}->draw;	3566	$self->{current}->draw;
3171	}	3567	}
3172		3568
3173	#############################################################################	3569	#############################################################################
3174		3570
3175	package CFClient::UI::Notebook;	3571	package CFPlus::UI::Notebook;
3176		3572
3177	our @ISA = CFClient::UI::VBox::;	3573	our @ISA = CFPlus::UI::VBox::;
3178		3574
3179	sub new {	3575	sub new {
3180	my $class = shift;	3576	my $class = shift;
3181		3577
3182	my $self = $class->SUPER::new (	3578	my $self = $class->SUPER::new (
3183	buttonbar => (new CFClient::UI::Buttonbar),	3579	buttonbar => (new CFPlus::UI::Buttonbar),
3184	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3185	# filter => # will be put between multiplexer and $self	3581	# filter => # will be put between multiplexer and $self
3186	@_,	3582	@_,
3187	);	3583	);
3188		3584
3189	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3193	}	3589	}
3194		3590
3195	sub add {	3591	sub add {
3196	my ($self, $title, $widget, $tooltip) = @_;	3592	my ($self, $title, $widget, $tooltip) = @_;
3197		3593
3198	Scalar::Util::weaken $self;	3594	CFPlus::weaken $self;
3199		3595
3200	$self->{buttonbar}->add (new CFClient::UI::Button	3596	$self->{buttonbar}->add (new CFPlus::UI::Button
3201	markup => $title,	3597	markup => $title,
3202	tooltip => $tooltip,	3598	tooltip => $tooltip,
3203	on_activate => sub { $self->set_current_page ($widget) },	3599	on_activate => sub { $self->set_current_page ($widget) },
3204	);	3600	);
3205		3601
3206	$self->{multiplexer}->add ($widget);	3602	$self->{multiplexer}->add ($widget);
3207	}	3603	}
3208		3604
		3605	sub get_current_page {
		3606	my ($self) = @_;
		3607
		3608	$self->{multiplexer}->get_current_page
		3609	}
		3610
3209	sub set_current_page {	3611	sub set_current_page {
3210	my ($self, $page) = @_;	3612	my ($self, $page) = @_;
3211		3613
3212	$self->{multiplexer}->set_current_page ($page);	3614	$self->{multiplexer}->set_current_page ($page);
3213	$self->emit (page_changed => $self->{multiplexer}{current});	3615	$self->emit (page_changed => $self->{multiplexer}{current});
3214	}	3616	}
3215		3617
3216	#############################################################################	3618	#############################################################################
3217		3619
3218	package CFClient::UI::Combobox;	3620	package CFPlus::UI::Selector;
3219		3621
3220	use utf8;	3622	use utf8;
3221		3623
3222	our @ISA = CFClient::UI::Button::;	3624	our @ISA = CFPlus::UI::Button::;
3223		3625
3224	sub new {	3626	sub new {
3225	my $class = shift;	3627	my $class = shift;
3226		3628
3227	my $self = $class->SUPER::new (	3629	my $self = $class->SUPER::new (
…		…
3244	my ($value, $title, $tooltip) = @$_;	3646	my ($value, $title, $tooltip) = @$_;
3245		3647
3246	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3648	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247	}	3649	}
3248		3650
3249	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3651	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250	}	3652	}
3251		3653
3252	sub _set_value {	3654	sub _set_value {
3253	my ($self, $value) = @_;	3655	my ($self, $value) = @_;
3254		3656
…		…
3269	$self->emit (changed => $value);	3671	$self->emit (changed => $value);
3270	}	3672	}
3271		3673
3272	#############################################################################	3674	#############################################################################
3273		3675
3274	package CFClient::UI::Statusbox;	3676	package CFPlus::UI::Statusbox;
3275		3677
3276	our @ISA = CFClient::UI::VBox::;	3678	our @ISA = CFPlus::UI::VBox::;
3277		3679
3278	sub new {	3680	sub new {
3279	my $class = shift;	3681	my $class = shift;
3280		3682
3281	my $self = $class->SUPER::new (	3683	my $self = $class->SUPER::new (
3282	fontsize => 0.8,	3684	fontsize => 0.8,
3283	@_,	3685	@_,
3284	);	3686	);
3285		3687
3286	Scalar::Util::weaken (my $this = $self);	3688	CFPlus::weaken (my $this = $self);
3287		3689
3288	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3690	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289		3691
3290	$self	3692	$self
3291	}	3693	}
…		…
3293	sub reorder {	3695	sub reorder {
3294	my ($self) = @_;	3696	my ($self) = @_;
3295	my $NOW = Time::HiRes::time;	3697	my $NOW = Time::HiRes::time;
3296		3698
3297	# freeze display when hovering over any label	3699	# freeze display when hovering over any label
3298	return if $CFClient::UI::TOOLTIP->{owner}	3700	return if $CFPlus::UI::TOOLTIP->{owner}
3299	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3701	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300	values %{ $self->{item} };	3702	values %{ $self->{item} };
3301		3703
3302	while (my ($k, $v) = each %{ $self->{item} }) {	3704	while (my ($k, $v) = each %{ $self->{item} }) {
3303	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3705	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304	}	3706	}
…		…
3325	for ($short) {	3727	for ($short) {
3326	s/^\s+//;	3728	s/^\s+//;
3327	s/\s+/ /g;	3729	s/\s+/ /g;
3328	}	3730	}
3329		3731
3330	new CFClient::UI::Label	3732	new CFPlus::UI::Label
3331	markup => $short,	3733	markup => $short,
3332	tooltip => $item->{tooltip},	3734	tooltip => $item->{tooltip},
3333	tooltip_font => $::FONT_PROP,	3735	tooltip_font => $::FONT_PROP,
3334	tooltip_width => 0.67,	3736	tooltip_width => 0.67,
3335	fontsize => $item->{fontsize} || $self->{fontsize},	3737	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3389	count => 1,	3791	count => 1,
3390	%arg,	3792	%arg,
3391	};	3793	};
3392	}	3794	}
3393		3795
		3796	$ROOT->on_refresh (reorder => sub {
3394	$self->reorder;	3797	$self->reorder;
		3798	});
3395	}	3799	}
3396		3800
3397	sub reconfigure {	3801	sub reconfigure {
3398	my ($self) = @_;	3802	my ($self) = @_;
3399		3803
…		…
3412	$self->SUPER::destroy;	3816	$self->SUPER::destroy;
3413	}	3817	}
3414		3818
3415	#############################################################################	3819	#############################################################################
3416		3820
3417	package CFClient::UI::Inventory;
3418
3419	our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421	sub new {
3422	my $class = shift;
3423
3424	my $self = $class->SUPER::new (
3425	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426	@_,
3427	);
3428
3429	$self
3430	}
3431
3432	sub set_items {
3433	my ($self, $items) = @_;
3434
3435	$self->{child}->clear;
3436	return unless $items;
3437
3438	my @items = sort {
3439	($a->{type} <=> $b->{type})
3440	or ($a->{name} cmp $b->{name})
3441	} @$items;
3442
3443	$self->{real_items} = \@items;
3444
3445	my $row = 0;
3446	for my $item (@items) {
3447	CFClient::Item::update_widgets $item;
3448
3449	$self->{child}->add (0, $row, $item->{face_widget});
3450	$self->{child}->add (1, $row, $item->{desc_widget});
3451	$self->{child}->add (2, $row, $item->{weight_widget});
3452
3453	$row++;
3454	}
3455	}
3456
3457	#############################################################################
3458
3459	package CFClient::UI::BindEditor;
3460
3461	our @ISA = CFClient::UI::FancyFrame::;
3462
3463	sub new {
3464	my $class = shift;
3465
3466	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468	$self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472	text => "start recording",
3473	tooltip => "Start/Stops recording of actions."
3474	."All subsequent actions after the recording started will be captured."
3475	."The actions are displayed after the record was stopped."
3476	."To bind the action you have to click on the 'Bind' button",
3477	on_activate => sub {
3478	unless ($self->{recording}) {
3479	$self->start;
3480	} else {
3481	$self->stop;
3482	}
3483	});
3484
3485	$vb->add (new CFClient::UI::Label text => "Actions:");
3486	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3489	$vb->add (my $hb = new CFClient::UI::HBox);
3490	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491	$hb->add (new CFClient::UI::Button
3492	text => "bind",
3493	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494	on_activate => sub {
3495	$self->ask_for_bind;
3496	});
3497
3498	$vb->add (my $hb = new CFClient::UI::HBox);
3499	$hb->add (new CFClient::UI::Button
3500	text => "ok",
3501	expand => 1,
3502	tooltip => "This closes the binding editor and saves the binding",
3503	on_activate => sub {
3504	$self->hide;
3505	$self->commit;
3506	});
3507
3508	$hb->add (new CFClient::UI::Button
3509	text => "cancel",
3510	expand => 1,
3511	tooltip => "This closes the binding editor without saving",
3512	on_activate => sub {
3513	$self->hide;
3514	$self->{binding_cancel}->()
3515	if $self->{binding_cancel};
3516	});
3517
3518	$self->update_binding_widgets;
3519
3520	$self
3521	}
3522
3523	sub cfg_bind {
3524	my ($self, $mod, $sym, $cmds) = @_;
3525	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526	::update_bindings ();
3527	}
3528
3529	sub cfg_unbind {
3530	my ($self, $mod, $sym, $cmds) = @_;
3531	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532	::update_bindings ();
3533	}
3534
3535	sub commit {
3536	my ($self) = @_;
3537	my ($mod, $sym, $cmds) = $self->get_binding;
3538	if ($sym != 0 && @$cmds > 0) {
3539	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540	."'. Don't forget 'Save Config'!");
3541	$self->{binding_change}->($mod, $sym, $cmds)
3542	if $self->{binding_change};
3543	} else {
3544	$::STATUSBOX->add ("No action bound, no key or action specified!");
3545	$self->{binding_cancel}->()
3546	if $self->{binding_cancel};
3547	}
3548	}
3549
3550	sub start {
3551	my ($self) = @_;
3552
3553	$self->{rec_btn}->set_text ("stop recording");
3554	$self->{recording} = 1;
3555	$self->clear_command_list;
3556	$::CONN->start_record if $::CONN;
3557	}
3558
3559	sub stop {
3560	my ($self) = @_;
3561
3562	$self->{rec_btn}->set_text ("start recording");
3563	$self->{recording} = 0;
3564
3565	my $rec;
3566	$rec = $::CONN->stop_record if $::CONN;
3567	return unless ref $rec eq 'ARRAY';
3568	$self->set_command_list ($rec);
3569	}
3570
3571
3572	sub ask_for_bind_and_commit {
3573	my ($self) = @_;
3574	$self->ask_for_bind (1);
3575	}
3576
3577	sub ask_for_bind {
3578	my ($self, $commit, $end_cb) = @_;
3579
3580	CFClient::Binder::open_binding_dialog (sub {
3581	my ($mod, $sym) = @_;
3582	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583	$self->update_binding_widgets;
3584	$self->commit if $commit;
3585	$end_cb->() if $end_cb;
3586	});
3587	}
3588
3589	# $mod and $sym are the modifiers and key symbol
3590	# $cmds is a array ref of strings (the commands)
3591	# $cb is the callback that is executed on OK
3592	# $ccb is the callback that is executed on CANCEL and
3593	# when the binding was unsuccessful on OK
3594	sub set_binding {
3595	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597	$self->clear_command_list;
3598	$self->{recording} = 0;
3599	$self->{rec_btn}->set_text ("start recording");
3600
3601	$self->{binding} = [$mod, $sym];
3602	$self->{commands} = $cmds;
3603
3604	$self->{binding_change} = $cb;
3605	$self->{binding_cancel} = $ccb;
3606
3607	$self->update_binding_widgets;
3608	}
3609
3610	# this is a shortcut method that asks for a binding
3611	# and then just binds it.
3612	sub do_quick_binding {
3613	my ($self, $cmds, $end_cb) = @_;
3614	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615	$self->ask_for_bind (1, $end_cb);
3616	}
3617
3618	sub update_binding_widgets {
3619	my ($self) = @_;
3620	my ($mod, $sym, $cmds) = $self->get_binding;
3621	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622	$self->set_command_list ($cmds);
3623	}
3624
3625	sub get_binding {
3626	my ($self) = @_;
3627	return (
3628	$self->{binding}->[0],
3629	$self->{binding}->[1],
3630	[ grep { defined $_ } @{$self->{commands}} ]
3631	);
3632	}
3633
3634	sub clear_command_list {
3635	my ($self) = @_;
3636	$self->{cmdbox}->clear ();
3637	}
3638
3639	sub set_command_list {
3640	my ($self, $cmds) = @_;
3641
3642	$self->{cmdbox}->clear ();
3643	$self->{commands} = $cmds;
3644
3645	my $idx = 0;
3646
3647	for (@$cmds) {
3648	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650	my $i = $idx;
3651	$hb->add (new CFClient::UI::Label text => $_);
3652	$hb->add (new CFClient::UI::Button
3653	text => "delete",
3654	tooltip => "Deletes the action from the record",
3655	on_activate => sub {
3656	$self->{cmdbox}->remove ($hb);
3657	$cmds->[$i] = undef;
3658	});
3659
3660
3661	$idx++
3662	}
3663	}
3664
3665	#############################################################################
3666
3667	package CFClient::UI::SpellList;
3668
3669	our @ISA = CFClient::UI::Table::;
3670
3671	sub new {
3672	my $class = shift;
3673
3674	my $self = $class->SUPER::new (
3675	binding => [],
3676	commands => [],
3677	@_,
3678	)
3679	}
3680
3681	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694	sub rebuild_spell_list {
3695	my ($self) = @_;
3696
3697	$CFClient::UI::ROOT->on_refresh ($self => sub {
3698	$self->clear;
3699
3700	return unless $::CONN;
3701
3702	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708	my $row = 0;
3709
3710	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711	my $spell = $self->{spell}{$_};
3712
3713	$row++;
3714
3715	my $spell_cb = sub {
3716	my ($widget, $ev) = @_;
3717
3718	if ($ev->{button} == 1) {
3719	$::CONN->user_send ("cast $spell->{name}");
3720	} elsif ($ev->{button} == 2) {
3721	$::CONN->user_send ("invoke $spell->{name}");
3722	} elsif ($ev->{button} == 3) {
3723	(new CFClient::UI::Menu
3724	items => [
3725	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727	],
3728	)->popup ($ev);
3729	} else {
3730	return 0;
3731	}
3732
3733	1
3734	};
3735
3736	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738	#TODO: add path info to tooltip
3739	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741	$self->add (0, $row, new CFClient::UI::Face
3742	face => $spell->{face},
3743	can_hover => 1,
3744	can_events => 1,
3745	tooltip => $tooltip,
3746	on_button_down => $spell_cb,
3747	);
3748
3749	$self->add (1, $row, new CFClient::UI::Label
3750	expand => 1,
3751	text => $spell->{name},
3752	can_hover => 1,
3753	can_events => 1,
3754	tooltip => $tooltip,
3755	on_button_down => $spell_cb,
3756	);
3757
3758	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762	}
3763	});
3764	}
3765
3766	sub add_spell {
3767	my ($self, $spell) = @_;
3768
3769	$self->{spell}->{$spell->{name}} = $spell;
3770	$self->rebuild_spell_list;
3771	}
3772
3773	sub remove_spell {
3774	my ($self, $spell) = @_;
3775
3776	delete $self->{spell}->{$spell->{name}};
3777	$self->rebuild_spell_list;
3778	}
3779
3780	sub clear_spells {
3781	my ($self) = @_;
3782
3783	$self->{spell} = {};
3784	$self->rebuild_spell_list;
3785	}
3786
3787	#############################################################################
3788
3789	package CFClient::UI::Root;	3821	package CFPlus::UI::Root;
3790		3822
3791	our @ISA = CFClient::UI::Container::;	3823	our @ISA = CFPlus::UI::Container::;
3792		3824
3793	use List::Util qw(min max);	3825	use List::Util qw(min max);
3794		3826
3795	use CFClient::OpenGL;	3827	use CFPlus::OpenGL;
3796		3828
3797	sub new {	3829	sub new {
3798	my $class = shift;	3830	my $class = shift;
3799		3831
3800	my $self = $class->SUPER::new (	3832	my $self = $class->SUPER::new (
3801	visible => 1,	3833	visible => 1,
3802	@_,	3834	@_,
3803	);	3835	);
3804		3836
3805	Scalar::Util::weaken ($self->{root} = $self);	3837	CFPlus::weaken ($self->{root} = $self);
3806		3838
3807	$self	3839	$self
3808	}	3840	}
3809		3841
3810	sub size_request {	3842	sub size_request {
…		…
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4008	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4009
3978	$w = 0 if $w < 0;	4010	$w = 0 if $w < 0;
3979	$h = 0 if $h < 0;	4011	$h = 0 if $h < 0;
3980		4012
		4013	$w = max $widget->{min_w}, $w;
		4014	$h = max $widget->{min_h}, $h;
		4015
		4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4018
		4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4021
3981	$w = int $w + 0.5;	4022	$w = int $w + 0.5;
3982	$h = int $h + 0.5;	4023	$h = int $h + 0.5;
3983		4024
3984	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4025	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985	$widget->{old_w} = $widget->{w};	4026	$widget->{old_w} = $widget->{w};
…		…
4008	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4049	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009	glMatrixMode GL_MODELVIEW;	4050	glMatrixMode GL_MODELVIEW;
4010	glLoadIdentity;	4051	glLoadIdentity;
4011		4052
4012	{	4053	{
4013	package CFClient::UI::Base;	4054	package CFPlus::UI::Base;
4014		4055
4015	($draw_x, $draw_y, $draw_w, $draw_h) =	4056	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016	(0, 0, $self->{w}, $self->{h});	4057	(0, 0, $self->{w}, $self->{h});
4017	}
4018		4058
4019	$self->_draw;	4059	$self->_draw;
		4060	}
4020	}	4061	}
4021		4062
4022	#############################################################################	4063	#############################################################################
4023		4064
4024	package CFClient::UI;	4065	package CFPlus::UI;
4025		4066
4026	$ROOT = new CFClient::UI::Root;	4067	$ROOT = new CFPlus::UI::Root;
4027	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4068	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028		4069
4029	1	4070	1
4030		4071

Diff Legend

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