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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.404 by root, Sat Jul 21 22:54:52 2007 UTC

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

Diff Legend

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