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.373 by root, Sun Jul 15 22:39:30 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	scroll_x => 0,
		1067	scroll_y => 1,
		1068	can_events => 1,
979	slider => $slider,	1069	hslider => $hslider,
		1070	vslider => $vslider,
		1071	col_expand => [1, 0],
		1072	row_expand => [1, 0],
980	%arg,	1073	%arg,
981	);	1074	);
982		1075
		1076	$self->{vp} = new CFPlus::UI::ViewPort
		1077	expand => 1,
		1078	scroll_x => $self->{scroll_x},
		1079	scroll_y => $self->{scroll_y},
		1080	;
		1081
		1082	$self->SUPER::add (0, 0, $self->{vp});
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
		1084	$self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
		1085
984	$self->add ($child) if $child;	1086	$self->add ($child) if $child;
985		1087
986	$self	1088	$self
987	}	1089	}
		1090
		1091	#TODO# update range on size_allocate depending on child
988		1092
989	sub add {	1093	sub add {
990	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
991		1095
992	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
993	}	1097	}
994		1098
		1099	sub invoke_mouse_wheel {
		1100	my ($self, $ev) = @_;
		1101
		1102	return 0 unless $ev->{dy}; # only vertical movements
		1103
		1104	$self->{vslider}->emit (mouse_wheel => $ev);
		1105
		1106	1
		1107	}
		1108
		1109	sub update_slider {
		1110	my ($self) = @_;
		1111
		1112	my $child = ($self->{vp} or return)->child;
		1113
		1114	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1115	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1116	#$self->{hslider}->set_visibility ($w1 != $w2);
		1117
		1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120	#$self->{vslider}->set_visibility ($h1 != $h2);
		1121	}
		1122
995	sub update {	1123	sub update {
996	my ($self) = @_;	1124	my ($self) = @_;
997		1125
998	$self->SUPER::update;	1126	$self->SUPER::update;
999		1127	$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	}	1128	}
1004		1129
1005	sub invoke_size_allocate {	1130	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1131	my ($self, $w, $h) = @_;
1007		1132
1008	my $child = $self->{vp}->child;	1133	$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)	1134	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1135	}
1013		1136
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1137	#############################################################################
1018		1138
1019	package CFClient::UI::Frame;	1139	package CFPlus::UI::Frame;
1020		1140
1021	our @ISA = CFClient::UI::Bin::;	1141	our @ISA = CFPlus::UI::Bin::;
1022		1142
1023	use CFClient::OpenGL;	1143	use CFPlus::OpenGL;
1024		1144
1025	sub new {	1145	sub new {
1026	my $class = shift;	1146	my $class = shift;
1027		1147
1028	$class->SUPER::new (	1148	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1174	$self->SUPER::_draw;
1055	}	1175	}
1056		1176
1057	#############################################################################	1177	#############################################################################
1058		1178
1059	package CFClient::UI::FancyFrame;	1179	package CFPlus::UI::FancyFrame;
1060		1180
1061	our @ISA = CFClient::UI::Bin::;	1181	our @ISA = CFPlus::UI::Bin::;
1062		1182
1063	use CFClient::OpenGL;	1183	use CFPlus::OpenGL;
		1184
		1185	sub new {
		1186	my ($class, %arg) = @_;
		1187
		1188	if ((exists $arg{label}) && !ref $arg{label}) {
		1189	$arg{label} = new CFPlus::UI::Label
		1190	align => 1,
		1191	valign => 0,
		1192	text => $arg{label},
		1193	fontsize => ($arg{border} || 0.8) * 0.75;
		1194	}
		1195
		1196	my $self = $class->SUPER::new (
		1197	# label => "",
		1198	fg => [0.6, 0.3, 0.1],
		1199	border => 0.8,
		1200	style => 'single',
		1201	%arg,
		1202	);
		1203
		1204	$self
		1205	}
		1206
		1207	sub add {
		1208	my ($self, @widgets) = @_;
		1209
		1210	$self->SUPER::add (@widgets);
		1211	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1212	}
		1213
		1214	sub border {
		1215	int $_[0]{border} * $::FONTSIZE
		1216	}
		1217
		1218	sub size_request {
		1219	my ($self) = @_;
		1220
		1221	($self->{label_w}, undef) = $self->{label}->size_request
		1222	if $self->{label};
		1223
		1224	my ($w, $h) = $self->SUPER::size_request;
		1225
		1226	(
		1227	$w + $self->border * 2,
		1228	$h + $self->border * 2,
		1229	)
		1230	}
		1231
		1232	sub invoke_size_allocate {
		1233	my ($self, $w, $h) = @_;
		1234
		1235	my $border = $self->border;
		1236
		1237	$w -= List::Util::max 0, $border * 2;
		1238	$h -= List::Util::max 0, $border * 2;
		1239
		1240	if (my $label = $self->{label}) {
		1241	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1242	$label->{h} = List::Util::min $h, $border;
		1243	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1244	}
		1245
		1246	$self->child->configure ($border, $border, $w, $h);
		1247
		1248	1
		1249	}
		1250
		1251	sub _draw {
		1252	my ($self) = @_;
		1253
		1254	my $child = $self->{children}[0];
		1255
		1256	my $border = $self->border;
		1257	my ($w, $h) = ($self->{w}, $self->{h});
		1258
		1259	$child->draw;
		1260
		1261	glColor @{$self->{fg}};
		1262	glBegin GL_LINE_STRIP;
		1263	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1264	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1265	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1266	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1267	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1268	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1269	glEnd;
		1270
		1271	if ($self->{label}) {
		1272	glTranslate $border * 2, 0;
		1273	$self->{label}->_draw;
		1274	}
		1275	}
		1276
		1277	#############################################################################
		1278
		1279	package CFPlus::UI::Toplevel;
		1280
		1281	our @ISA = CFPlus::UI::Bin::;
		1282
		1283	use CFPlus::OpenGL;
1064		1284
1065	my $bg =	1285	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1286	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1287	mipmap => 1, wrap => 1;
1068		1288
1069	my @border =	1289	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1290	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);	1291	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1292
1073	sub new {	1293	sub new {
1074	my ($class, %arg) = @_;	1294	my ($class, %arg) = @_;
1075		1295
1076	my $self = $class->SUPER::new (	1296	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1297	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1298	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1299	border => 0.6,
1080	can_events => 1,	1300	can_events => 1,
1081	min_w => 16,	1301	min_w => 64,
1082	min_h => 16,	1302	min_h => 32,
1083	%arg,	1303	%arg,
1084	);	1304	);
1085		1305
1086	$self->{title_widget} = new CFClient::UI::Label	1306	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1307	align => 0,
1088	valign => 1,	1308	valign => 1,
1089	text => $self->{title},	1309	text => $self->{title},
1090	fontsize => $self->{border},	1310	fontsize => $self->{border},
1091	if exists $self->{title};	1311	if exists $self->{title};
1092		1312
1093	if ($self->{has_close_button}) {	1313	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1314	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1315	new CFPlus::UI::ImageButton
1096	path => 'x1_close.png',	1316	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1317	on_activate => sub { $self->emit ("delete") };
1098		1318
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1319	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1320	}
1101		1321
1102	$self	1322	$self
1103	}	1323	}
1104		1324
1105	sub add {	1325	sub add {
1106	my ($self, @widgets) = @_;	1326	my ($self, @widgets) = @_;
1107		1327
1108	$self->SUPER::add (@widgets);	1328	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1329	$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};	1330	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1331	}
1112		1332
1113	sub border {	1333	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1334	int $_[0]{border} * $::FONTSIZE
1115	}	1335	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1368	$self->child->configure ($border, $border, $w, $h);
1149		1369
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1370	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1371	if $self->{close_button};
1152		1372
		1373	1
		1374	}
		1375
		1376	sub invoke_delete {
		1377	my ($self) = @_;
		1378
		1379	$self->hide;
		1380
1153	1	1381	1
1154	}	1382	}
1155		1383
1156	sub invoke_button_down {	1384	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1385	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1443	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1444
1217	! ! $self->{motion}	1445	! ! $self->{motion}
1218	}	1446	}
1219		1447
		1448	sub invoke_visibility_change {
		1449	my ($self, $visible) = @_;
		1450
		1451	delete $self->{motion} unless $visible;
		1452
		1453	0
		1454	}
		1455
1220	sub _draw {	1456	sub _draw {
1221	my ($self) = @_;	1457	my ($self) = @_;
1222		1458
1223	my $child = $self->{children}[0];	1459	my $child = $self->{children}[0];
1224		1460
…		…
1261	if $self->{close_button};	1497	if $self->{close_button};
1262	}	1498	}
1263		1499
1264	#############################################################################	1500	#############################################################################
1265		1501
1266	package CFClient::UI::Table;	1502	package CFPlus::UI::Table;
1267		1503
1268	our @ISA = CFClient::UI::Base::;	1504	our @ISA = CFPlus::UI::Base::;
1269		1505
1270	use List::Util qw(max sum);	1506	use List::Util qw(max sum);
1271		1507
1272	use CFClient::OpenGL;	1508	use CFPlus::OpenGL;
1273		1509
1274	sub new {	1510	sub new {
1275	my $class = shift;	1511	my $class = shift;
1276		1512
1277	$class->SUPER::new (	1513	$class->SUPER::new (
1278	col_expand => [],	1514	col_expand => [],
		1515	row_expand => [],
1279	@_,	1516	@_,
1280	)	1517	)
1281	}	1518	}
1282		1519
1283	sub children {	1520	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1521	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}	1522	}
1286		1523
1287	sub add {	1524	sub add {
1288	my ($self, $x, $y, $child) = @_;	1525	my ($self) = shift;
1289		1526
		1527	while (@_) {
		1528	my ($x, $y, $child) = splice @_, 0, 3, ();
1290	$child->set_parent ($self);	1529	$child->set_parent ($self);
1291	$self->{children}[$y][$x] = $child;	1530	$self->{children}[$y][$x] = $child;
		1531	}
1292		1532
		1533	$self->{force_realloc} = 1;
		1534	$self->{force_size_alloc} = 1;
1293	$self->realloc;	1535	$self->realloc;
1294	}	1536	}
1295		1537
1296	sub remove {	1538	sub remove {
1297	my ($self, $child) = @_;	1539	my ($self, $child) = @_;
…		…
1353	my ($ws, $hs) = $self->get_wh;	1595	my ($ws, $hs) = $self->get_wh;
1354		1596
1355	my $req_w = (sum @$ws) || 1;	1597	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1598	my $req_h = (sum @$hs) || 1;
1357		1599
1358	# TODO: nicer code && do row_expand	1600	# TODO: nicer code
1359	my @col_expand = @{$self->{col_expand}};	1601	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1602	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1603	my $col_expand = (sum @col_expand) || 1;
1362		1604
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1605	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1606
1367	CFClient::UI::harmonize $ws;	1607	CFPlus::UI::harmonize $ws;
		1608
		1609	my @row_expand = @{$self->{row_expand}};
		1610	@row_expand = (1) x @$ws unless @row_expand;
		1611	my $row_expand = (sum @row_expand) || 1;
		1612
		1613	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1614
1368	CFClient::UI::harmonize $hs;	1615	CFPlus::UI::harmonize $hs;
1369		1616
1370	my $y;	1617	my $y;
1371		1618
1372	for my $r (0 .. $#{$self->{children}}) {	1619	for my $r (0 .. $#{$self->{children}}) {
1373	my $row = $self->{children}[$r]	1620	my $row = $self->{children}[$r]
…		…
1416	}	1663	}
1417	}	1664	}
1418		1665
1419	#############################################################################	1666	#############################################################################
1420		1667
1421	package CFClient::UI::Box;	1668	package CFPlus::UI::Box;
1422		1669
1423	our @ISA = CFClient::UI::Container::;	1670	our @ISA = CFPlus::UI::Container::;
1424		1671
1425	sub size_request {	1672	sub size_request {
1426	my ($self) = @_;	1673	my ($self) = @_;
1427		1674
1428	$self->{vertical}	1675	$self->{vertical}
…		…
1461	$req[$_] += $space * $children[$_]{expand}	1708	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#children;	1709	for 0 .. $#children;
1463	}	1710	}
1464	}	1711	}
1465		1712
1466	CFClient::UI::harmonize \@req;	1713	CFPlus::UI::harmonize \@req;
1467		1714
1468	my $pos = 0;	1715	my $pos = 0;
1469	for (0 .. $#children) {	1716	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1717	my $alloc = $req[$_];
1471	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1718	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1476	1	1723	1
1477	}	1724	}
1478		1725
1479	#############################################################################	1726	#############################################################################
1480		1727
1481	package CFClient::UI::HBox;	1728	package CFPlus::UI::HBox;
1482		1729
1483	our @ISA = CFClient::UI::Box::;	1730	our @ISA = CFPlus::UI::Box::;
1484		1731
1485	sub new {	1732	sub new {
1486	my $class = shift;	1733	my $class = shift;
1487		1734
1488	$class->SUPER::new (	1735	$class->SUPER::new (
…		…
1491	)	1738	)
1492	}	1739	}
1493		1740
1494	#############################################################################	1741	#############################################################################
1495		1742
1496	package CFClient::UI::VBox;	1743	package CFPlus::UI::VBox;
1497		1744
1498	our @ISA = CFClient::UI::Box::;	1745	our @ISA = CFPlus::UI::Box::;
1499		1746
1500	sub new {	1747	sub new {
1501	my $class = shift;	1748	my $class = shift;
1502		1749
1503	$class->SUPER::new (	1750	$class->SUPER::new (
…		…
1506	)	1753	)
1507	}	1754	}
1508		1755
1509	#############################################################################	1756	#############################################################################
1510		1757
1511	package CFClient::UI::Label;	1758	package CFPlus::UI::Label;
1512		1759
1513	our @ISA = CFClient::UI::DrawBG::;	1760	our @ISA = CFPlus::UI::DrawBG::;
1514		1761
1515	use CFClient::OpenGL;	1762	use CFPlus::OpenGL;
1516		1763
1517	sub new {	1764	sub new {
1518	my ($class, %arg) = @_;	1765	my ($class, %arg) = @_;
1519		1766
1520	my $self = $class->SUPER::new (	1767	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1770	#active_bg => none
1524	#font => default_font	1771	#font => default_font
1525	#text => initial text	1772	#text => initial text
1526	#markup => initial narkup	1773	#markup => initial narkup
1527	#max_w => maximum pixel width	1774	#max_w => maximum pixel width
		1775	#style => 0, # render flags
1528	ellipsise => 3, # end	1776	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1777	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1778	fontsize => 1,
1531	align => -1,	1779	align => -1,
1532	valign => -1,	1780	valign => -1,
1533	padding_x => 2,	1781	padding_x => 2,
1534	padding_y => 2,	1782	padding_y => 2,
1535	can_events => 0,	1783	can_events => 0,
1536	%arg	1784	%arg
1537	);	1785	);
1538		1786
1539	if (exists $self->{template}) {	1787	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1788	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1789	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1790	$self->{template} = $layout;
1543	}	1791	}
1544		1792
1545	if (exists $self->{markup}) {	1793	if (exists $self->{markup}) {
…		…
1549	}	1797	}
1550		1798
1551	$self	1799	$self
1552	}	1800	}
1553		1801
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 {	1802	sub update {
1565	my ($self) = @_;	1803	my ($self) = @_;
1566		1804
1567	delete $self->{texture};	1805	delete $self->{texture};
1568	$self->SUPER::update;	1806	$self->SUPER::update;
…		…
1579	my ($self, $text) = @_;	1817	my ($self, $text) = @_;
1580		1818
1581	return if $self->{text} eq "T$text";	1819	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1820	$self->{text} = "T$text";
1583		1821
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1822	$self->{layout}->set_text ($text);
1586		1823
1587	delete $self->{size_req};	1824	delete $self->{size_req};
1588	$self->realloc;	1825	$self->realloc;
1589	$self->update;	1826	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1832	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1833	$self->{text} = "M$markup";
1597		1834
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1835	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1836
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1837	$self->{layout}->set_markup ($markup);
1602		1838
1603	delete $self->{size_req};	1839	delete $self->{size_req};
1604	$self->realloc;	1840	$self->realloc;
1605	$self->update;	1841	$self->update;
…		…
1617		1853
1618	my ($w, $h) = $self->{layout}->size;	1854	my ($w, $h) = $self->{layout}->size;
1619		1855
1620	if (exists $self->{template}) {	1856	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	1857	$self->{template}->set_font ($self->{font}) if $self->{font};
		1858	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1859	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1860
1624	my ($w2, $h2) = $self->{template}->size;	1861	my ($w2, $h2) = $self->{template}->size;
1625		1862
1626	$w = List::Util::max $w, $w2;	1863	$w = List::Util::max $w, $w2;
…		…
1631	};	1868	};
1632		1869
1633	@{ $self->{size_req} }	1870	@{ $self->{size_req} }
1634	}	1871	}
1635		1872
		1873	sub baseline_shift {
		1874	$_[0]{layout}->descent
		1875	}
		1876
1636	sub invoke_size_allocate {	1877	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	1878	my ($self, $w, $h) = @_;
1638		1879
1639	delete $self->{ox};	1880	delete $self->{ox};
1640		1881
…		…
1646		1887
1647	sub set_fontsize {	1888	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	1889	my ($self, $fontsize) = @_;
1649		1890
1650	$self->{fontsize} = $fontsize;	1891	$self->{fontsize} = $fontsize;
		1892	delete $self->{size_req};
1651	delete $self->{texture};	1893	delete $self->{texture};
1652		1894
1653	$self->realloc;	1895	$self->realloc;
1654	}	1896	}
1655		1897
1656	sub reconfigure {	1898	sub reconfigure {
1657	my ($self) = @_;	1899	my ($self) = @_;
1658		1900
1659	delete $self->{size_req};	1901	delete $self->{size_req};
		1902	delete $self->{texture};
1660		1903
1661	$self->SUPER::reconfigure;	1904	$self->SUPER::reconfigure;
1662	}	1905	}
1663		1906
1664	sub _draw {	1907	sub _draw {
1665	my ($self) = @_;	1908	my ($self) = @_;
1666		1909
1667	$self->SUPER::_draw; # draw background, if applicable	1910	$self->SUPER::_draw; # draw background, if applicable
1668		1911
1669	my $tex = $self->{texture} ||= do {	1912	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	1913	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	1914	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	1915	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	1916	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1917	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1918	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		1919
1677	new_from_layout CFClient::Texture $self->{layout}	1920	[$self->{layout}->size]
1678	};	1921	};
1679		1922
1680	unless (exists $self->{ox}) {	1923	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1924	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1925	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	1926	: ($self->{w} - $size->[0]) * 0.5);
1684		1927
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1928	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1929	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	1930	: ($self->{h} - $size->[1]) * 0.5);
1688	};	1931	};
1689		1932
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1933	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1934	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		1935
1695	if ($tex->{format} == GL_ALPHA) {	1936	$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	}	1937	}
1706		1938
1707	#############################################################################	1939	#############################################################################
1708		1940
1709	package CFClient::UI::EntryBase;	1941	package CFPlus::UI::EntryBase;
1710		1942
1711	our @ISA = CFClient::UI::Label::;	1943	our @ISA = CFPlus::UI::Label::;
1712		1944
1713	use CFClient::OpenGL;	1945	use CFPlus::OpenGL;
1714		1946
1715	sub new {	1947	sub new {
1716	my $class = shift;	1948	my $class = shift;
1717		1949
1718	$class->SUPER::new (	1950	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	1954	active_fg => [0, 0, 0],
1723	can_hover => 1,	1955	can_hover => 1,
1724	can_focus => 1,	1956	can_focus => 1,
1725	valign => 0,	1957	valign => 0,
1726	can_events => 1,	1958	can_events => 1,
		1959	ellipsise => 0,
1727	#text => ...	1960	#text => ...
1728	#hidden => "*",	1961	#hidden => "*",
1729	@_	1962	@_
1730	)	1963	)
1731	}	1964	}
…		…
1776	my $sym = $ev->{sym};	2009	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2010	my $uni = $ev->{unicode};
1778		2011
1779	my $text = $self->get_text;	2012	my $text = $self->get_text;
1780		2013
		2014	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2015
1781	if ($uni == 8) {	2016	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2017	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2018	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2019	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2020	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2021	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2022	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2023	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2024	} elsif ($sym == CFPlus::SDLK_HOME) {
		2025	# what a hack
		2026	$self->{cursor} =
		2027	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2028	? length $1
		2029	: 0;
		2030	} elsif ($sym == CFPlus::SDLK_END) {
		2031	# uh, again
		2032	$self->{cursor} =
		2033	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2034	? $self->{cursor} + length $1
		2035	: length $self->{text};
		2036	} elsif ($uni == 21) { # ctrl-u
		2037	$text = "";
1790	$self->{cursor} = 0;	2038	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2039	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2040	$self->emit ('escape');
1795	} elsif ($uni) {	2041	} elsif ($uni == 0x0d) {
		2042	substr $text, $self->{cursor}++, 0, "\012";
		2043	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2044	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2045	} else {
1798	return 0;	2046	return 0;
1799	}	2047	}
1800		2048
1801	$self->_set_text ($text);	2049	$self->_set_text ($text);
1802		2050
1803	$self->realloc;	2051	$self->realloc;
		2052	$self->update;
1804		2053
1805	1	2054	1
1806	}	2055	}
1807		2056
1808	sub invoke_focus_in {	2057	sub invoke_focus_in {
…		…
1820		2069
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2070	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2071
1823	# byte-index to char-index	2072	# byte-index to char-index
1824	my $text = $self->{text};	2073	my $text = $self->{text};
1825	utf8::encode $text;	2074	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2075	$self->{cursor} = length $text;
1827		2076
1828	$self->_set_text ($self->{text});	2077	$self->_set_text ($self->{text});
1829	$self->update;	2078	$self->update;
1830		2079
1831	1	2080	1
…		…
1870	utf8::encode $text;	2119	utf8::encode $text;
1871		2120
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2121	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2122	}
1874		2123
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2124	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2125	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};	2126	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2127	glEnd;
1880	}	2128	}
1881	}	2129	}
1882		2130
		2131	#############################################################################
		2132
1883	package CFClient::UI::Entry;	2133	package CFPlus::UI::Entry;
1884		2134
1885	our @ISA = CFClient::UI::EntryBase::;	2135	our @ISA = CFPlus::UI::EntryBase::;
1886		2136
1887	use CFClient::OpenGL;	2137	use CFPlus::OpenGL;
1888		2138
1889	sub invoke_key_down {	2139	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2140	my ($self, $ev) = @_;
1891		2141
1892	my $sym = $ev->{sym};	2142	my $sym = $ev->{sym};
1893		2143
1894	if ($sym == 13) {	2144	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2145	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2146	my $txt = $self->get_text;
1897		2147
1898	$self->{history_pointer} = -1;	2148	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2149	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2150	$self->emit (activate => $txt);
1901	$self->update;	2151	$self->update;
1902		2152
1903	} elsif ($sym == CFClient::SDLK_UP) {	2153	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2154	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2155	$self->{history_saveback} = $self->get_text;
1906	}	2156	}
1907	if (@{$self->{history} || []} > 0) {	2157	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2158	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2160	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2161	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2162	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2163	}
1914		2164
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2165	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2166	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2167	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2168
1919	if ($self->{history_pointer} >= 0) {	2169	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2170	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2179	1
1930	}	2180	}
1931		2181
1932	#############################################################################	2182	#############################################################################
1933		2183
		2184	package CFPlus::UI::TextEdit;
		2185
		2186	our @ISA = CFPlus::UI::EntryBase::;
		2187
		2188	use CFPlus::OpenGL;
		2189
		2190	sub move_cursor_ver {
		2191	my ($self, $dy) = @_;
		2192
		2193	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2194
		2195	$y += $dy;
		2196
		2197	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2198	$self->{cursor} = $index;
		2199	delete $self->{cur_h};
		2200	$self->update;
		2201	return;
		2202	}
		2203	}
		2204
		2205	sub invoke_key_down {
		2206	my ($self, $ev) = @_;
		2207
		2208	my $sym = $ev->{sym};
		2209
		2210	if ($sym == CFPlus::SDLK_UP) {
		2211	$self->move_cursor_ver (-1);
		2212	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2213	$self->move_cursor_ver (+1);
		2214	} else {
		2215	return $self->SUPER::invoke_key_down ($ev)
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	#############################################################################
		2222
1934	package CFClient::UI::Button;	2223	package CFPlus::UI::Button;
1935		2224
1936	our @ISA = CFClient::UI::Label::;	2225	our @ISA = CFPlus::UI::Label::;
1937		2226
1938	use CFClient::OpenGL;	2227	use CFPlus::OpenGL;
1939		2228
1940	my @tex =	2229	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2230	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2231	qw(b1_button_active.png);
1943		2232
1944	sub new {	2233	sub new {
1945	my $class = shift;	2234	my $class = shift;
1946		2235
…		…
1983	$self->SUPER::_draw;	2272	$self->SUPER::_draw;
1984	}	2273	}
1985		2274
1986	#############################################################################	2275	#############################################################################
1987		2276
		2277	package CFPlus::UI::CheckBox;
		2278
		2279	our @ISA = CFPlus::UI::DrawBG::;
		2280
		2281	my @tex =
		2282	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2283	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2284
		2285	use CFPlus::OpenGL;
		2286
		2287	sub new {
		2288	my $class = shift;
		2289
		2290	$class->SUPER::new (
		2291	padding_x => 2,
		2292	padding_y => 2,
		2293	fg => [1, 1, 1],
		2294	active_fg => [1, 1, 0],
		2295	bg => [0, 0, 0, 0.2],
		2296	active_bg => [1, 1, 1, 0.5],
		2297	state => 0,
		2298	can_hover => 1,
		2299	@_
		2300	)
		2301	}
		2302
		2303	sub size_request {
		2304	my ($self) = @_;
		2305
		2306	(6) x 2
		2307	}
		2308
		2309	sub toggle {
		2310	my ($self) = @_;
		2311
		2312	$self->{state} = !$self->{state};
		2313	$self->emit (changed => $self->{state});
		2314	$self->update;
		2315	}
		2316
		2317	sub invoke_button_down {
		2318	my ($self, $ev, $x, $y) = @_;
		2319
		2320	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2321	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2322	$self->toggle;
		2323	} else {
		2324	return 0
		2325	}
		2326
		2327	1
		2328	}
		2329
		2330	sub _draw {
		2331	my ($self) = @_;
		2332
		2333	$self->SUPER::_draw;
		2334
		2335	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2336
		2337	my ($w, $h) = @$self{qw(w h)};
		2338
		2339	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2340
		2341	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2342
		2343	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2344
		2345	glEnable GL_TEXTURE_2D;
		2346	$tex->draw_quad_alpha (0, 0, $s, $s);
		2347	glDisable GL_TEXTURE_2D;
		2348	}
		2349
		2350	#############################################################################
		2351
		2352	package CFPlus::UI::Image;
		2353
		2354	our @ISA = CFPlus::UI::Base::;
		2355
		2356	use CFPlus::OpenGL;
		2357
		2358	our %texture_cache;
		2359
		2360	sub new {
		2361	my $class = shift;
		2362
		2363	my $self = $class->SUPER::new (
		2364	can_events => 0,
		2365	@_,
		2366	);
		2367
		2368	$self->{path} || $self->{tex}
		2369	or Carp::croak "'path' or 'tex' attributes required";
		2370
		2371	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2372	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2373
		2374	CFPlus::weaken $texture_cache{$self->{path}};
		2375
		2376	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2377
		2378	$self
		2379	}
		2380
		2381	sub STORABLE_freeze {
		2382	my ($self, $cloning) = @_;
		2383
		2384	$self->{path}
		2385	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2386
		2387	$self->{path}
		2388	}
		2389
		2390	sub STORABLE_attach {
		2391	my ($self, $cloning, $path) = @_;
		2392
		2393	$self->new (path => $path)
		2394	}
		2395
		2396	sub size_request {
		2397	my ($self) = @_;
		2398
		2399	($self->{tex}{w}, $self->{tex}{h})
		2400	}
		2401
		2402	sub _draw {
		2403	my ($self) = @_;
		2404
		2405	my $tex = $self->{tex};
		2406
		2407	my ($w, $h) = ($self->{w}, $self->{h});
		2408
		2409	if ($self->{rot90}) {
		2410	glRotate 90, 0, 0, 1;
		2411	glTranslate 0, -$self->{w}, 0;
		2412
		2413	($w, $h) = ($h, $w);
		2414	}
		2415
		2416	glEnable GL_TEXTURE_2D;
		2417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2418
		2419	$tex->draw_quad (0, 0, $w, $h);
		2420
		2421	glDisable GL_TEXTURE_2D;
		2422	}
		2423
		2424	#############################################################################
		2425
1988	package CFClient::UI::ImageButton;	2426	package CFPlus::UI::ImageButton;
1989		2427
1990	our @ISA = CFClient::UI::Image::;	2428	our @ISA = CFPlus::UI::Image::;
1991		2429
1992	use CFClient::OpenGL;	2430	use CFPlus::OpenGL;
1993		2431
1994	my %textures;	2432	my %textures;
1995		2433
1996	sub new {	2434	sub new {
1997	my $class = shift;	2435	my $class = shift;
…		…
2019	1	2457	1
2020	}	2458	}
2021		2459
2022	#############################################################################	2460	#############################################################################
2023		2461
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;	2462	package CFPlus::UI::VGauge;
2093		2463
2094	our @ISA = CFClient::UI::Base::;	2464	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		2465
2155	use List::Util qw(min max);	2466	use List::Util qw(min max);
2156		2467
2157	use CFClient::OpenGL;	2468	use CFPlus::OpenGL;
2158		2469
2159	my %tex = (	2470	my %tex = (
2160	food => [	2471	food => [
2161	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2472	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2473	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163	],	2474	],
2164	grace => [	2475	grace => [
2165	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2476	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/	2477	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167	],	2478	],
2168	hp => [	2479	hp => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2480	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2481	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171	],	2482	],
2172	mana => [	2483	mana => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2484	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/	2485	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175	],	2486	],
2176	);	2487	);
2177		2488
2178	# eg. VGauge->new (gauge => 'food'), default gauge: food	2489	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2238	my $ycut1 = max 0, min 1, $ycut;	2549	my $ycut1 = max 0, min 1, $ycut;
2239	my $ycut2 = max 0, min 1, $ycut - 1;	2550	my $ycut2 = max 0, min 1, $ycut - 1;
2240		2551
2241	my $h1 = $self->{h} * (1 - $ycut1);	2552	my $h1 = $self->{h} * (1 - $ycut1);
2242	my $h2 = $self->{h} * (1 - $ycut2);	2553	my $h2 = $self->{h} * (1 - $ycut2);
		2554	my $h3 = $self->{h};
		2555
		2556	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243		2557
2244	glEnable GL_BLEND;	2558	glEnable GL_BLEND;
2245	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2559	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2560	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247	glEnable GL_TEXTURE_2D;	2561	glEnable GL_TEXTURE_2D;
…		…
2266		2580
2267	if ($t3) {	2581	if ($t3) {
2268	glBindTexture GL_TEXTURE_2D, $t3->{name};	2582	glBindTexture GL_TEXTURE_2D, $t3->{name};
2269	glBegin GL_QUADS;	2583	glBegin GL_QUADS;
2270	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2584	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2585	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2586	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2587	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274	glEnd;	2588	glEnd;
2275	}	2589	}
2276		2590
2277	glDisable GL_BLEND;	2591	glDisable GL_BLEND;
2278	glDisable GL_TEXTURE_2D;	2592	glDisable GL_TEXTURE_2D;
2279	}	2593	}
2280		2594
2281	#############################################################################	2595	#############################################################################
2282		2596
2283	package CFClient::UI::Gauge;	2597	package CFPlus::UI::Gauge;
2284		2598
2285	our @ISA = CFClient::UI::VBox::;	2599	our @ISA = CFPlus::UI::VBox::;
2286		2600
2287	sub new {	2601	sub new {
2288	my ($class, %arg) = @_;	2602	my ($class, %arg) = @_;
2289		2603
2290	my $self = $class->SUPER::new (	2604	my $self = $class->SUPER::new (
…		…
2292	can_hover => 1,	2606	can_hover => 1,
2293	can_events => 1,	2607	can_events => 1,
2294	%arg,	2608	%arg,
2295	);	2609	);
2296		2610
2297	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2611	$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);	2612	$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");	2613	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2300		2614
2301	$self	2615	$self
2302	}	2616	}
2303		2617
2304	sub set_fontsize {	2618	sub set_fontsize {
…		…
2325	$self->{value}->set_text ($val);	2639	$self->{value}->set_text ($val);
2326	}	2640	}
2327		2641
2328	#############################################################################	2642	#############################################################################
2329		2643
2330	package CFClient::UI::Slider;	2644	package CFPlus::UI::Slider;
2331		2645
2332	use strict;	2646	use strict;
2333		2647
2334	use CFClient::OpenGL;	2648	use CFPlus::OpenGL;
2335		2649
2336	our @ISA = CFClient::UI::DrawBG::;	2650	our @ISA = CFPlus::UI::DrawBG::;
2337		2651
2338	my @tex =	2652	my @tex =
2339	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340	qw(s1_slider.png s1_slider_bg.png);	2654	qw(s1_slider.png s1_slider_bg.png);
2341		2655
2342	sub new {	2656	sub new {
2343	my $class = shift;	2657	my $class = shift;
2344		2658
…		…
2433	}	2747	}
2434		2748
2435	1	2749	1
2436	}	2750	}
2437		2751
		2752	sub invoke_mouse_wheel {
		2753	my ($self, $ev) = @_;
		2754
		2755	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2756
		2757	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2758
		2759	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2760
		2761	! ! $delta
		2762	}
		2763
2438	sub update {	2764	sub update {
2439	my ($self) = @_;	2765	my ($self) = @_;
2440		2766
2441	delete $self->{knob_w};	2767	delete $self->{knob_w};
2442	$self->SUPER::update;	2768	$self->SUPER::update;
…		…
2489	glDisable GL_TEXTURE_2D;	2815	glDisable GL_TEXTURE_2D;
2490	}	2816	}
2491		2817
2492	#############################################################################	2818	#############################################################################
2493		2819
2494	package CFClient::UI::ValSlider;	2820	package CFPlus::UI::ValSlider;
2495		2821
2496	our @ISA = CFClient::UI::HBox::;	2822	our @ISA = CFPlus::UI::HBox::;
2497		2823
2498	sub new {	2824	sub new {
2499	my ($class, %arg) = @_;	2825	my ($class, %arg) = @_;
2500		2826
2501	my $range = delete $arg{range};	2827	my $range = delete $arg{range};
2502		2828
2503	my $self = $class->SUPER::new (	2829	my $self = $class->SUPER::new (
2504	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2830	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2831	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506	to_value => sub { shift },	2832	to_value => sub { shift },
2507	from_value => sub { shift },	2833	from_value => sub { shift },
2508	%arg,	2834	%arg,
2509	);	2835	);
2510		2836
…		…
2530	sub set_range { shift->{slider}->set_range (@_) }	2856	sub set_range { shift->{slider}->set_range (@_) }
2531	sub set_value { shift->{slider}->set_value (@_) }	2857	sub set_value { shift->{slider}->set_value (@_) }
2532		2858
2533	#############################################################################	2859	#############################################################################
2534		2860
2535	package CFClient::UI::TextScroller;	2861	package CFPlus::UI::TextScroller;
2536		2862
2537	our @ISA = CFClient::UI::HBox::;	2863	our @ISA = CFPlus::UI::HBox::;
2538		2864
2539	use CFClient::OpenGL;	2865	use CFPlus::OpenGL;
2540		2866
2541	sub new {	2867	sub new {
2542	my $class = shift;	2868	my $class = shift;
2543		2869
2544	my $self = $class->SUPER::new (	2870	my $self = $class->SUPER::new (
2545	fontsize => 1,	2871	fontsize => 1,
2546	can_events => 0,	2872	can_events => 1,
2547	indent => 0,	2873	indent => 0,
2548	#font => default_font	2874	#font => default_font
2549	@_,	2875	@_,
2550		2876
2551	layout => (new CFClient::Layout 1),	2877	layout => (new CFPlus::Layout),
2552	par => [],	2878	par => [],
		2879	max_par => 0,
2553	height => 0,	2880	height => 0,
2554	children => [	2881	children => [
2555	(new CFClient::UI::Empty expand => 1),	2882	(new CFPlus::UI::Empty expand => 1),
2556	(new CFClient::UI::Slider vertical => 1),	2883	(new CFPlus::UI::Slider vertical => 1),
2557	],	2884	],
2558	);	2885	);
2559		2886
2560	$self->{children}[1]->connect (changed => sub { $self->update });	2887	$self->{children}[1]->connect (changed => sub { $self->update });
2561		2888
…		…
2567		2894
2568	$self->{fontsize} = $fontsize;	2895	$self->{fontsize} = $fontsize;
2569	$self->reflow;	2896	$self->reflow;
2570	}	2897	}
2571		2898
2572	sub visible_children {	2899	sub size_request {
2573	my ($self) = @_;	2900	my ($self) = @_;
2574		2901
2575	@{$self->{children}}[0,1]	2902	my ($empty, $slider) = @{ $self->{children} };
		2903
		2904	local $self->{children} = [$empty, $slider];
		2905	$self->SUPER::size_request
2576	}	2906	}
2577		2907
2578	sub invoke_size_allocate {	2908	sub invoke_size_allocate {
2579	my ($self, $w, $h) = @_;	2909	my ($self, $w, $h) = @_;
2580		2910
2581	my (undef, undef, @other) = @{ $self->{children} };	2911	my ($empty, $slider, @other) = @{ $self->{children} };
2582	$_->configure (@$_{qw(x y req_w req_h)}) for @other;	2912	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583		2913
2584	$self->{layout}->set_font ($self->{font}) if $self->{font};	2914	$self->{layout}->set_font ($self->{font}) if $self->{font};
2585	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2915	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586	$self->{layout}->set_width ($self->{children}[0]{w});	2916	$self->{layout}->set_width ($empty->{w});
2587	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2917	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588		2918
2589	$self->reflow;	2919	$self->reflow;
2590		2920
		2921	local $self->{children} = [$empty, $slider];
2591	$self->SUPER::invoke_size_allocate ($w, $h)	2922	$self->SUPER::invoke_size_allocate ($w, $h)
		2923	}
		2924
		2925	sub invoke_mouse_wheel {
		2926	my ($self, $ev) = @_;
		2927
		2928	return 0 unless $ev->{dy}; # only vertical movements
		2929
		2930	$self->{children}[1]->emit (mouse_wheel => $ev);
		2931
		2932	1
2592	}	2933	}
2593		2934
2594	sub get_layout {	2935	sub get_layout {
2595	my ($self, $para) = @_;	2936	my ($self, $para) = @_;
2596		2937
2597	my $layout = $self->{layout};	2938	my $layout = $self->{layout};
2598		2939
2599	$layout->set_font ($self->{font}) if $self->{font};	2940	$layout->set_font ($self->{font}) if $self->{font};
		2941	$layout->set_foreground (@{$para->{fg}});
2600	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2942	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601	$layout->set_width ($self->{children}[0]{w} - $para->{indent});	2943	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2944	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603	$layout->set_markup ($para->{markup});	2945	$layout->set_markup ($para->{markup});
2604	$layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});	2946
		2947	$layout->set_shapes (
		2948	map
		2949	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2950	@{$para->{widget}}
		2951	);
2605		2952
2606	$layout	2953	$layout
2607	}	2954	}
2608		2955
2609	sub reflow {	2956	sub reflow {
…		…
2616	sub set_offset {	2963	sub set_offset {
2617	my ($self, $offset) = @_;	2964	my ($self, $offset) = @_;
2618		2965
2619	# todo: base offset on lines or so, not on pixels	2966	# todo: base offset on lines or so, not on pixels
2620	$self->{children}[1]->set_value ($offset);	2967	$self->{children}[1]->set_value ($offset);
		2968	}
		2969
		2970	sub current_paragraph {
		2971	my ($self) = @_;
		2972
		2973	$self->{top_paragraph} - 1
		2974	}
		2975
		2976	sub scroll_to {
		2977	my ($self, $para) = @_;
		2978
		2979	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2980
		2981	$self->{scroll_to} = $para;
		2982	$self->update;
2621	}	2983	}
2622		2984
2623	sub clear {	2985	sub clear {
2624	my ($self) = @_;	2986	my ($self) = @_;
2625		2987
…		…
2630	$self->{height} = 0;	2992	$self->{height} = 0;
2631	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2993	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632	}	2994	}
2633		2995
2634	sub add_paragraph {	2996	sub add_paragraph {
2635	my ($self, $color, $para, $indent) = @_;	2997	my $self = shift;
2636		2998
2637	my ($text, @w) = ref $para ? @$para : $para;	2999	for my $para (@_) {
2638
2639	$para = {	3000	$para = {
		3001	fg => [1, 1, 1, 1],
		3002	indent => 0,
		3003	markup => "",
		3004	widget => [],
		3005	ref $para ? %$para : (markup => $para),
2640	w => 1e10,	3006	w => 1e10,
2641	wrapped => 1,	3007	wrapped => 1,
2642	fg => $color,
2643	indent => $indent,
2644	markup => $text,
2645	widget => \@w,
2646	};	3008	};
2647		3009
2648	$self->add (@w) if @w;	3010	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649	push @{$self->{par}}, $para;	3011	push @{$self->{par}}, $para;
		3012	}
		3013
		3014	if (my $max = $self->{max_par}) {
		3015	shift @{$self->{par}} while @{$self->{par}} > $max;
		3016	}
2650		3017
2651	$self->{need_reflow}++;	3018	$self->{need_reflow}++;
2652	$self->update;	3019	$self->update;
2653	}	3020	}
2654		3021
2655	sub scroll_to_bottom {	3022	sub scroll_to_bottom {
2656	my ($self) = @_;	3023	my ($self) = @_;
2657		3024
2658	$self->{scroll_to_bottom} = 1;	3025	$self->{scroll_to} = $#{$self->{par}};
2659	$self->update;	3026	$self->update;
2660	}	3027	}
2661		3028
		3029	sub force_uptodate {
		3030	my ($self) = @_;
		3031
		3032	if (delete $self->{need_reflow}) {
		3033	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3034
		3035	my $height = 0;
		3036
		3037	for my $para (@{$self->{par}}) {
		3038	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3039	my $layout = $self->get_layout ($para);
		3040	my ($w, $h) = $layout->size;
		3041
		3042	$para->{w} = $w + $para->{indent};
		3043	$para->{h} = $h;
		3044	$para->{wrapped} = $layout->has_wrapped;
		3045	}
		3046
		3047	$para->{y} = $height;
		3048	$height += $para->{h};
		3049	}
		3050
		3051	$self->{height} = $height;
		3052	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3053
		3054	delete $self->{texture};
		3055	}
		3056
		3057	if (my $paridx = delete $self->{scroll_to}) {
		3058	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3059	}
		3060	}
		3061
2662	sub update {	3062	sub update {
2663	my ($self) = @_;	3063	my ($self) = @_;
2664		3064
2665	$self->SUPER::update;	3065	$self->SUPER::update;
2666		3066
2667	return unless $self->{h} > 0;	3067	return unless $self->{h} > 0;
2668		3068
2669	delete $self->{texture};	3069	delete $self->{texture};
2670		3070
2671	$ROOT->on_post_alloc ($self => sub {	3071	$ROOT->on_post_alloc ($self => sub {
		3072	$self->force_uptodate;
		3073
2672	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3074	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673		3075
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 {	3076	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702	glClearColor 0, 0, 0, 0;	3077	glClearColor 0, 0, 0, 0;
2703	glClear GL_COLOR_BUFFER_BIT;	3078	glClear GL_COLOR_BUFFER_BIT;
2704		3079
		3080	package CFPlus::UI::Base;
		3081	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3082	(0, 0, $self->{w}, $self->{h});
		3083
		3084	my $top = int $self->{children}[1]{range}[0];
		3085
		3086	my $paridx = 0;
		3087	my $top_paragraph;
2705	my $top = int $self->{children}[1]{range}[0];	3088	my $top = int $self->{children}[1]{range}[0];
2706		3089
2707	my $y0 = $top;	3090	my $y0 = $top;
2708	my $y1 = $top + $H;	3091	my $y1 = $top + $H;
2709		3092
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}}) {	3093	for my $para (@{$self->{par}}) {
2717	my $h = $para->{h};	3094	my $h = $para->{h};
		3095	my $y = $para->{y};
2718		3096
2719	if ($y0 < $y + $h && $y < $y1) {	3097	if ($y0 < $y + $h && $y < $y1) {
2720
2721	my $layout = $self->get_layout ($para);	3098	my $layout = $self->get_layout ($para);
2722		3099
2723	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725	glRasterPos $para->{indent}, $y - $y0;	3100	$layout->render ($para->{indent}, $y - $y0);
2726	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727		3101
2728	if (my @w = @{ $para->{widget} }) {	3102	if (my @w = @{ $para->{widget} }) {
2729	my @s = $layout->get_shapes;	3103	my @s = $layout->get_shapes;
2730		3104
2731	for (@w) {	3105	for (@w) {
…		…
2737	$_->draw;	3111	$_->draw;
2738	}	3112	}
2739	}	3113	}
2740	}	3114	}
2741		3115
2742	$y += $h;	3116	$paridx++;
		3117	$top_paragraph ||= $paridx if $y >= $top;
2743	}	3118	}
2744		3119
2745	glDisable GL_BLEND;	3120	$self->{top_paragraph} = $top_paragraph;
2746	};	3121	};
2747	});	3122	});
2748	}	3123	}
2749		3124
2750	sub reconfigure {	3125	sub reconfigure {
…		…
2768	$self->{children}[1]->draw;	3143	$self->{children}[1]->draw;
2769	}	3144	}
2770		3145
2771	#############################################################################	3146	#############################################################################
2772		3147
2773	package CFClient::UI::Animator;	3148	package CFPlus::UI::Animator;
2774		3149
2775	use CFClient::OpenGL;	3150	use CFPlus::OpenGL;
2776		3151
2777	our @ISA = CFClient::UI::Bin::;	3152	our @ISA = CFPlus::UI::Bin::;
2778		3153
2779	sub moveto {	3154	sub moveto {
2780	my ($self, $x, $y) = @_;	3155	my ($self, $x, $y) = @_;
2781		3156
2782	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3157	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2810	glPopMatrix;	3185	glPopMatrix;
2811	}	3186	}
2812		3187
2813	#############################################################################	3188	#############################################################################
2814		3189
2815	package CFClient::UI::Flopper;	3190	package CFPlus::UI::Flopper;
2816		3191
2817	our @ISA = CFClient::UI::Button::;	3192	our @ISA = CFPlus::UI::Button::;
2818		3193
2819	sub new {	3194	sub new {
2820	my $class = shift;	3195	my $class = shift;
2821		3196
2822	my $self = $class->SUPER::new (	3197	my $self = $class->SUPER::new (
…		…
2834	$self->{other}->toggle_visibility;	3209	$self->{other}->toggle_visibility;
2835	}	3210	}
2836		3211
2837	#############################################################################	3212	#############################################################################
2838		3213
2839	package CFClient::UI::Tooltip;	3214	package CFPlus::UI::Tooltip;
2840		3215
2841	our @ISA = CFClient::UI::Bin::;	3216	our @ISA = CFPlus::UI::Bin::;
2842		3217
2843	use CFClient::OpenGL;	3218	use CFPlus::OpenGL;
2844		3219
2845	sub new {	3220	sub new {
2846	my $class = shift;	3221	my $class = shift;
2847		3222
2848	$class->SUPER::new (	3223	$class->SUPER::new (
…		…
2851	)	3226	)
2852	}	3227	}
2853		3228
2854	sub set_tooltip_from {	3229	sub set_tooltip_from {
2855	my ($self, $widget) = @_;	3230	my ($self, $widget) = @_;
		3231
		3232	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3233	if $widget->{tooltip} =~ /^#(.*)$/;
2856		3234
2857	my $tooltip = $widget->{tooltip};	3235	my $tooltip = $widget->{tooltip};
2858		3236
2859	if ($ENV{CFPLUS_DEBUG} & 2) {	3237	if ($ENV{CFPLUS_DEBUG} & 2) {
2860	$tooltip .= "\n\n" . (ref $widget) . "\n"	3238	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2864	}	3242	}
2865		3243
2866	$tooltip =~ s/^\n+//;	3244	$tooltip =~ s/^\n+//;
2867	$tooltip =~ s/\n+$//;	3245	$tooltip =~ s/\n+$//;
2868		3246
2869	$self->add (new CFClient::UI::Label	3247	$self->add (new CFPlus::UI::Label
2870	markup => $tooltip,	3248	markup => $tooltip,
2871	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3249	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872	fontsize => 0.8,	3250	fontsize => 0.8,
2873	fg => [0, 0, 0, 1],	3251	style => 1, # FLAG_INVERSE
2874	ellipsise => 0,	3252	ellipsise => 0,
2875	font => ($widget->{tooltip_font} || $::FONT_PROP),	3253	font => ($widget->{tooltip_font} || $::FONT_PROP),
2876	);	3254	);
2877	}	3255	}
2878		3256
…		…
2897		3275
2898	$self->{root}->on_post_alloc ("move_$self" => sub {	3276	$self->{root}->on_post_alloc ("move_$self" => sub {
2899	my $widget = $self->{owner}	3277	my $widget = $self->{owner}
2900	or return;	3278	or return;
2901		3279
		3280	if ($widget->{visible}) {
2902	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3281	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903		3282
2904	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3283	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905	if $x + $self->{w} > $self->{root}{w};	3284	if $x + $self->{w} > $self->{root}{w};
2906		3285
2907	$self->move_abs ($x, $y);	3286	$self->move_abs ($x, $y);
		3287	} else {
		3288	$self->hide;
		3289	}
2908	});	3290	});
2909	}	3291	}
2910		3292
2911	sub _draw {	3293	sub _draw {
2912	my ($self) = @_;	3294	my ($self) = @_;
…		…
2936	$self->SUPER::_draw;	3318	$self->SUPER::_draw;
2937	}	3319	}
2938		3320
2939	#############################################################################	3321	#############################################################################
2940		3322
2941	package CFClient::UI::Face;	3323	package CFPlus::UI::Face;
2942		3324
2943	our @ISA = CFClient::UI::Base::;	3325	our @ISA = CFPlus::UI::DrawBG::;
2944		3326
2945	use CFClient::OpenGL;	3327	use CFPlus::OpenGL;
2946		3328
2947	sub new {	3329	sub new {
2948	my $class = shift;	3330	my $class = shift;
2949		3331
2950	my $self = $class->SUPER::new (	3332	my $self = $class->SUPER::new (
		3333	size_w => 32,
		3334	size_h => 8,
2951	aspect => 1,	3335	aspect => 1,
2952	can_events => 0,	3336	can_events => 0,
2953	@_,	3337	@_,
2954	);	3338	);
2955		3339
2956	if ($self->{anim} && $self->{animspeed}) {	3340	if ($self->{anim} && $self->{animspeed}) {
2957	Scalar::Util::weaken (my $widget = $self);	3341	CFPlus::weaken (my $widget = $self);
2958		3342
2959	$self->{timer} = Event->timer (	3343	$self->{timer} = Event->timer (
2960	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3344	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961	hard => 1,	3345	hard => 1,
2962	interval => $self->{animspeed},	3346	interval => $self->{animspeed},
2963	cb => sub {	3347	cb => sub {
		3348	return unless $::CONN;
		3349
2964	++$widget->{frame};	3350	++$widget->{frame};
		3351	$self->update_face;
2965	$widget->update;	3352	$self->update;
2966	},	3353	},
2967	);	3354	);
		3355
		3356	$self->update_face;
2968	}	3357	}
2969		3358
2970	$self	3359	$self
2971	}	3360	}
2972		3361
		3362	sub update_face {
		3363	my ($self) = @_;
		3364
		3365	return unless $::CONN;
		3366
		3367	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3368	if ($anim && @$anim) {
		3369	delete $self->{wait_face};
		3370	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3371	}
		3372	}
		3373	}
		3374
2973	sub size_request {	3375	sub size_request {
2974	(32, 8)	3376	my ($self) = @_;
		3377
		3378	if ($::CONN) {
		3379	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3380	if (my $tex = $::CONN->{texture}[$faceid]) {
		3381	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3382	} else {
		3383	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3384	$self->realloc;
		3385	});
		3386	}
		3387	}
		3388	}
		3389
		3390	($self->{size_w} || 8, $self->{size_h} || 8)
2975	}	3391	}
2976		3392
2977	sub update {	3393	sub update {
2978	my ($self) = @_;	3394	my ($self) = @_;
2979		3395
…		…
2985	sub _draw {	3401	sub _draw {
2986	my ($self) = @_;	3402	my ($self) = @_;
2987		3403
2988	return unless $::CONN;	3404	return unless $::CONN;
2989		3405
2990	my $face;	3406	$self->SUPER::_draw;
2991		3407
2992	if ($self->{frame}) {
2993	my $anim = $::CONN->{anim}[$self->{anim}];	3408	my $faceid = $::CONN->{faceid}[$self->{face}]
2994		3409	or return;
2995	$face = $anim->[ $self->{frame} % @$anim ]
2996	if $anim && @$anim;
2997	}
2998		3410
2999	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3411	my $tex = $::CONN->{texture}[$faceid];
3000		3412
3001	if ($tex) {	3413	if ($tex) {
3002	glEnable GL_TEXTURE_2D;	3414	glEnable GL_TEXTURE_2D;
3003	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3004	glColor 0, 0, 0, 1;	3416	glColor 0, 0, 0, 1;
…		…
3016	$self->SUPER::destroy;	3428	$self->SUPER::destroy;
3017	}	3429	}
3018		3430
3019	#############################################################################	3431	#############################################################################
3020		3432
3021	package CFClient::UI::Buttonbar;	3433	package CFPlus::UI::Buttonbar;
3022		3434
3023	our @ISA = CFClient::UI::HBox::;	3435	our @ISA = CFPlus::UI::HBox::;
3024		3436
3025	# TODO: should actualyl wrap buttons and other goodies.	3437	# TODO: should actually wrap buttons and other goodies.
3026		3438
3027	#############################################################################	3439	#############################################################################
3028		3440
3029	package CFClient::UI::Menu;	3441	package CFPlus::UI::Menu;
3030		3442
3031	our @ISA = CFClient::UI::FancyFrame::;	3443	our @ISA = CFPlus::UI::Toplevel::;
3032		3444
3033	use CFClient::OpenGL;	3445	use CFPlus::OpenGL;
3034		3446
3035	sub new {	3447	sub new {
3036	my $class = shift;	3448	my $class = shift;
3037		3449
3038	my $self = $class->SUPER::new (	3450	my $self = $class->SUPER::new (
3039	items => [],	3451	items => [],
3040	z => 100,	3452	z => 100,
3041	@_,	3453	@_,
3042	);	3454	);
3043		3455
3044	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3456	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045		3457
3046	for my $item (@{ $self->{items} }) {	3458	for my $item (@{ $self->{items} }) {
3047	my ($widget, $cb, $tooltip) = @$item;	3459	my ($widget, $cb, $tooltip) = @$item;
3048		3460
3049	# handle various types of items, only text for now	3461	# handle various types of items, only text for now
3050	if (!ref $widget) {	3462	if (!ref $widget) {
		3463	if ($widget =~ /\t/) {
		3464	my ($left, $right) = split /\t/, $widget, 2;
		3465
3051	$widget = new CFClient::UI::Label	3466	$widget = new CFPlus::UI::HBox
3052	can_hover => 1,	3467	can_hover => 1,
3053	can_events => 1,	3468	can_events => 1,
		3469	tooltip => $tooltip,
		3470	children => [
		3471	(new CFPlus::UI::Label markup => $left, expand => 1),
		3472	(new CFPlus::UI::Label markup => $right, align => +1),
		3473	],
		3474	;
		3475
		3476	} else {
		3477	$widget = new CFPlus::UI::Label
		3478	can_hover => 1,
		3479	can_events => 1,
3054	markup => $widget,	3480	markup => $widget,
3055	tooltip => $tooltip	3481	tooltip => $tooltip;
		3482	}
3056	}	3483	}
3057		3484
3058	$self->{item}{$widget} = $item;	3485	$self->{item}{$widget} = $item;
3059		3486
3060	$self->{vbox}->add ($widget);	3487	$self->{vbox}->add ($widget);
…		…
3103	1	3530	1
3104	}	3531	}
3105		3532
3106	#############################################################################	3533	#############################################################################
3107		3534
3108	package CFClient::UI::Multiplexer;	3535	package CFPlus::UI::Multiplexer;
3109		3536
3110	our @ISA = CFClient::UI::Container::;	3537	our @ISA = CFPlus::UI::Container::;
3111		3538
3112	sub new {	3539	sub new {
3113	my $class = shift;	3540	my $class = shift;
3114		3541
3115	my $self = $class->SUPER::new (	3542	my $self = $class->SUPER::new (
…		…
3129		3556
3130	$self->{current} = $self->{children}[0]	3557	$self->{current} = $self->{children}[0]
3131	if @{ $self->{children} };	3558	if @{ $self->{children} };
3132	}	3559	}
3133		3560
		3561	sub get_current_page {
		3562	my ($self) = @_;
		3563
		3564	$self->{current}
		3565	}
		3566
3134	sub set_current_page {	3567	sub set_current_page {
3135	my ($self, $page_or_widget) = @_;	3568	my ($self, $page_or_widget) = @_;
3136		3569
3137	my $widget = ref $page_or_widget	3570	my $widget = ref $page_or_widget
3138	? $page_or_widget	3571	? $page_or_widget
…		…
3170	$self->{current}->draw;	3603	$self->{current}->draw;
3171	}	3604	}
3172		3605
3173	#############################################################################	3606	#############################################################################
3174		3607
3175	package CFClient::UI::Notebook;	3608	package CFPlus::UI::Notebook;
3176		3609
3177	our @ISA = CFClient::UI::VBox::;	3610	our @ISA = CFPlus::UI::VBox::;
3178		3611
3179	sub new {	3612	sub new {
3180	my $class = shift;	3613	my $class = shift;
3181		3614
3182	my $self = $class->SUPER::new (	3615	my $self = $class->SUPER::new (
3183	buttonbar => (new CFClient::UI::Buttonbar),	3616	buttonbar => (new CFPlus::UI::Buttonbar),
3184	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3617	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3185	# filter => # will be put between multiplexer and $self	3618	# filter => # will be put between multiplexer and $self
3186	@_,	3619	@_,
3187	);	3620	);
3188		3621
3189	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3622	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3193	}	3626	}
3194		3627
3195	sub add {	3628	sub add {
3196	my ($self, $title, $widget, $tooltip) = @_;	3629	my ($self, $title, $widget, $tooltip) = @_;
3197		3630
3198	Scalar::Util::weaken $self;	3631	CFPlus::weaken $self;
3199		3632
3200	$self->{buttonbar}->add (new CFClient::UI::Button	3633	$self->{buttonbar}->add (new CFPlus::UI::Button
3201	markup => $title,	3634	markup => $title,
3202	tooltip => $tooltip,	3635	tooltip => $tooltip,
3203	on_activate => sub { $self->set_current_page ($widget) },	3636	on_activate => sub { $self->set_current_page ($widget) },
3204	);	3637	);
3205		3638
3206	$self->{multiplexer}->add ($widget);	3639	$self->{multiplexer}->add ($widget);
3207	}	3640	}
3208		3641
		3642	sub get_current_page {
		3643	my ($self) = @_;
		3644
		3645	$self->{multiplexer}->get_current_page
		3646	}
		3647
3209	sub set_current_page {	3648	sub set_current_page {
3210	my ($self, $page) = @_;	3649	my ($self, $page) = @_;
3211		3650
3212	$self->{multiplexer}->set_current_page ($page);	3651	$self->{multiplexer}->set_current_page ($page);
3213	$self->emit (page_changed => $self->{multiplexer}{current});	3652	$self->emit (page_changed => $self->{multiplexer}{current});
3214	}	3653	}
3215		3654
3216	#############################################################################	3655	#############################################################################
3217		3656
3218	package CFClient::UI::Combobox;	3657	package CFPlus::UI::Selector;
3219		3658
3220	use utf8;	3659	use utf8;
3221		3660
3222	our @ISA = CFClient::UI::Button::;	3661	our @ISA = CFPlus::UI::Button::;
3223		3662
3224	sub new {	3663	sub new {
3225	my $class = shift;	3664	my $class = shift;
3226		3665
3227	my $self = $class->SUPER::new (	3666	my $self = $class->SUPER::new (
…		…
3244	my ($value, $title, $tooltip) = @$_;	3683	my ($value, $title, $tooltip) = @$_;
3245		3684
3246	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3685	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247	}	3686	}
3248		3687
3249	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3688	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250	}	3689	}
3251		3690
3252	sub _set_value {	3691	sub _set_value {
3253	my ($self, $value) = @_;	3692	my ($self, $value) = @_;
3254		3693
…		…
3269	$self->emit (changed => $value);	3708	$self->emit (changed => $value);
3270	}	3709	}
3271		3710
3272	#############################################################################	3711	#############################################################################
3273		3712
3274	package CFClient::UI::Statusbox;	3713	package CFPlus::UI::Statusbox;
3275		3714
3276	our @ISA = CFClient::UI::VBox::;	3715	our @ISA = CFPlus::UI::VBox::;
3277		3716
3278	sub new {	3717	sub new {
3279	my $class = shift;	3718	my $class = shift;
3280		3719
3281	my $self = $class->SUPER::new (	3720	my $self = $class->SUPER::new (
3282	fontsize => 0.8,	3721	fontsize => 0.8,
3283	@_,	3722	@_,
3284	);	3723	);
3285		3724
3286	Scalar::Util::weaken (my $this = $self);	3725	CFPlus::weaken (my $this = $self);
3287		3726
3288	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3727	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289		3728
3290	$self	3729	$self
3291	}	3730	}
…		…
3293	sub reorder {	3732	sub reorder {
3294	my ($self) = @_;	3733	my ($self) = @_;
3295	my $NOW = Time::HiRes::time;	3734	my $NOW = Time::HiRes::time;
3296		3735
3297	# freeze display when hovering over any label	3736	# freeze display when hovering over any label
3298	return if $CFClient::UI::TOOLTIP->{owner}	3737	return if $CFPlus::UI::TOOLTIP->{owner}
3299	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3738	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300	values %{ $self->{item} };	3739	values %{ $self->{item} };
3301		3740
3302	while (my ($k, $v) = each %{ $self->{item} }) {	3741	while (my ($k, $v) = each %{ $self->{item} }) {
3303	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3742	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304	}	3743	}
…		…
3325	for ($short) {	3764	for ($short) {
3326	s/^\s+//;	3765	s/^\s+//;
3327	s/\s+/ /g;	3766	s/\s+/ /g;
3328	}	3767	}
3329		3768
3330	new CFClient::UI::Label	3769	new CFPlus::UI::Label
3331	markup => $short,	3770	markup => $short,
3332	tooltip => $item->{tooltip},	3771	tooltip => $item->{tooltip},
3333	tooltip_font => $::FONT_PROP,	3772	tooltip_font => $::FONT_PROP,
3334	tooltip_width => 0.67,	3773	tooltip_width => 0.67,
3335	fontsize => $item->{fontsize} || $self->{fontsize},	3774	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3389	count => 1,	3828	count => 1,
3390	%arg,	3829	%arg,
3391	};	3830	};
3392	}	3831	}
3393		3832
		3833	$ROOT->on_refresh (reorder => sub {
3394	$self->reorder;	3834	$self->reorder;
		3835	});
3395	}	3836	}
3396		3837
3397	sub reconfigure {	3838	sub reconfigure {
3398	my ($self) = @_;	3839	my ($self) = @_;
3399		3840
…		…
3412	$self->SUPER::destroy;	3853	$self->SUPER::destroy;
3413	}	3854	}
3414		3855
3415	#############################################################################	3856	#############################################################################
3416		3857
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;	3858	package CFPlus::UI::Root;
3790		3859
3791	our @ISA = CFClient::UI::Container::;	3860	our @ISA = CFPlus::UI::Container::;
3792		3861
3793	use List::Util qw(min max);	3862	use List::Util qw(min max);
3794		3863
3795	use CFClient::OpenGL;	3864	use CFPlus::OpenGL;
3796		3865
3797	sub new {	3866	sub new {
3798	my $class = shift;	3867	my $class = shift;
3799		3868
3800	my $self = $class->SUPER::new (	3869	my $self = $class->SUPER::new (
3801	visible => 1,	3870	visible => 1,
3802	@_,	3871	@_,
3803	);	3872	);
3804		3873
3805	Scalar::Util::weaken ($self->{root} = $self);	3874	CFPlus::weaken ($self->{root} = $self);
3806		3875
3807	$self	3876	$self
3808	}	3877	}
3809		3878
3810	sub size_request {	3879	sub size_request {
…		…
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4045	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4046
3978	$w = 0 if $w < 0;	4047	$w = 0 if $w < 0;
3979	$h = 0 if $h < 0;	4048	$h = 0 if $h < 0;
3980		4049
		4050	$w = max $widget->{min_w}, $w;
		4051	$h = max $widget->{min_h}, $h;
		4052
		4053	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4054	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4055
		4056	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4057	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4058
3981	$w = int $w + 0.5;	4059	$w = int $w + 0.5;
3982	$h = int $h + 0.5;	4060	$h = int $h + 0.5;
3983		4061
3984	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4062	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985	$widget->{old_w} = $widget->{w};	4063	$widget->{old_w} = $widget->{w};
…		…
4008	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4086	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009	glMatrixMode GL_MODELVIEW;	4087	glMatrixMode GL_MODELVIEW;
4010	glLoadIdentity;	4088	glLoadIdentity;
4011		4089
4012	{	4090	{
4013	package CFClient::UI::Base;	4091	package CFPlus::UI::Base;
4014		4092
4015	($draw_x, $draw_y, $draw_w, $draw_h) =	4093	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016	(0, 0, $self->{w}, $self->{h});	4094	(0, 0, $self->{w}, $self->{h});
4017	}
4018		4095
4019	$self->_draw;	4096	$self->_draw;
		4097	}
4020	}	4098	}
4021		4099
4022	#############################################################################	4100	#############################################################################
4023		4101
4024	package CFClient::UI;	4102	package CFPlus::UI;
4025		4103
4026	$ROOT = new CFClient::UI::Root;	4104	$ROOT = new CFPlus::UI::Root;
4027	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4105	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028		4106
4029	1	4107	1
4030		4108

Diff Legend

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