ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.426 by root, Sat Aug 11 12:07:54 2007 UTC

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

Diff Legend

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