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.313 by root, Sat Jun 24 00:24:09 2006 UTC vs.
Revision 1.421 by root, Wed Aug 1 14:27:21 2007 UTC

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

Diff Legend

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