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

Diff Legend

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