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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

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

Diff Legend

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