ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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