ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

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

Diff Legend

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