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.392 by root, Sat Jul 21 13:37:09 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
…		…
541	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
542		602
543	# update screen rectangle	603	# update screen rectangle
544	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
545	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
546	local $draw_w = $draw_x + $self->{w};
547	local $draw_h = $draw_y + $self->{h};
548		606
549	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552		610
…		…
575	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
578	glEnd;	636	glEnd;
579	glPopMatrix;	637	glPopMatrix;
580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581	}	639	}
582		640
583	$self->_draw;	641	$self->_draw;
584	glPopMatrix;	642	glPopMatrix;
585	}	643	}
…		…
588	my ($self) = @_;	646	my ($self) = @_;
589		647
590	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
591	}	649	}
592		650
		651	my $cntx;#d#
593	sub DESTROY {	652	sub DESTROY {
594	my ($self) = @_;	653	my ($self) = @_;
595		654
		655	return if CFPlus::in_destruct;
		656
		657	eval { $self->destroy };
		658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
596	delete $WIDGET{$self+0};	660	delete $WIDGET{$self+0};
597	#$self->deactivate;
598	}	661	}
599		662
600	#############################################################################	663	#############################################################################
601		664
602	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
603		666
604	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
605		668
606	use strict;	669	use strict;
607	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
608		671
609	sub new {	672	sub new {
610	my $class = shift;	673	my $class = shift;
611		674
612	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
643	}	706	}
644	}	707	}
645		708
646	#############################################################################	709	#############################################################################
647		710
648	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
649		712
650	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
651		714
652	sub new {	715	sub new {
653	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
655	}	718	}
…		…
662		725
663	sub draw { }	726	sub draw { }
664		727
665	#############################################################################	728	#############################################################################
666		729
667	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
668		731
669	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
670		733
671	sub new {	734	sub new {
672	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
673		736
674	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
678	can_events => 0,	741	can_events => 0,
679	%arg,	742	%arg,
680	);	743	);
681		744
682	$self->add (@$children)	745	$self->add (@$children)
683	if $children;	746	if $children && @$children;
684		747
685	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
686	}	757	}
687		758
688	sub add {	759	sub add {
689	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
690		761
691	$_->set_parent ($self)	762	$_->set_parent ($self)
692	for @widgets;	763	for @widgets;
693		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
694	use sort 'stable';	766	use sort 'stable';
695		767
696	$self->{children} = [	768	$self->{children} = [
697	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
698	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
752	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
753	}	825	}
754		826
755	#############################################################################	827	#############################################################################
756		828
757	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
758		830
759	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
760		832
761	sub new {	833	sub new {
762	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
763		835
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		837
766	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
767	}	839	}
768		840
769	sub add {	841	sub add {
770	my ($self, $child) = @_;	842	my ($self, $child) = @_;
771		843
772	$self->{children} = [];	844	$self->SUPER::remove ($_) for @{ $self->{children} };
773
774	$self->SUPER::add ($child);	845	$self->SUPER::add ($child);
775	}	846	}
776		847
777	sub remove {	848	sub remove {
778	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
779		850
780	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
781		852
782	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
783	unless @{$self->{children}};	854	unless @{$self->{children}};
784	}	855	}
785		856
786	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
787		858
788	sub size_request {	859	sub size_request {
789	$_[0]{children}[0]->size_request	860	$_[0]{children}[0]->size_request
790	}	861	}
791		862
792	sub size_allocate {	863	sub invoke_size_allocate {
793	my ($self, $w, $h) = @_;	864	my ($self, $w, $h) = @_;
794		865
795	$self->{children}[0]->configure (0, 0, $w, $h);	866	$self->{children}[0]->configure (0, 0, $w, $h);
		867
		868	1
796	}	869	}
797		870
798	#############################################################################	871	#############################################################################
799		872
800	# back-buffered drawing area	873	# back-buffered drawing area
801		874
802	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
803		876
804	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
805		878
806	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
807		880
808	sub new {	881	sub new {
809	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
810		883
811	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
816		889
817	$ROOT->on_post_alloc ($self => sub { $self->render_child });	890	$ROOT->on_post_alloc ($self => sub { $self->render_child });
818	$self->SUPER::update;	891	$self->SUPER::update;
819	}	892	}
820		893
821	sub size_allocate {	894	sub invoke_size_allocate {
822	my ($self, $w, $h) = @_;	895	my ($self, $w, $h) = @_;
823		896
824	$self->SUPER::size_allocate ($w, $h);
825	$self->update;	897	$self->update;
		898
		899	$self->SUPER::invoke_size_allocate ($w, $h)
826	}	900	}
827		901
828	sub _render {	902	sub _render {
829	my ($self) = @_;	903	my ($self) = @_;
830		904
…		…
832	}	906	}
833		907
834	sub render_child {	908	sub render_child {
835	my ($self) = @_;	909	my ($self) = @_;
836		910
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
840		914
841	{	915	{
842	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
843		917
844	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
846	}	922	}
847
848	$self->_render;
849	};	923	};
850	}	924	}
851		925
852	sub _draw {	926	sub _draw {
853	my ($self) = @_;	927	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		928
857	my $tex = $self->{texture}	929	my $tex = $self->{texture}
858	or return;	930	or return;
859		931
860	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
863		935
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
865		937
866	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
867	}	939	}
868		940
869	#############################################################################	941	#############################################################################
870		942
871	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
872		944
		945	use List::Util qw(min max);
		946
873	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
874		948
875	sub new {	949	sub new {
876	my $class = shift;	950	my $class = shift;
877		951
878	$class->SUPER::new (	952	$class->SUPER::new (
…		…
885	sub size_request {	959	sub size_request {
886	my ($self) = @_;	960	my ($self) = @_;
887		961
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		963
890	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
892		966
893	($w, $h)	967	($w, $h)
894	}	968	}
895		969
896	sub size_allocate {	970	sub invoke_size_allocate {
897	my ($self, $w, $h) = @_;	971	my ($self, $w, $h) = @_;
898		972
899	my $child = $self->child;	973	my $child = $self->child;
900		974
901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	975	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	976	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903		977
904	$self->child->configure (0, 0, $w, $h);	978	$self->child->configure (0, 0, $w, $h);
905	$self->update;	979	$self->update;
		980
		981	1
906	}	982	}
907		983
908	sub set_offset {	984	sub set_offset {
909	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
910		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
911	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
912	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
913		993
		994	$self->emit (changed => $x, $y);
914	$self->update;	995	$self->update;
		996	}
915	}	997	}
916		998
917	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
918	sub coord2local {	1000	sub coord2local {
919	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
934	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
935		1017
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1020	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1022	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1024	}
943	}	1025	}
944		1026
945	sub _render {	1027	sub _render {
946	my ($self) = @_;	1028	my ($self) = @_;
947		1029
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1030	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};	1031	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1032
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1034
953	$self->SUPER::_render;	1035	$self->SUPER::_render;
954	}	1036	}
955		1037
956	#############################################################################	1038	#############################################################################
957		1039
958	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
959		1041
960	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
961		1043
962	sub new {	1044	sub new {
963	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
964		1046
965	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
966		1048
967	my $self;	1049	my $self;
968		1050
969	my $slider = new CFClient::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
		1054	vertical => 0,
		1055	range => [0, 0, 1, 0.01], # HACK fix
		1056	on_changed => sub {
		1057	$self->{hpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1059	},
		1060	;
		1061
		1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
970	vertical => 1,	1065	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1067	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1070	},
975	;	1071	;
976		1072
977	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
979	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
980	%arg,	1081	%arg,
981	);	1082	);
982		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
984	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
985		1103
986	$self	1104	$self
987	}	1105	}
		1106
		1107	#TODO# update range on size_allocate depending on child?
988		1108
989	sub add {	1109	sub add {
990	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
991		1111
992	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
993	}	1113	}
994		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider}{visible}) {
		1125	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider}{visible}) {
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
995	sub update {	1139	sub update {
996	my ($self) = @_;	1140	my ($self) = @_;
997		1141
		1142	$self->update_slider;
998	$self->SUPER::update;	1143	$self->SUPER::update;
999
1000	# todo: overwrite size_allocate of child
1001	my $child = $self->{vp}->child;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003	}	1144	}
1004		1145
		1146	sub invoke_mouse_wheel {
		1147	my ($self, $ev) = @_;
		1148
		1149	$self->{vslider}->emit (mouse_wheel => $ev)
		1150	if $ev->{dy};
		1151
		1152	$self->{hslider}->emit (mouse_wheel => $ev)
		1153	if $ev->{dx};
		1154
		1155	1
		1156	}
		1157
		1158	sub invoke_button_down {
		1159	my ($self, $ev, $x, $y) = @_;
		1160
		1161	if ($ev->{button} == 2) {
		1162	$self->grab_focus;
		1163
		1164	my $ox = $self->{vp}{view_x} + $ev->{x};
		1165	my $oy = $self->{vp}{view_y} + $ev->{y};
		1166
		1167	$self->{motion} = sub {
		1168	my ($ev, $x, $y) = @_;
		1169
		1170	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1171	$self->update;
		1172	};
		1173
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_button_up {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if (delete $self->{motion}) {
		1184	return 1;
		1185	}
		1186
		1187	0
		1188	}
		1189
		1190	sub invoke_mouse_motion {
		1191	my ($self, $ev, $x, $y) = @_;
		1192
		1193	if ($self->{motion}) {
		1194	$self->{motion}->($ev, $x, $y);
		1195	return 1;
		1196	}
		1197
		1198	0
		1199	}
		1200
1005	sub size_allocate {	1201	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1202	my ($self, $w, $h) = @_;
1007		1203
		1204	$self->update_slider;
1008	$self->SUPER::size_allocate ($w, $h);	1205	$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	}	1206	}
1013
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016		1207
1017	#############################################################################	1208	#############################################################################
1018		1209
1019	package CFClient::UI::Frame;	1210	package CFPlus::UI::Frame;
1020		1211
1021	our @ISA = CFClient::UI::Bin::;	1212	our @ISA = CFPlus::UI::Bin::;
1022		1213
1023	use CFClient::OpenGL;	1214	use CFPlus::OpenGL;
1024		1215
1025	sub new {	1216	sub new {
1026	my $class = shift;	1217	my $class = shift;
1027		1218
1028	$class->SUPER::new (	1219	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1245	$self->SUPER::_draw;
1055	}	1246	}
1056		1247
1057	#############################################################################	1248	#############################################################################
1058		1249
1059	package CFClient::UI::FancyFrame;	1250	package CFPlus::UI::FancyFrame;
1060		1251
1061	our @ISA = CFClient::UI::Bin::;	1252	our @ISA = CFPlus::UI::Bin::;
1062		1253
1063	use CFClient::OpenGL;	1254	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		1255
1073	sub new {	1256	sub new {
1074	my ($class, %arg) = @_;	1257	my ($class, %arg) = @_;
1075		1258
1076	my $title = delete $arg{title};	1259	if ((exists $arg{label}) && !ref $arg{label}) {
		1260	$arg{label} = new CFPlus::UI::Label
		1261	align => 1,
		1262	valign => 0,
		1263	text => $arg{label},
		1264	fontsize => ($arg{border} || 0.8) * 0.75;
		1265	}
		1266
		1267	my $self = $class->SUPER::new (
		1268	# label => "",
		1269	fg => [0.6, 0.3, 0.1],
		1270	border => 0.8,
		1271	style => 'single',
		1272	%arg,
		1273	);
		1274
		1275	$self
		1276	}
		1277
		1278	sub add {
		1279	my ($self, @widgets) = @_;
		1280
		1281	$self->SUPER::add (@widgets);
		1282	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1283	}
		1284
		1285	sub border {
		1286	int $_[0]{border} * $::FONTSIZE
		1287	}
		1288
		1289	sub size_request {
		1290	my ($self) = @_;
		1291
		1292	($self->{label_w}, undef) = $self->{label}->size_request
		1293	if $self->{label};
		1294
		1295	my ($w, $h) = $self->SUPER::size_request;
		1296
		1297	(
		1298	$w + $self->border * 2,
		1299	$h + $self->border * 2,
		1300	)
		1301	}
		1302
		1303	sub invoke_size_allocate {
		1304	my ($self, $w, $h) = @_;
		1305
		1306	my $border = $self->border;
		1307
		1308	$w -= List::Util::max 0, $border * 2;
		1309	$h -= List::Util::max 0, $border * 2;
		1310
		1311	if (my $label = $self->{label}) {
		1312	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1313	$label->{h} = List::Util::min $h, $border;
		1314	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1315	}
		1316
		1317	$self->child->configure ($border, $border, $w, $h);
		1318
		1319	1
		1320	}
		1321
		1322	sub _draw {
		1323	my ($self) = @_;
		1324
		1325	my $child = $self->{children}[0];
		1326
		1327	my $border = $self->border;
		1328	my ($w, $h) = ($self->{w}, $self->{h});
		1329
		1330	$child->draw;
		1331
		1332	glColor @{$self->{fg}};
		1333	glBegin GL_LINE_STRIP;
		1334	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1336	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1338	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1339	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1340	glEnd;
		1341
		1342	if ($self->{label}) {
		1343	glTranslate $border * 2, 0;
		1344	$self->{label}->_draw;
		1345	}
		1346	}
		1347
		1348	#############################################################################
		1349
		1350	package CFPlus::UI::Toplevel;
		1351
		1352	our @ISA = CFPlus::UI::Bin::;
		1353
		1354	use CFPlus::OpenGL;
		1355
		1356	my $bg =
		1357	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1358	mipmap => 1, wrap => 1;
		1359
		1360	my @border =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1363
		1364	my @icon =
		1365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1366	qw(x1_move.png x1_resize.png);
		1367
		1368	sub new {
		1369	my ($class, %arg) = @_;
1077		1370
1078	my $self = $class->SUPER::new (	1371	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1372	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1373	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1374	border => 0.6,
1082	can_events => 1,	1375	can_events => 1,
1083	min_w => 16,	1376	min_w => 64,
1084	min_h => 16,	1377	min_h => 32,
1085	%arg,	1378	%arg,
1086	);	1379	);
1087		1380
1088	$self->{title} = new CFClient::UI::Label	1381	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1382	align => 0,
1090	valign => 1,	1383	valign => 1,
1091	text => $title,	1384	text => $self->{title},
1092	fontsize => $self->{border}	1385	fontsize => $self->{border},
1093	if defined $title;	1386	if exists $self->{title};
		1387
		1388	if ($self->{has_close_button}) {
		1389	$self->{close_button} =
		1390	new CFPlus::UI::ImageButton
		1391	path => 'x1_close.png',
		1392	on_activate => sub { $self->emit ("delete") };
		1393
		1394	$self->CFPlus::UI::Container::add ($self->{close_button});
		1395	}
1094		1396
1095	$self	1397	$self
1096	}	1398	}
1097		1399
1098	sub add {	1400	sub add {
1099	my ($self, @widgets) = @_;	1401	my ($self, @widgets) = @_;
1100		1402
1101	$self->SUPER::add (@widgets);	1403	$self->SUPER::add (@widgets);
		1404	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1405	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1406	}
1104		1407
1105	sub border {	1408	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1409	int $_[0]{border} * $::FONTSIZE
1107	}	1410	}
1108		1411
1109	sub size_request {	1412	sub size_request {
1110	my ($self) = @_;	1413	my ($self) = @_;
1111		1414
1112	$self->{title}->size_request	1415	$self->{title_widget}->size_request
1113	if $self->{title};	1416	if $self->{title_widget};
		1417
		1418	$self->{close_button}->size_request
		1419	if $self->{close_button};
1114		1420
1115	my ($w, $h) = $self->SUPER::size_request;	1421	my ($w, $h) = $self->SUPER::size_request;
1116		1422
1117	(	1423	(
1118	$w + $self->border * 2,	1424	$w + $self->border * 2,
1119	$h + $self->border * 2,	1425	$h + $self->border * 2,
1120	)	1426	)
1121	}	1427	}
1122		1428
1123	sub size_allocate {	1429	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1430	my ($self, $w, $h) = @_;
1125		1431
1126	if ($self->{title}) {	1432	if ($self->{title_widget}) {
1127	$self->{title}{w} = $w;	1433	$self->{title_widget}{w} = $w;
1128	$self->{title}{h} = $h;	1434	$self->{title_widget}{h} = $h;
1129	$self->{title}->size_allocate ($w, $h);	1435	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1436	}
1131		1437
1132	my $border = $self->border;	1438	my $border = $self->border;
1133		1439
1134	$h -= List::Util::max 0, $border * 2;	1440	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1441	$w -= List::Util::max 0, $border * 2;
		1442
		1443	$self->child->configure ($border, $border, $w, $h);
		1444
		1445	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1446	if $self->{close_button};
		1447
		1448	1
		1449	}
		1450
		1451	sub invoke_delete {
		1452	my ($self) = @_;
		1453
		1454	$self->hide;
1136		1455
1137	$self->child->configure ($border, $border, $w, $h);	1456	1
1138	}	1457	}
1139		1458
1140	sub button_down {	1459	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1460	my ($self, $ev, $x, $y) = @_;
1142		1461
1143	my ($w, $h) = @$self{qw(w h)};	1462	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1463	my $border = $self->border;
1145		1464
…		…
1176		1495
1177	($x, $y) = ($ev->{x}, $ev->{y});	1496	($x, $y) = ($ev->{x}, $ev->{y});
1178		1497
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1498	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1499	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1500	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1501	};
1183	} else {	1502	} else {
1184	return 0;	1503	return 0;
1185	}	1504	}
1186		1505
1187	1	1506	1
1188	}	1507	}
1189		1508
1190	sub button_up {	1509	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1510	my ($self, $ev, $x, $y) = @_;
1192		1511
1193	!!delete $self->{motion}	1512	! ! delete $self->{motion}
1194	}	1513	}
1195		1514
1196	sub mouse_motion {	1515	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1516	my ($self, $ev, $x, $y) = @_;
1198		1517
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1518	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1519
1201	!!$self->{motion}	1520	! ! $self->{motion}
		1521	}
		1522
		1523	sub invoke_visibility_change {
		1524	my ($self, $visible) = @_;
		1525
		1526	delete $self->{motion} unless $visible;
		1527
		1528	0
1202	}	1529	}
1203		1530
1204	sub _draw {	1531	sub _draw {
1205	my ($self) = @_;	1532	my ($self) = @_;
1206		1533
…		…
1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1540	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214		1541
1215	my $border = $self->border;	1542	my $border = $self->border;
1216		1543
1217	glColor @{ $self->{border_bg} };	1544	glColor @{ $self->{border_bg} };
1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1545	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1546	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1547	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1548	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1549
		1550	# move
		1551	my $w2 = ($w - $border) * .5;
		1552	my $h2 = ($h - $border) * .5;
		1553	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1555	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1556
		1557	# resize
		1558	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1560	unless $self->{has_close_button};
		1561	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1562	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222		1563
1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1564	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224	glColor @{ $self->{bg} };	1565	glColor @{ $self->{bg} };
1225		1566
1226	# TODO: repeat texture not scale	1567	# TODO: repeat texture not scale
…		…
1232		1573
1233	glDisable GL_TEXTURE_2D;	1574	glDisable GL_TEXTURE_2D;
1234		1575
1235	$child->draw;	1576	$child->draw;
1236		1577
1237	if ($self->{title}) {	1578	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1579	glTranslate 0, $border - $self->{h};
1239	$self->{title}->_draw;	1580	$self->{title_widget}->_draw;
		1581
		1582	glTranslate 0, - ($border - $self->{h});
1240	}	1583	}
		1584
		1585	$self->{close_button}->draw
		1586	if $self->{close_button};
1241	}	1587	}
1242		1588
1243	#############################################################################	1589	#############################################################################
1244		1590
1245	package CFClient::UI::Table;	1591	package CFPlus::UI::Table;
1246		1592
1247	our @ISA = CFClient::UI::Base::;	1593	our @ISA = CFPlus::UI::Container::;
1248		1594
1249	use List::Util qw(max sum);	1595	use List::Util qw(max sum);
1250		1596
1251	use CFClient::OpenGL;	1597	use CFPlus::OpenGL;
1252		1598
1253	sub new {	1599	sub new {
1254	my $class = shift;	1600	my $class = shift;
1255		1601
1256	$class->SUPER::new (	1602	$class->SUPER::new (
1257	col_expand => [],	1603	col_expand => [],
		1604	row_expand => [],
1258	@_,	1605	@_,
1259	)	1606	)
1260	}	1607	}
1261		1608
1262	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}
1265
1266	sub add {	1609	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) = @_;	1610	my ($self, @widgets) = @_;
		1611
		1612	for my $child (@widgets) {
		1613	$child->{rowspan} ||= 1;
		1614	$child->{colspan} ||= 1;
		1615	}
		1616
		1617	$self->SUPER::add (@widgets);
		1618	}
		1619
		1620	sub add_at {
		1621	my $self = shift;
		1622
		1623	my @widgets;
		1624
		1625	while (@_) {
		1626	my ($col, $row, $child) = splice @_, 0, 3, ();
		1627
		1628	$child->{row} = $row;
		1629	$child->{col} = $col;
		1630
		1631	push @widgets, $child;
		1632	}
		1633
		1634	$self->add (@widgets);
		1635	}
		1636
		1637	sub get_wh {
		1638	my ($self) = @_;
		1639
		1640	my (@w, @h);
1278		1641
1279	my @children = $self->children;	1642	my @children = $self->children;
1280	delete $self->{children};	1643
		1644	# first pass, columns
		1645	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1646	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1647
		1648	my $sw = sum @w[$c .. $c + $cs - 1];
		1649
		1650	if ($w > $sw) {
		1651	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1652	}
1281		1653	}
1282	for (@children) {
1283	delete $_->{parent};
1284	$_->hide;
1285	}
1286		1654
1287	$self->realloc;	1655	# second pass, rows
1288	}	1656	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)};	1657	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1303		1658
1304	$w[$x] = max $w[$x], $w;	1659	my $sh = sum @h[$r .. $r + $rs - 1];
1305	$h[$y] = max $h[$y], $h;	1660
		1661	if ($h > $sh) {
		1662	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1306	}	1663	}
1307	}	1664	}
1308		1665
1309	(\@w, \@h)	1666	(\@w, \@h)
1310	}	1667	}
…		…
1318	(sum @$ws),	1675	(sum @$ws),
1319	(sum @$hs),	1676	(sum @$hs),
1320	)	1677	)
1321	}	1678	}
1322		1679
1323	sub size_allocate {	1680	sub invoke_size_allocate {
1324	my ($self, $w, $h) = @_;	1681	my ($self, $w, $h) = @_;
1325		1682
1326	my ($ws, $hs) = $self->get_wh;	1683	my ($ws, $hs) = $self->get_wh;
1327		1684
1328	my $req_w = (sum @$ws) || 1;	1685	my $req_w = (sum @$ws) || 1;
1329	my $req_h = (sum @$hs) || 1;	1686	my $req_h = (sum @$hs) || 1;
1330		1687
1331	# TODO: nicer code && do row_expand	1688	# now linearly scale the rows/columns to the allocated size
1332	my @col_expand = @{$self->{col_expand}};	1689	my @col_expand = @{$self->{col_expand}};
1333	@col_expand = (1) x @$ws unless @col_expand;	1690	@col_expand = (1) x @$ws unless @col_expand;
1334	my $col_expand = (sum @col_expand) || 1;	1691	my $col_expand = (sum @col_expand) || 1;
1335		1692
1336	# linearly scale sizes
1337	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1693	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339		1694
1340	CFClient::UI::harmonize $ws;	1695	CFPlus::UI::harmonize $ws;
		1696
		1697	my @row_expand = @{$self->{row_expand}};
		1698	@row_expand = (1) x @$ws unless @row_expand;
		1699	my $row_expand = (sum @row_expand) || 1;
		1700
		1701	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1702
1341	CFClient::UI::harmonize $hs;	1703	CFPlus::UI::harmonize $hs;
1342		1704
1343	my $y;	1705	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1706	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1344		1707
1345	for my $r (0 .. $#{$self->{children}}) {	1708	for my $widget ($self->children) {
1346	my $row = $self->{children}[$r]	1709	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1347	or next;
1348		1710
1349	my $x = 0;	1711	$widget->configure (
1350	my $row_h = $hs->[$r];	1712	$x[$c], $y[$r],
		1713	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1351		1714	);
1352	for my $c (0 .. $#$row) {	1715	}
1353	my $col_w = $ws->[$c];
1354		1716
1355	if (my $widget = $row->[$c]) {	1717	1
1356	$widget->configure ($x, $y, $col_w, $row_h);	1718	}
1357	}
1358		1719
1359	$x += $col_w;	1720	#############################################################################
		1721
		1722	package CFPlus::UI::Fixed;
		1723
		1724	use List::Util qw(min max);
		1725
		1726	our @ISA = CFPlus::UI::Container::;
		1727
		1728	sub add {
		1729	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1730
		1731	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1732	$self->SUPER::add ($child);
		1733	}
		1734
		1735	sub _scale($$$) {
		1736	my ($mode, $val, $max) = @_;
		1737
		1738	$mode eq "abs" ? $val
		1739	: $mode eq "rel" ? $val * $max
		1740	: 0
		1741	}
		1742
		1743	sub size_request {
		1744	my ($self) = @_;
		1745
		1746	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1747
		1748	# determine overall size by querying abs widgets
		1749	for my $child ($self->visible_children) {
		1750	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1751
		1752	if ($pos eq "abs") {
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1757	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1360	}	1758	}
1361
1362	$y += $row_h;
1363	}	1759	}
1364		1760
1365	}	1761	my $W = $x2 - $x1;
		1762	my $H = $y2 - $y1;
1366		1763
1367	sub find_widget {	1764	# now layout remaining widgets
		1765	for my $child ($self->visible_children) {
		1766	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1767
		1768	if ($pos ne "abs") {
		1769	$x = _scale $pos, $x, $W;
		1770	$y = _scale $pos, $x, $H;
		1771	$w = _scale $size, $w, $child->{req_w};
		1772	$h = _scale $size, $h, $child->{req_h};
		1773
		1774	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1775	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1776	}
		1777	}
		1778
		1779	my $W = $x2 - $x1;
		1780	my $H = $y2 - $y1;
		1781
		1782	($W, $H)
		1783	}
		1784
		1785	sub invoke_size_allocate {
1368	my ($self, $x, $y) = @_;	1786	my ($self, $W, $H) = @_;
1369		1787
1370	$x -= $self->{x};	1788	for my $child ($self->visible_children) {
1371	$y -= $self->{y};	1789	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1372		1790
1373	my $res;	1791	$x = _scale $pos, $x, $W;
		1792	$y = _scale $pos, $x, $H;
		1793	$w = _scale $size, $w, $child->{req_w};
		1794	$h = _scale $size, $h, $child->{req_h};
1374		1795
1375	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1796	$child->configure ($x, $y, $w, $h);
1376	$res = $_->find_widget ($x, $y)	1797	}
1377	and return $res;	1798
1378	}	1799	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	}	1800	}
1390		1801
1391	#############################################################################	1802	#############################################################################
1392		1803
1393	package CFClient::UI::Box;	1804	package CFPlus::UI::Box;
1394		1805
1395	our @ISA = CFClient::UI::Container::;	1806	our @ISA = CFPlus::UI::Container::;
1396		1807
1397	sub size_request {	1808	sub size_request {
1398	my ($self) = @_;	1809	my ($self) = @_;
1399		1810
1400	$self->{vertical}	1811	$self->{vertical}
…		…
1406	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1817	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1818	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1408	)	1819	)
1409	}	1820	}
1410		1821
1411	sub size_allocate {	1822	sub invoke_size_allocate {
1412	my ($self, $w, $h) = @_;	1823	my ($self, $w, $h) = @_;
1413		1824
1414	my $space = $self->{vertical} ? $h : $w;	1825	my $space = $self->{vertical} ? $h : $w;
1415	my $children = $self->{children};	1826	my @children = $self->visible_children;
1416		1827
1417	my @req;	1828	my @req;
1418		1829
1419	if ($self->{homogeneous}) {	1830	if ($self->{homogeneous}) {
1420	@req = ($space / (@$children || 1)) x @$children;	1831	@req = ($space / (@children || 1)) x @children;
1421	} else {	1832	} else {
1422	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1833	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423	my $req = List::Util::sum @req;	1834	my $req = List::Util::sum @req;
1424		1835
1425	if ($req > $space) {	1836	if ($req > $space) {
1426	# ah well, not enough space	1837	# ah well, not enough space
1427	$_ *= $space / $req for @req;	1838	$_ *= $space / $req for @req;
1428	} else {	1839	} else {
1429	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1840	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430		1841
1431	$space = ($space - $req) / $expand; # remaining space to give away	1842	$space = ($space - $req) / $expand; # remaining space to give away
1432		1843
1433	$req[$_] += $space * $children->[$_]{expand}	1844	$req[$_] += $space * $children[$_]{expand}
1434	for 0 .. $#$children;	1845	for 0 .. $#children;
1435	}	1846	}
1436	}	1847	}
1437		1848
1438	CFClient::UI::harmonize \@req;	1849	CFPlus::UI::harmonize \@req;
1439		1850
1440	my $pos = 0;	1851	my $pos = 0;
1441	for (0 .. $#$children) {	1852	for (0 .. $#children) {
1442	my $alloc = $req[$_];	1853	my $alloc = $req[$_];
1443	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1854	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444		1855
1445	$pos += $alloc;	1856	$pos += $alloc;
1446	}	1857	}
1447		1858
1448	1	1859	1
1449	}	1860	}
1450		1861
1451	#############################################################################	1862	#############################################################################
1452		1863
1453	package CFClient::UI::HBox;	1864	package CFPlus::UI::HBox;
1454		1865
1455	our @ISA = CFClient::UI::Box::;	1866	our @ISA = CFPlus::UI::Box::;
1456		1867
1457	sub new {	1868	sub new {
1458	my $class = shift;	1869	my $class = shift;
1459		1870
1460	$class->SUPER::new (	1871	$class->SUPER::new (
…		…
1463	)	1874	)
1464	}	1875	}
1465		1876
1466	#############################################################################	1877	#############################################################################
1467		1878
1468	package CFClient::UI::VBox;	1879	package CFPlus::UI::VBox;
1469		1880
1470	our @ISA = CFClient::UI::Box::;	1881	our @ISA = CFPlus::UI::Box::;
1471		1882
1472	sub new {	1883	sub new {
1473	my $class = shift;	1884	my $class = shift;
1474		1885
1475	$class->SUPER::new (	1886	$class->SUPER::new (
…		…
1478	)	1889	)
1479	}	1890	}
1480		1891
1481	#############################################################################	1892	#############################################################################
1482		1893
1483	package CFClient::UI::Label;	1894	package CFPlus::UI::Label;
1484		1895
1485	our @ISA = CFClient::UI::DrawBG::;	1896	our @ISA = CFPlus::UI::DrawBG::;
1486		1897
1487	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1488		1899
1489	sub new {	1900	sub new {
1490	my ($class, %arg) = @_;	1901	my ($class, %arg) = @_;
1491		1902
1492	my $self = $class->SUPER::new (	1903	my $self = $class->SUPER::new (
…		…
1495	#active_bg => none	1906	#active_bg => none
1496	#font => default_font	1907	#font => default_font
1497	#text => initial text	1908	#text => initial text
1498	#markup => initial narkup	1909	#markup => initial narkup
1499	#max_w => maximum pixel width	1910	#max_w => maximum pixel width
		1911	#style => 0, # render flags
1500	ellipsise => 3, # end	1912	ellipsise => 3, # end
1501	layout => (new CFClient::Layout),	1913	layout => (new CFPlus::Layout),
1502	fontsize => 1,	1914	fontsize => 1,
1503	align => -1,	1915	align => -1,
1504	valign => -1,	1916	valign => -1,
1505	padding_x => 2,	1917	padding_x => 2,
1506	padding_y => 2,	1918	padding_y => 2,
1507	can_events => 0,	1919	can_events => 0,
1508	%arg	1920	%arg
1509	);	1921	);
1510		1922
1511	if (exists $self->{template}) {	1923	if (exists $self->{template}) {
1512	my $layout = new CFClient::Layout;	1924	my $layout = new CFPlus::Layout;
1513	$layout->set_text (delete $self->{template});	1925	$layout->set_text (delete $self->{template});
1514	$self->{template} = $layout;	1926	$self->{template} = $layout;
1515	}	1927	}
1516		1928
1517	if (exists $self->{markup}) {	1929	if (exists $self->{markup}) {
…		…
1521	}	1933	}
1522		1934
1523	$self	1935	$self
1524	}	1936	}
1525		1937
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 {	1938	sub update {
1537	my ($self) = @_;	1939	my ($self) = @_;
1538		1940
1539	delete $self->{texture};	1941	delete $self->{texture};
1540	$self->SUPER::update;	1942	$self->SUPER::update;
…		…
1551	my ($self, $text) = @_;	1953	my ($self, $text) = @_;
1552		1954
1553	return if $self->{text} eq "T$text";	1955	return if $self->{text} eq "T$text";
1554	$self->{text} = "T$text";	1956	$self->{text} = "T$text";
1555		1957
1556	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557	$self->{layout}->set_text ($text);	1958	$self->{layout}->set_text ($text);
		1959
1558	delete $self->{req_h};	1960	delete $self->{size_req};
1559
1560	$self->realloc;	1961	$self->realloc;
1561	$self->update;	1962	$self->update;
1562	}	1963	}
1563		1964
1564	sub set_markup {	1965	sub set_markup {
…		…
1567	return if $self->{text} eq "M$markup";	1968	return if $self->{text} eq "M$markup";
1568	$self->{text} = "M$markup";	1969	$self->{text} = "M$markup";
1569		1970
1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1971	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571		1972
1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573	$self->{layout}->set_markup ($markup);	1973	$self->{layout}->set_markup ($markup);
		1974
1574	delete $self->{req_h};	1975	delete $self->{size_req};
1575
1576	$self->realloc;	1976	$self->realloc;
1577	$self->update;	1977	$self->update;
1578	}	1978	}
1579		1979
1580	sub size_request {	1980	sub size_request {
1581	my ($self) = @_;	1981	my ($self) = @_;
1582		1982
1583	if (exists $self->{req_h}) {	1983	$self->{size_req} ||= do {
1584	@$self{qw(req_w req_h)}
1585	} else {
1586	$self->{layout}->set_font ($self->{font}) if $self->{font};	1984	$self->{layout}->set_font ($self->{font}) if $self->{font};
1587	$self->{layout}->set_width ($self->{max_w} || -1);	1985	$self->{layout}->set_width ($self->{max_w} || -1);
1588	$self->{layout}->set_ellipsise ($self->{ellipsise});	1986	$self->{layout}->set_ellipsise ($self->{ellipsise});
1589	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1987	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1988	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591		1989
1592	my ($w, $h) = $self->{layout}->size;	1990	my ($w, $h) = $self->{layout}->size;
1593		1991
1594	if (exists $self->{template}) {	1992	if (exists $self->{template}) {
1595	$self->{template}->set_font ($self->{font}) if $self->{font};	1993	$self->{template}->set_font ($self->{font}) if $self->{font};
		1994	$self->{template}->set_width ($self->{max_w} || -1);
1596	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1995	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597		1996
1598	my ($w2, $h2) = $self->{template}->size;	1997	my ($w2, $h2) = $self->{template}->size;
1599		1998
1600	$w = List::Util::max $w, $w2;	1999	$w = List::Util::max $w, $w2;
1601	$h = List::Util::max $h, $h2;	2000	$h = List::Util::max $h, $h2;
1602	}	2001	}
1603		2002
1604	($w, $h)	2003	[$w, $h]
1605	}	2004	};
1606	}
1607		2005
		2006	@{ $self->{size_req} }
		2007	}
		2008
		2009	sub baseline_shift {
		2010	$_[0]{layout}->descent
		2011	}
		2012
1608	sub size_allocate {	2013	sub invoke_size_allocate {
1609	my ($self, $w, $h) = @_;	2014	my ($self, $w, $h) = @_;
1610		2015
1611	delete $self->{ox};	2016	delete $self->{ox};
1612		2017
1613	delete $self->{texture}	2018	delete $self->{texture}
1614	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2019	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2020
		2021	1
1615	}	2022	}
1616		2023
1617	sub set_fontsize {	2024	sub set_fontsize {
1618	my ($self, $fontsize) = @_;	2025	my ($self, $fontsize) = @_;
1619		2026
1620	$self->{fontsize} = $fontsize;	2027	$self->{fontsize} = $fontsize;
		2028	delete $self->{size_req};
1621	delete $self->{texture};	2029	delete $self->{texture};
1622		2030
1623	$self->realloc;	2031	$self->realloc;
1624	}	2032	}
1625		2033
		2034	sub reconfigure {
		2035	my ($self) = @_;
		2036
		2037	delete $self->{size_req};
		2038	delete $self->{texture};
		2039
		2040	$self->SUPER::reconfigure;
		2041	}
		2042
1626	sub _draw {	2043	sub _draw {
1627	my ($self) = @_;	2044	my ($self) = @_;
1628		2045
1629	$self->SUPER::_draw; # draw background, if applicable	2046	$self->SUPER::_draw; # draw background, if applicable
1630		2047
1631	my $tex = $self->{texture} ||= do {	2048	my $size = $self->{texture} ||= do {
1632	$self->{layout}->set_foreground (@{$self->{fg}});	2049	$self->{layout}->set_foreground (@{$self->{fg}});
1633	$self->{layout}->set_font ($self->{font}) if $self->{font};	2050	$self->{layout}->set_font ($self->{font}) if $self->{font};
1634	$self->{layout}->set_width ($self->{w});	2051	$self->{layout}->set_width ($self->{w});
1635	$self->{layout}->set_ellipsise ($self->{ellipsise});	2052	$self->{layout}->set_ellipsise ($self->{ellipsise});
1636	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2053	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2054	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638		2055
1639	new_from_layout CFClient::Texture $self->{layout}	2056	[$self->{layout}->size]
1640	};	2057	};
1641		2058
1642	unless (exists $self->{ox}) {	2059	unless (exists $self->{ox}) {
1643	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2060	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2061	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645	: ($self->{w} - $tex->{w}) * 0.5);	2062	: ($self->{w} - $size->[0]) * 0.5);
1646		2063
1647	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2064	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2065	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649	: ($self->{h} - $tex->{h}) * 0.5);	2066	: ($self->{h} - $size->[1]) * 0.5);
1650	};	2067	};
1651		2068
1652	glEnable GL_TEXTURE_2D;	2069	my $w = List::Util::min $self->{w} + 4, $size->[0];
1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2070	my $h = List::Util::min $self->{h} + 2, $size->[1];
1654		2071
1655	glColor_premultiply @{$self->{fg}}	2072	$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	}	2073	}
1662		2074
1663	#############################################################################	2075	#############################################################################
1664		2076
1665	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1666		2078
1667	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1668		2080
1669	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1670		2082
1671	sub new {	2083	sub new {
1672	my $class = shift;	2084	my $class = shift;
1673		2085
1674	$class->SUPER::new (	2086	$class->SUPER::new (
…		…
1678	active_fg => [0, 0, 0],	2090	active_fg => [0, 0, 0],
1679	can_hover => 1,	2091	can_hover => 1,
1680	can_focus => 1,	2092	can_focus => 1,
1681	valign => 0,	2093	valign => 0,
1682	can_events => 1,	2094	can_events => 1,
		2095	ellipsise => 0,
1683	#text => ...	2096	#text => ...
		2097	#hidden => "*",
1684	@_	2098	@_
1685	)	2099	)
1686	}	2100	}
1687		2101
1688	sub _set_text {	2102	sub _set_text {
…		…
1695	$self->{last_activity} = $::NOW;	2109	$self->{last_activity} = $::NOW;
1696	$self->{text} = $text;	2110	$self->{text} = $text;
1697		2111
1698	$text =~ s/./*/g if $self->{hidden};	2112	$text =~ s/./*/g if $self->{hidden};
1699	$self->{layout}->set_text ("$text ");	2113	$self->{layout}->set_text ("$text ");
1700	delete $self->{req_h};	2114	delete $self->{size_req};
1701		2115
1702	$self->_emit (changed => $self->{text});	2116	$self->emit (changed => $self->{text});
1703		2117
1704	$self->realloc;	2118	$self->realloc;
1705	$self->update;	2119	$self->update;
1706	}	2120	}
1707		2121
…		…
1722	my ($w, $h) = $self->SUPER::size_request;	2136	my ($w, $h) = $self->SUPER::size_request;
1723		2137
1724	($w + 1, $h) # add 1 for cursor	2138	($w + 1, $h) # add 1 for cursor
1725	}	2139	}
1726		2140
1727	sub key_down {	2141	sub invoke_key_down {
1728	my ($self, $ev) = @_;	2142	my ($self, $ev) = @_;
1729		2143
1730	my $mod = $ev->{mod};	2144	my $mod = $ev->{mod};
1731	my $sym = $ev->{sym};	2145	my $sym = $ev->{sym};
1732	my $uni = $ev->{unicode};	2146	my $uni = $ev->{unicode};
1733		2147
1734	my $text = $self->get_text;	2148	my $text = $self->get_text;
		2149
		2150	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1735		2151
1736	if ($uni == 8) {	2152	if ($uni == 8) {
1737	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2153	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1738	} elsif ($uni == 127) {	2154	} elsif ($uni == 127) {
1739	substr $text, $self->{cursor}, 1, "";	2155	substr $text, $self->{cursor}, 1, "";
1740	} elsif ($sym == CFClient::SDLK_LEFT) {	2156	} elsif ($sym == CFPlus::SDLK_LEFT) {
1741	--$self->{cursor} if $self->{cursor};	2157	--$self->{cursor} if $self->{cursor};
1742	} elsif ($sym == CFClient::SDLK_RIGHT) {	2158	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1743	++$self->{cursor} if $self->{cursor} < length $self->{text};	2159	++$self->{cursor} if $self->{cursor} < length $self->{text};
1744	} elsif ($sym == CFClient::SDLK_HOME) {	2160	} elsif ($sym == CFPlus::SDLK_HOME) {
		2161	# what a hack
		2162	$self->{cursor} =
		2163	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2164	? length $1
		2165	: 0;
		2166	} elsif ($sym == CFPlus::SDLK_END) {
		2167	# uh, again
		2168	$self->{cursor} =
		2169	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2170	? $self->{cursor} + length $1
		2171	: length $self->{text};
		2172	} elsif ($uni == 21) { # ctrl-u
		2173	$text = "";
1745	$self->{cursor} = 0;	2174	$self->{cursor} = 0;
1746	} elsif ($sym == CFClient::SDLK_END) {
1747	$self->{cursor} = length $text;
1748	} elsif ($uni == 27) {	2175	} elsif ($uni == 27) {
1749	$self->_emit ('escape');	2176	$self->emit ('escape');
1750	} elsif ($uni) {	2177	} elsif ($uni == 0x0d) {
		2178	substr $text, $self->{cursor}++, 0, "\012";
		2179	} elsif ($uni >= 0x20) {
1751	substr $text, $self->{cursor}++, 0, chr $uni;	2180	substr $text, $self->{cursor}++, 0, chr $uni;
1752	} else {	2181	} else {
1753	return 0;	2182	return 0;
1754	}	2183	}
1755		2184
1756	$self->_set_text ($text);	2185	$self->_set_text ($text);
1757		2186
1758	$self->realloc;	2187	$self->realloc;
		2188	$self->update;
1759		2189
1760	1	2190	1
1761	}	2191	}
1762		2192
1763	sub focus_in {	2193	sub invoke_focus_in {
1764	my ($self) = @_;	2194	my ($self) = @_;
1765		2195
1766	$self->{last_activity} = $::NOW;	2196	$self->{last_activity} = $::NOW;
1767		2197
1768	$self->SUPER::focus_in;	2198	$self->SUPER::invoke_focus_in
1769	}	2199	}
1770		2200
1771	sub button_down {	2201	sub invoke_button_down {
1772	my ($self, $ev, $x, $y) = @_;	2202	my ($self, $ev, $x, $y) = @_;
1773		2203
1774	$self->SUPER::button_down ($ev, $x, $y);	2204	$self->SUPER::invoke_button_down ($ev, $x, $y);
1775		2205
1776	my $idx = $self->{layout}->xy_to_index ($x, $y);	2206	my $idx = $self->{layout}->xy_to_index ($x, $y);
1777		2207
1778	# byte-index to char-index	2208	# byte-index to char-index
1779	my $text = $self->{text};	2209	my $text = $self->{text};
1780	utf8::encode $text;	2210	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781	$self->{cursor} = length substr $text, 0, $idx;	2211	$self->{cursor} = length $text;
1782		2212
1783	$self->_set_text ($self->{text});	2213	$self->_set_text ($self->{text});
1784	$self->update;	2214	$self->update;
1785		2215
1786	1	2216	1
1787	}	2217	}
1788		2218
1789	sub mouse_motion {	2219	sub invoke_mouse_motion {
1790	my ($self, $ev, $x, $y) = @_;	2220	my ($self, $ev, $x, $y) = @_;
1791	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2221	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792		2222
1793	0	2223	1
1794	}	2224	}
1795		2225
1796	sub _draw {	2226	sub _draw {
1797	my ($self) = @_;	2227	my ($self) = @_;
1798		2228
…		…
1825	utf8::encode $text;	2255	utf8::encode $text;
1826		2256
1827	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1828	}	2258	}
1829		2259
1830	glColor @{$self->{fg}};
1831	glBegin GL_LINES;	2260	glBegin GL_LINES;
1832	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2261	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};	2262	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1834	glEnd;	2263	glEnd;
1835	}	2264	}
1836	}	2265	}
1837		2266
		2267	#############################################################################
		2268
1838	package CFClient::UI::Entry;	2269	package CFPlus::UI::Entry;
1839		2270
1840	our @ISA = CFClient::UI::EntryBase::;	2271	our @ISA = CFPlus::UI::EntryBase::;
1841		2272
1842	use CFClient::OpenGL;	2273	use CFPlus::OpenGL;
1843		2274
1844	sub key_down {	2275	sub invoke_key_down {
1845	my ($self, $ev) = @_;	2276	my ($self, $ev) = @_;
1846		2277
1847	my $sym = $ev->{sym};	2278	my $sym = $ev->{sym};
1848		2279
1849	if ($sym == 13) {	2280	if ($ev->{uni} == 0x0d || $sym == 13) {
1850	unshift @{$self->{history}},	2281	unshift @{$self->{history}},
1851	my $txt = $self->get_text;	2282	my $txt = $self->get_text;
		2283
1852	$self->{history_pointer} = -1;	2284	$self->{history_pointer} = -1;
1853	$self->{history_saveback} = '';	2285	$self->{history_saveback} = '';
1854	$self->_emit (activate => $txt);	2286	$self->emit (activate => $txt);
1855	$self->update;	2287	$self->update;
1856		2288
1857	} elsif ($sym == CFClient::SDLK_UP) {	2289	} elsif ($sym == CFPlus::SDLK_UP) {
1858	if ($self->{history_pointer} < 0) {	2290	if ($self->{history_pointer} < 0) {
1859	$self->{history_saveback} = $self->get_text;	2291	$self->{history_saveback} = $self->get_text;
1860	}	2292	}
1861	if (@{$self->{history} || []} > 0) {	2293	if (@{$self->{history} || []} > 0) {
1862	$self->{history_pointer}++;	2294	$self->{history_pointer}++;
…		…
1864	$self->{history_pointer} = @{$self->{history} || []} - 1;	2296	$self->{history_pointer} = @{$self->{history} || []} - 1;
1865	}	2297	}
1866	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2298	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1867	}	2299	}
1868		2300
1869	} elsif ($sym == CFClient::SDLK_DOWN) {	2301	} elsif ($sym == CFPlus::SDLK_DOWN) {
1870	$self->{history_pointer}--;	2302	$self->{history_pointer}--;
1871	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2303	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872		2304
1873	if ($self->{history_pointer} >= 0) {	2305	if ($self->{history_pointer} >= 0) {
1874	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2306	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1875	} else {	2307	} else {
1876	$self->set_text ($self->{history_saveback});	2308	$self->set_text ($self->{history_saveback});
1877	}	2309	}
1878		2310
1879	} else {	2311	} else {
1880	return $self->SUPER::key_down ($ev)	2312	return $self->SUPER::invoke_key_down ($ev)
1881	}	2313	}
1882		2314
1883	1	2315	1
1884	}	2316	}
1885		2317
1886	#############################################################################	2318	#############################################################################
1887		2319
		2320	package CFPlus::UI::TextEdit;
		2321
		2322	our @ISA = CFPlus::UI::EntryBase::;
		2323
		2324	use CFPlus::OpenGL;
		2325
		2326	sub move_cursor_ver {
		2327	my ($self, $dy) = @_;
		2328
		2329	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2330
		2331	$y += $dy;
		2332
		2333	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2334	$self->{cursor} = $index;
		2335	delete $self->{cur_h};
		2336	$self->update;
		2337	return;
		2338	}
		2339	}
		2340
		2341	sub invoke_key_down {
		2342	my ($self, $ev) = @_;
		2343
		2344	my $sym = $ev->{sym};
		2345
		2346	if ($sym == CFPlus::SDLK_UP) {
		2347	$self->move_cursor_ver (-1);
		2348	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2349	$self->move_cursor_ver (+1);
		2350	} else {
		2351	return $self->SUPER::invoke_key_down ($ev)
		2352	}
		2353
		2354	1
		2355	}
		2356
		2357	#############################################################################
		2358
1888	package CFClient::UI::Button;	2359	package CFPlus::UI::Button;
1889		2360
1890	our @ISA = CFClient::UI::Label::;	2361	our @ISA = CFPlus::UI::Label::;
1891		2362
1892	use CFClient::OpenGL;	2363	use CFPlus::OpenGL;
1893		2364
1894	my @tex =	2365	my @tex =
1895	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1896	qw(b1_button_active.png);	2367	qw(b1_button_inactive.png b1_button_active.png);
1897		2368
1898	sub new {	2369	sub new {
1899	my $class = shift;	2370	my $class = shift;
1900		2371
1901	$class->SUPER::new (	2372	$class->SUPER::new (
1902	padding_x => 4,	2373	padding_x => 4,
1903	padding_y => 4,	2374	padding_y => 4,
1904	fg => [1, 1, 1],	2375	fg => [1.0, 1.0, 1.0],
1905	active_fg => [0, 0, 1],	2376	active_fg => [0.8, 0.8, 0.8],
1906	can_hover => 1,	2377	can_hover => 1,
1907	align => 0,	2378	align => 0,
1908	valign => 0,	2379	valign => 0,
1909	can_events => 1,	2380	can_events => 1,
1910	@_	2381	@_
1911	)	2382	)
1912	}	2383	}
1913		2384
1914	sub activate { }
1915
1916	sub button_up {	2385	sub invoke_button_up {
1917	my ($self, $ev, $x, $y) = @_;	2386	my ($self, $ev, $x, $y) = @_;
1918		2387
1919	$self->emit ("activate")	2388	$self->emit ("activate")
1920	if $x >= 0 && $x < $self->{w}	2389	if $x >= 0 && $x < $self->{w}
1921	&& $y >= 0 && $y < $self->{h};	2390	&& $y >= 0 && $y < $self->{h};
…		…
1930		2399
1931	glEnable GL_TEXTURE_2D;	2400	glEnable GL_TEXTURE_2D;
1932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1933	glColor 0, 0, 0, 1;	2402	glColor 0, 0, 0, 1;
1934		2403
		2404	my $tex = $tex[$GRAB == $self];
1935	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2405	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936		2406
1937	glDisable GL_TEXTURE_2D;	2407	glDisable GL_TEXTURE_2D;
1938		2408
1939	$self->SUPER::_draw;	2409	$self->SUPER::_draw;
1940	}	2410	}
1941		2411
1942	#############################################################################	2412	#############################################################################
1943		2413
1944	package CFClient::UI::CheckBox;	2414	package CFPlus::UI::CheckBox;
1945		2415
1946	our @ISA = CFClient::UI::DrawBG::;	2416	our @ISA = CFPlus::UI::DrawBG::;
1947		2417
1948	my @tex =	2418	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2419	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2420	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1951		2421
1952	use CFClient::OpenGL;	2422	use CFPlus::OpenGL;
1953		2423
1954	sub new {	2424	sub new {
1955	my $class = shift;	2425	my $class = shift;
1956		2426
1957	$class->SUPER::new (	2427	$class->SUPER::new (
…		…
1971	my ($self) = @_;	2441	my ($self) = @_;
1972		2442
1973	(6) x 2	2443	(6) x 2
1974	}	2444	}
1975		2445
		2446	sub toggle {
		2447	my ($self) = @_;
		2448
		2449	$self->{state} = !$self->{state};
		2450	$self->emit (changed => $self->{state});
		2451	$self->update;
		2452	}
		2453
1976	sub button_down {	2454	sub invoke_button_down {
1977	my ($self, $ev, $x, $y) = @_;	2455	my ($self, $ev, $x, $y) = @_;
1978		2456
1979	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2457	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2458	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981	$self->{state} = !$self->{state};	2459	$self->toggle;
1982	$self->_emit (changed => $self->{state});
1983	} else {	2460	} else {
1984	return 0	2461	return 0
1985	}	2462	}
1986		2463
1987	1	2464	1
…		…
2007	glDisable GL_TEXTURE_2D;	2484	glDisable GL_TEXTURE_2D;
2008	}	2485	}
2009		2486
2010	#############################################################################	2487	#############################################################################
2011		2488
2012	package CFClient::UI::Image;	2489	package CFPlus::UI::Image;
2013		2490
2014	our @ISA = CFClient::UI::Base::;	2491	our @ISA = CFPlus::UI::Base::;
2015		2492
2016	use CFClient::OpenGL;	2493	use CFPlus::OpenGL;
2017	use Carp qw/confess/;
2018		2494
2019	our %loaded_images;	2495	our %texture_cache;
2020		2496
2021	sub new {	2497	sub new {
2022	my $class = shift;	2498	my $class = shift;
2023		2499
2024	my $self = $class->SUPER::new (can_events => 0, @_);	2500	my $self = $class->SUPER::new (
		2501	can_events => 0,
		2502	@_,
		2503	);
2025		2504
2026	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2505	$self->{path} || $self->{tex}
		2506	or Carp::croak "'path' or 'tex' attributes required";
2027		2507
2028	$loaded_images{$self->{image}} ||=	2508	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2029	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2509	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2030		2510
2031	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2511	CFPlus::weaken $texture_cache{$self->{path}};
2032		2512
2033	Scalar::Util::weaken $loaded_images{$self->{image}};	2513	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035	$self->{aspect} = $tex->{w} / $tex->{h};
2036		2514
2037	$self	2515	$self
2038	}	2516	}
2039		2517
		2518	sub STORABLE_freeze {
		2519	my ($self, $cloning) = @_;
		2520
		2521	$self->{path}
		2522	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2523
		2524	$self->{path}
		2525	}
		2526
		2527	sub STORABLE_attach {
		2528	my ($self, $cloning, $path) = @_;
		2529
		2530	$self->new (path => $path)
		2531	}
		2532
2040	sub size_request {	2533	sub size_request {
2041	my ($self) = @_;	2534	my ($self) = @_;
2042		2535
2043	($self->{tex}->{w}, $self->{tex}->{h})	2536	($self->{tex}{w}, $self->{tex}{h})
2044	}	2537	}
2045		2538
2046	sub _draw {	2539	sub _draw {
2047	my ($self) = @_;	2540	my ($self) = @_;
2048		2541
…		…
2058	}	2551	}
2059		2552
2060	glEnable GL_TEXTURE_2D;	2553	glEnable GL_TEXTURE_2D;
2061	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062		2555
2063	$tex->draw_quad_alpha (0, 0, $w, $h);	2556	$tex->draw_quad (0, 0, $w, $h);
2064		2557
2065	glDisable GL_TEXTURE_2D;	2558	glDisable GL_TEXTURE_2D;
2066	}	2559	}
2067		2560
2068	#############################################################################	2561	#############################################################################
2069		2562
		2563	package CFPlus::UI::ImageButton;
		2564
		2565	our @ISA = CFPlus::UI::Image::;
		2566
		2567	use CFPlus::OpenGL;
		2568
		2569	my %textures;
		2570
		2571	sub new {
		2572	my $class = shift;
		2573
		2574	my $self = $class->SUPER::new (
		2575	padding_x => 4,
		2576	padding_y => 4,
		2577	fg => [1, 1, 1],
		2578	active_fg => [0, 0, 1],
		2579	can_hover => 1,
		2580	align => 0,
		2581	valign => 0,
		2582	can_events => 1,
		2583	@_
		2584	);
		2585	}
		2586
		2587	sub invoke_button_up {
		2588	my ($self, $ev, $x, $y) = @_;
		2589
		2590	$self->emit ("activate")
		2591	if $x >= 0 && $x < $self->{w}
		2592	&& $y >= 0 && $y < $self->{h};
		2593
		2594	1
		2595	}
		2596
		2597	#############################################################################
		2598
2070	package CFClient::UI::VGauge;	2599	package CFPlus::UI::VGauge;
2071		2600
2072	our @ISA = CFClient::UI::Base::;	2601	our @ISA = CFPlus::UI::Base::;
2073		2602
2074	use List::Util qw(min max);	2603	use List::Util qw(min max);
2075		2604
2076	use CFClient::OpenGL;	2605	use CFPlus::OpenGL;
2077		2606
2078	my %tex = (	2607	my %tex = (
2079	food => [	2608	food => [
2080	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2610	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2082	],	2611	],
2083	grace => [	2612	grace => [
2084	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2613	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/	2614	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2086	],	2615	],
2087	hp => [	2616	hp => [
2088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2617	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2618	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2090	],	2619	],
2091	mana => [	2620	mana => [
2092	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	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/	2622	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2094	],	2623	],
2095	);	2624	);
2096		2625
2097	# eg. VGauge->new (gauge => 'food'), default gauge: food	2626	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2157	my $ycut1 = max 0, min 1, $ycut;	2686	my $ycut1 = max 0, min 1, $ycut;
2158	my $ycut2 = max 0, min 1, $ycut - 1;	2687	my $ycut2 = max 0, min 1, $ycut - 1;
2159		2688
2160	my $h1 = $self->{h} * (1 - $ycut1);	2689	my $h1 = $self->{h} * (1 - $ycut1);
2161	my $h2 = $self->{h} * (1 - $ycut2);	2690	my $h2 = $self->{h} * (1 - $ycut2);
		2691	my $h3 = $self->{h};
		2692
		2693	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2162		2694
2163	glEnable GL_BLEND;	2695	glEnable GL_BLEND;
2164	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2696	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2697	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166	glEnable GL_TEXTURE_2D;	2698	glEnable GL_TEXTURE_2D;
…		…
2185		2717
2186	if ($t3) {	2718	if ($t3) {
2187	glBindTexture GL_TEXTURE_2D, $t3->{name};	2719	glBindTexture GL_TEXTURE_2D, $t3->{name};
2188	glBegin GL_QUADS;	2720	glBegin GL_QUADS;
2189	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2721	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2722	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2723	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2724	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193	glEnd;	2725	glEnd;
2194	}	2726	}
2195		2727
2196	glDisable GL_BLEND;	2728	glDisable GL_BLEND;
2197	glDisable GL_TEXTURE_2D;	2729	glDisable GL_TEXTURE_2D;
2198	}	2730	}
2199		2731
2200	#############################################################################	2732	#############################################################################
2201		2733
2202	package CFClient::UI::Gauge;	2734	package CFPlus::UI::Gauge;
2203		2735
2204	our @ISA = CFClient::UI::VBox::;	2736	our @ISA = CFPlus::UI::VBox::;
2205		2737
2206	sub new {	2738	sub new {
2207	my ($class, %arg) = @_;	2739	my ($class, %arg) = @_;
2208		2740
2209	my $self = $class->SUPER::new (	2741	my $self = $class->SUPER::new (
…		…
2211	can_hover => 1,	2743	can_hover => 1,
2212	can_events => 1,	2744	can_events => 1,
2213	%arg,	2745	%arg,
2214	);	2746	);
2215		2747
2216	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2748	$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);	2749	$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");	2750	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2219		2751
2220	$self	2752	$self
2221	}	2753	}
2222		2754
2223	sub set_fontsize {	2755	sub set_fontsize {
…		…
2244	$self->{value}->set_text ($val);	2776	$self->{value}->set_text ($val);
2245	}	2777	}
2246		2778
2247	#############################################################################	2779	#############################################################################
2248		2780
2249	package CFClient::UI::Slider;	2781	package CFPlus::UI::Slider;
2250		2782
2251	use strict;	2783	use strict;
2252		2784
2253	use CFClient::OpenGL;	2785	use CFPlus::OpenGL;
2254		2786
2255	our @ISA = CFClient::UI::DrawBG::;	2787	our @ISA = CFPlus::UI::DrawBG::;
2256		2788
2257	my @tex =	2789	my @tex =
2258	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2790	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2259	qw(s1_slider.png s1_slider_bg.png);	2791	qw(s1_slider.png s1_slider_bg.png);
2260		2792
2261	sub new {	2793	sub new {
2262	my $class = shift;	2794	my $class = shift;
2263		2795
…		…
2284	$self->update;	2816	$self->update;
2285		2817
2286	$self	2818	$self
2287	}	2819	}
2288		2820
2289	sub changed { }
2290
2291	sub set_range {	2821	sub set_range {
2292	my ($self, $range) = @_;	2822	my ($self, $range) = @_;
2293		2823
2294	($range, $self->{range}) = ($self->{range}, $range);	2824	($range, $self->{range}) = ($self->{range}, $range);
2295		2825
2296	$self->update
2297	if "@$range" ne "@{$self->{range}}";	2826	if ("@$range" ne "@{$self->{range}}") {
		2827	$self->update;
		2828	$self->set_value ($self->{range}[0]);
		2829	}
2298	}	2830	}
2299		2831
2300	sub set_value {	2832	sub set_value {
2301	my ($self, $value) = @_;	2833	my ($self, $value) = @_;
2302		2834
…		…
2313	if $unit;	2845	if $unit;
2314		2846
2315	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2847	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316		2848
2317	if ($value != $old_value) {	2849	if ($value != $old_value) {
2318	$self->_emit (changed => $value);	2850	$self->emit (changed => $value);
2319	$self->update;	2851	$self->update;
2320	}	2852	}
2321	}	2853	}
2322		2854
2323	sub size_request {	2855	sub size_request {
2324	my ($self) = @_;	2856	my ($self) = @_;
2325		2857
2326	($self->{req_w}, $self->{req_h})	2858	($self->{req_w}, $self->{req_h})
2327	}	2859	}
2328		2860
2329	sub button_down {	2861	sub invoke_button_down {
2330	my ($self, $ev, $x, $y) = @_;	2862	my ($self, $ev, $x, $y) = @_;
2331		2863
2332	$self->SUPER::button_down ($ev, $x, $y);	2864	$self->SUPER::invoke_button_down ($ev, $x, $y);
2333		2865
2334	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2866	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335		2867
2336	$self->mouse_motion ($ev, $x, $y)	2868	$self->invoke_mouse_motion ($ev, $x, $y)
2337	}	2869	}
2338		2870
2339	sub mouse_motion {	2871	sub invoke_mouse_motion {
2340	my ($self, $ev, $x, $y) = @_;	2872	my ($self, $ev, $x, $y) = @_;
2341		2873
2342	if ($GRAB == $self) {	2874	if ($GRAB == $self) {
2343	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2875	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344		2876
…		…
2350	} else {	2882	} else {
2351	return 0;	2883	return 0;
2352	}	2884	}
2353		2885
2354	1	2886	1
		2887	}
		2888
		2889	sub invoke_mouse_wheel {
		2890	my ($self, $ev) = @_;
		2891
		2892	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2893
		2894	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2895
		2896	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2897
		2898	! ! $delta
2355	}	2899	}
2356		2900
2357	sub update {	2901	sub update {
2358	my ($self) = @_;	2902	my ($self) = @_;
2359		2903
…		…
2408	glDisable GL_TEXTURE_2D;	2952	glDisable GL_TEXTURE_2D;
2409	}	2953	}
2410		2954
2411	#############################################################################	2955	#############################################################################
2412		2956
2413	package CFClient::UI::ValSlider;	2957	package CFPlus::UI::ValSlider;
2414		2958
2415	our @ISA = CFClient::UI::HBox::;	2959	our @ISA = CFPlus::UI::HBox::;
2416		2960
2417	sub new {	2961	sub new {
2418	my ($class, %arg) = @_;	2962	my ($class, %arg) = @_;
2419		2963
2420	my $range = delete $arg{range};	2964	my $range = delete $arg{range};
2421		2965
2422	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
2423	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2967	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2424	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2968	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2425	to_value => sub { shift },	2969	to_value => sub { shift },
2426	from_value => sub { shift },	2970	from_value => sub { shift },
2427	%arg,	2971	%arg,
2428	);	2972	);
2429		2973
…		…
2449	sub set_range { shift->{slider}->set_range (@_) }	2993	sub set_range { shift->{slider}->set_range (@_) }
2450	sub set_value { shift->{slider}->set_value (@_) }	2994	sub set_value { shift->{slider}->set_value (@_) }
2451		2995
2452	#############################################################################	2996	#############################################################################
2453		2997
2454	package CFClient::UI::TextView;	2998	package CFPlus::UI::TextScroller;
2455		2999
2456	our @ISA = CFClient::UI::HBox::;	3000	our @ISA = CFPlus::UI::HBox::;
2457		3001
2458	use CFClient::OpenGL;	3002	use CFPlus::OpenGL;
2459		3003
2460	sub new {	3004	sub new {
2461	my $class = shift;	3005	my $class = shift;
2462		3006
2463	my $self = $class->SUPER::new (	3007	my $self = $class->SUPER::new (
2464	fontsize => 1,	3008	fontsize => 1,
2465	can_events => 0,	3009	can_events => 1,
		3010	indent => 0,
2466	#font => default_font	3011	#font => default_font
2467	@_,	3012	@_,
2468		3013
2469	layout => (new CFClient::Layout 1),	3014	layout => (new CFPlus::Layout),
2470	par => [],	3015	par => [],
		3016	max_par => 0,
2471	height => 0,	3017	height => 0,
2472	children => [	3018	children => [
2473	(new CFClient::UI::Empty expand => 1),	3019	(new CFPlus::UI::Empty expand => 1),
2474	(new CFClient::UI::Slider vertical => 1),	3020	(new CFPlus::UI::Slider vertical => 1),
2475	],	3021	],
2476	);	3022	);
2477		3023
2478	$self->{children}[1]->connect (changed => sub { $self->update });	3024	$self->{children}[1]->connect (changed => sub { $self->update });
2479		3025
…		…
2485		3031
2486	$self->{fontsize} = $fontsize;	3032	$self->{fontsize} = $fontsize;
2487	$self->reflow;	3033	$self->reflow;
2488	}	3034	}
2489		3035
		3036	sub size_request {
		3037	my ($self) = @_;
		3038
		3039	my ($empty, $slider) = @{ $self->{children} };
		3040
		3041	local $self->{children} = [$empty, $slider];
		3042	$self->SUPER::size_request
		3043	}
		3044
2490	sub size_allocate {	3045	sub invoke_size_allocate {
2491	my ($self, $w, $h) = @_;	3046	my ($self, $w, $h) = @_;
2492		3047
2493	$self->SUPER::size_allocate ($w, $h);	3048	my ($empty, $slider, @other) = @{ $self->{children} };
		3049	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494		3050
2495	$self->{layout}->set_font ($self->{font}) if $self->{font};	3051	$self->{layout}->set_font ($self->{font}) if $self->{font};
2496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3052	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497	$self->{layout}->set_width ($self->{children}[0]{w});	3053	$self->{layout}->set_width ($empty->{w});
		3054	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498		3055
2499	$self->reflow;	3056	$self->reflow;
2500	}
2501		3057
2502	sub text_size {	3058	local $self->{children} = [$empty, $slider];
		3059	$self->SUPER::invoke_size_allocate ($w, $h)
		3060	}
		3061
		3062	sub invoke_mouse_wheel {
2503	my ($self, $text, $indent) = @_;	3063	my ($self, $ev) = @_;
		3064
		3065	return 0 unless $ev->{dy}; # only vertical movements
		3066
		3067	$self->{children}[1]->emit (mouse_wheel => $ev);
		3068
		3069	1
		3070	}
		3071
		3072	sub get_layout {
		3073	my ($self, $para) = @_;
2504		3074
2505	my $layout = $self->{layout};	3075	my $layout = $self->{layout};
2506		3076
		3077	$layout->set_font ($self->{font}) if $self->{font};
		3078	$layout->set_foreground (@{$para->{fg}});
2507	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3079	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508	$layout->set_width ($self->{children}[0]{w} - $indent);	3080	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3081	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509	$layout->set_markup ($text);	3082	$layout->set_markup ($para->{markup});
		3083
		3084	$layout->set_shapes (
		3085	map
		3086	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3087	@{$para->{widget}}
2510		3088	);
		3089
2511	$layout->size	3090	$layout
2512	}	3091	}
2513		3092
2514	sub reflow {	3093	sub reflow {
2515	my ($self) = @_;	3094	my ($self) = @_;
2516		3095
…		…
2523		3102
2524	# todo: base offset on lines or so, not on pixels	3103	# todo: base offset on lines or so, not on pixels
2525	$self->{children}[1]->set_value ($offset);	3104	$self->{children}[1]->set_value ($offset);
2526	}	3105	}
2527		3106
		3107	sub current_paragraph {
		3108	my ($self) = @_;
		3109
		3110	$self->{top_paragraph} - 1
		3111	}
		3112
		3113	sub scroll_to {
		3114	my ($self, $para) = @_;
		3115
		3116	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3117
		3118	$self->{scroll_to} = $para;
		3119	$self->update;
		3120	}
		3121
2528	sub clear {	3122	sub clear {
2529	my ($self) = @_;	3123	my ($self) = @_;
		3124
		3125	my (undef, undef, @other) = @{ $self->{children} };
		3126	$self->remove ($_) for @other;
2530		3127
2531	$self->{par} = [];	3128	$self->{par} = [];
2532	$self->{height} = 0;	3129	$self->{height} = 0;
2533	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3130	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534	}	3131	}
2535		3132
2536	sub add_paragraph {	3133	sub add_paragraph {
2537	my ($self, $color, $text, $indent) = @_;	3134	my $self = shift;
2538		3135
2539	for my $line (split /\n/, $text) {	3136	for my $para (@_) {
2540	my ($w, $h) = $self->text_size ($line);	3137	$para = {
		3138	fg => [1, 1, 1, 1],
		3139	indent => 0,
		3140	markup => "",
		3141	widget => [],
		3142	ref $para ? %$para : (markup => $para),
		3143	w => 1e10,
		3144	wrapped => 1,
		3145	};
		3146
		3147	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3148	push @{$self->{par}}, $para;
		3149	}
		3150
		3151	if (my $max = $self->{max_par}) {
		3152	shift @{$self->{par}} while @{$self->{par}} > $max;
		3153	}
		3154
		3155	$self->{need_reflow}++;
		3156	$self->update;
		3157	}
		3158
		3159	sub scroll_to_bottom {
		3160	my ($self) = @_;
		3161
		3162	$self->{scroll_to} = $#{$self->{par}};
		3163	$self->update;
		3164	}
		3165
		3166	sub force_uptodate {
		3167	my ($self) = @_;
		3168
		3169	if (delete $self->{need_reflow}) {
		3170	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3171
		3172	my $height = 0;
		3173
		3174	for my $para (@{$self->{par}}) {
		3175	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3176	my $layout = $self->get_layout ($para);
		3177	my ($w, $h) = $layout->size;
		3178
		3179	$para->{w} = $w + $para->{indent};
		3180	$para->{h} = $h;
		3181	$para->{wrapped} = $layout->has_wrapped;
		3182	}
		3183
		3184	$para->{y} = $height;
		3185	$height += $para->{h};
		3186	}
		3187
2541	$self->{height} += $h;	3188	$self->{height} = $height;
2542	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3189	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2543	}
2544		3190
2545	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3191	delete $self->{texture};
		3192	}
		3193
		3194	if (my $paridx = delete $self->{scroll_to}) {
		3195	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3196	}
2546	}	3197	}
2547		3198
2548	sub update {	3199	sub update {
2549	my ($self) = @_;	3200	my ($self) = @_;
2550		3201
…		…
2552		3203
2553	return unless $self->{h} > 0;	3204	return unless $self->{h} > 0;
2554		3205
2555	delete $self->{texture};	3206	delete $self->{texture};
2556		3207
2557	$ROOT->on_post_alloc ($self, sub {	3208	$ROOT->on_post_alloc ($self => sub {
		3209	$self->force_uptodate;
		3210
2558	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3211	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559		3212
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 {	3213	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2587	glClearColor 0, 0, 0, 0;	3214	glClearColor 0, 0, 0, 0;
2588	glClear GL_COLOR_BUFFER_BIT;	3215	glClear GL_COLOR_BUFFER_BIT;
2589		3216
		3217	package CFPlus::UI::Base;
		3218	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3219	(0, 0, $self->{w}, $self->{h});
		3220
		3221	my $top = int $self->{children}[1]{range}[0];
		3222
		3223	my $paridx = 0;
		3224	my $top_paragraph;
2590	my $top = int $self->{children}[1]{range}[0];	3225	my $top = int $self->{children}[1]{range}[0];
2591		3226
2592	my $y0 = $top;	3227	my $y0 = $top;
2593	my $y1 = $top + $H;	3228	my $y1 = $top + $H;
2594		3229
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}}) {	3230	for my $para (@{$self->{par}}) {
2606	my $h = $par->[1];	3231	my $h = $para->{h};
		3232	my $y = $para->{y};
2607		3233
2608	if ($y0 < $y + $h && $y < $y1) {	3234	if ($y0 < $y + $h && $y < $y1) {
2609	$layout->set_foreground (@{ $par->[2] });	3235	my $layout = $self->get_layout ($para);
2610	$layout->set_width ($W - $par->[3]);
2611	$layout->set_markup ($par->[4]);
2612		3236
2613	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3237	$layout->render ($para->{indent}, $y - $y0);
2614		3238
2615	glRasterPos $par->[3], $y - $y0;	3239	if (my @w = @{ $para->{widget} }) {
2616	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3240	my @s = $layout->get_shapes;
		3241
		3242	for (@w) {
		3243	my ($dx, $dy) = splice @s, 0, 2, ();
		3244
		3245	$_->{x} = $dx + $para->{indent};
		3246	$_->{y} = $dy + $y - $y0;
		3247
		3248	$_->draw;
		3249	}
		3250	}
2617	}	3251	}
2618		3252
2619	$y += $h;	3253	$paridx++;
		3254	$top_paragraph ||= $paridx if $y >= $top;
2620	}	3255	}
2621		3256
2622	glDisable GL_BLEND;	3257	$self->{top_paragraph} = $top_paragraph;
2623	};	3258	};
2624	});	3259	});
		3260	}
		3261
		3262	sub reconfigure {
		3263	my ($self) = @_;
		3264
		3265	$self->SUPER::reconfigure;
		3266
		3267	$_->{w} = 1e10 for @{ $self->{par} };
		3268	$self->reflow;
2625	}	3269	}
2626		3270
2627	sub _draw {	3271	sub _draw {
2628	my ($self) = @_;	3272	my ($self) = @_;
2629		3273
…		…
2632	glColor 0, 0, 0, 1;	3276	glColor 0, 0, 0, 1;
2633	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3277	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634	glDisable GL_TEXTURE_2D;	3278	glDisable GL_TEXTURE_2D;
2635		3279
2636	$self->{children}[1]->draw;	3280	$self->{children}[1]->draw;
2637
2638	}	3281	}
2639		3282
2640	#############################################################################	3283	#############################################################################
2641		3284
2642	package CFClient::UI::Animator;	3285	package CFPlus::UI::Animator;
2643		3286
2644	use CFClient::OpenGL;	3287	use CFPlus::OpenGL;
2645		3288
2646	our @ISA = CFClient::UI::Bin::;	3289	our @ISA = CFPlus::UI::Bin::;
2647		3290
2648	sub moveto {	3291	sub moveto {
2649	my ($self, $x, $y) = @_;	3292	my ($self, $x, $y) = @_;
2650		3293
2651	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3294	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2679	glPopMatrix;	3322	glPopMatrix;
2680	}	3323	}
2681		3324
2682	#############################################################################	3325	#############################################################################
2683		3326
2684	package CFClient::UI::Flopper;	3327	package CFPlus::UI::Flopper;
2685		3328
2686	our @ISA = CFClient::UI::Button::;	3329	our @ISA = CFPlus::UI::Button::;
2687		3330
2688	sub new {	3331	sub new {
2689	my $class = shift;	3332	my $class = shift;
2690		3333
2691	my $self = $class->SUPER::new (	3334	my $self = $class->SUPER::new (
…		…
2703	$self->{other}->toggle_visibility;	3346	$self->{other}->toggle_visibility;
2704	}	3347	}
2705		3348
2706	#############################################################################	3349	#############################################################################
2707		3350
2708	package CFClient::UI::Tooltip;	3351	package CFPlus::UI::Tooltip;
2709		3352
2710	our @ISA = CFClient::UI::Bin::;	3353	our @ISA = CFPlus::UI::Bin::;
2711		3354
2712	use CFClient::OpenGL;	3355	use CFPlus::OpenGL;
2713		3356
2714	sub new {	3357	sub new {
2715	my $class = shift;	3358	my $class = shift;
2716		3359
2717	$class->SUPER::new (	3360	$class->SUPER::new (
…		…
2720	)	3363	)
2721	}	3364	}
2722		3365
2723	sub set_tooltip_from {	3366	sub set_tooltip_from {
2724	my ($self, $widget) = @_;	3367	my ($self, $widget) = @_;
		3368
		3369	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3370	if $widget->{tooltip} =~ /^#(.*)$/;
2725		3371
2726	my $tooltip = $widget->{tooltip};	3372	my $tooltip = $widget->{tooltip};
2727		3373
2728	if ($ENV{CFPLUS_DEBUG} & 2) {	3374	if ($ENV{CFPLUS_DEBUG} & 2) {
2729	$tooltip .= "\n\n" . (ref $widget) . "\n"	3375	$tooltip .= "\n\n" . (ref $widget) . "\n"
2730	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3376	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731	. "req $widget->{req_w} $widget->{req_h}\n"	3377	. "req $widget->{req_w} $widget->{req_h}\n"
2732	. "visible $widget->{visible}";	3378	. "visible $widget->{visible}";
2733	}	3379	}
2734		3380
		3381	$tooltip =~ s/^\n+//;
		3382	$tooltip =~ s/\n+$//;
		3383
2735	$self->add (new CFClient::UI::Label	3384	$self->add (new CFPlus::UI::Label
2736	markup => $tooltip,	3385	markup => $tooltip,
2737	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3386	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738	fontsize => 0.8,	3387	fontsize => 0.8,
2739	fg => [0, 0, 0, 1],	3388	style => 1, # FLAG_INVERSE
2740	ellipsise => 0,	3389	ellipsise => 0,
2741	font => ($widget->{tooltip_font} || $::FONT_PROP),	3390	font => ($widget->{tooltip_font} || $::FONT_PROP),
2742	);	3391	);
2743	}	3392	}
2744		3393
…		…
2748	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3397	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749		3398
2750	($w + 4, $h + 4)	3399	($w + 4, $h + 4)
2751	}	3400	}
2752		3401
2753	sub size_allocate {	3402	sub invoke_size_allocate {
2754	my ($self, $w, $h) = @_;	3403	my ($self, $w, $h) = @_;
2755		3404
2756	$self->SUPER::size_allocate ($w - 4, $h - 4);	3405	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757	}	3406	}
2758		3407
2759	sub visibility_change {	3408	sub invoke_visibility_change {
2760	my ($self, $visible) = @_;	3409	my ($self, $visible) = @_;
2761		3410
2762	return unless $visible;	3411	return unless $visible;
2763		3412
2764	$self->{root}->on_post_alloc ("move_$self" => sub {	3413	$self->{root}->on_post_alloc ("move_$self" => sub {
2765	my $widget = $self->{owner}	3414	my $widget = $self->{owner}
2766	or return;	3415	or return;
2767		3416
		3417	if ($widget->{visible}) {
2768	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3418	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769		3419
2770	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3420	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771	if $x + $self->{w} > $::WIDTH;	3421	if $x + $self->{w} > $self->{root}{w};
2772		3422
2773	$self->move_abs ($x, $y);	3423	$self->move_abs ($x, $y);
		3424	} else {
		3425	$self->hide;
		3426	}
2774	});	3427	});
2775	}	3428	}
2776		3429
2777	sub _draw {	3430	sub _draw {
2778	my ($self) = @_;	3431	my ($self) = @_;
…		…
2802	$self->SUPER::_draw;	3455	$self->SUPER::_draw;
2803	}	3456	}
2804		3457
2805	#############################################################################	3458	#############################################################################
2806		3459
2807	package CFClient::UI::Face;	3460	package CFPlus::UI::Face;
2808		3461
2809	our @ISA = CFClient::UI::Base::;	3462	our @ISA = CFPlus::UI::DrawBG::;
2810		3463
2811	use CFClient::OpenGL;	3464	use CFPlus::OpenGL;
2812		3465
2813	sub new {	3466	sub new {
2814	my $class = shift;	3467	my $class = shift;
2815		3468
2816	my $self = $class->SUPER::new (	3469	my $self = $class->SUPER::new (
		3470	size_w => 32,
		3471	size_h => 8,
2817	aspect => 1,	3472	aspect => 1,
2818	can_events => 0,	3473	can_events => 0,
2819	@_,	3474	@_,
2820	);	3475	);
2821		3476
2822	if ($self->{anim} && $self->{animspeed}) {	3477	if ($self->{anim} && $self->{animspeed}) {
2823	Scalar::Util::weaken (my $widget = $self);	3478	CFPlus::weaken (my $widget = $self);
2824		3479
		3480	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3481	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2825	$self->{timer} = Event->timer (	3482	$self->{timer} = Event->timer (
2826	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2827	hard => 1,	3483	parked => 1,
2828	interval => $self->{animspeed},
2829	cb => sub {	3484	cb => sub {
		3485	return unless $::CONN && $widget;
		3486
2830	++$widget->{frame};	3487	++$widget->{frame};
		3488	$widget->update_face;
2831	$widget->update;	3489	$widget->update;
		3490
		3491	$widget->update_timer;
2832	},	3492	},
2833	);	3493	);
		3494
		3495	$self->update_face;
		3496	$self->update_timer;
2834	}	3497	}
2835		3498
2836	$self	3499	$self
2837	}	3500	}
2838		3501
		3502	sub update_timer {
		3503	my ($self) = @_;
		3504
		3505	return unless $self->{timer};
		3506
		3507	if ($self->{visible}) {
		3508	$self->{timer}->at (
		3509	$self->{anim_start}
		3510	+ $self->{animspeed}
		3511	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3512	);
		3513	$self->{timer}->start;
		3514	} else {
		3515	$self->{timer}->stop;
		3516	}
		3517	}
		3518
		3519	sub update_face {
		3520	my ($self) = @_;
		3521
		3522	return unless $::CONN;
		3523
		3524	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3525	if ($anim && @$anim) {
		3526	delete $self->{wait_face};
		3527	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3528	}
		3529	}
		3530	}
		3531
2839	sub size_request {	3532	sub size_request {
2840	(32, 8)	3533	my ($self) = @_;
		3534
		3535	if ($::CONN) {
		3536	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3537	if (my $tex = $::CONN->{texture}[$faceid]) {
		3538	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3539	} else {
		3540	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3541	$self->realloc;
		3542	});
		3543	}
		3544	}
		3545	}
		3546
		3547	($self->{size_w} || 8, $self->{size_h} || 8)
2841	}	3548	}
2842		3549
2843	sub update {	3550	sub update {
2844	my ($self) = @_;	3551	my ($self) = @_;
2845		3552
2846	return unless $self->{visible};	3553	return unless $self->{visible};
2847		3554
2848	$self->SUPER::update;	3555	$self->SUPER::update;
2849	}	3556	}
2850		3557
		3558	sub invoke_visibility_change {
		3559	my ($self) = @_;
		3560
		3561	$self->update_timer;
		3562
		3563	0
		3564	}
		3565
2851	sub _draw {	3566	sub _draw {
2852	my ($self) = @_;	3567	my ($self) = @_;
2853		3568
2854	return unless $::CONN;	3569	return unless $::CONN;
2855		3570
2856	my $face;	3571	$self->SUPER::_draw;
2857		3572
2858	if ($self->{frame}) {
2859	my $anim = $::CONN->{anim}[$self->{anim}];	3573	my $faceid = $::CONN->{faceid}[$self->{face}]
2860		3574	or return;
2861	$face = $anim->[ $self->{frame} % @$anim ]
2862	if $anim && @$anim;
2863	}
2864		3575
2865	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3576	my $tex = $::CONN->{texture}[$faceid];
2866		3577
2867	if ($tex) {	3578	if ($tex) {
2868	glEnable GL_TEXTURE_2D;	3579	glEnable GL_TEXTURE_2D;
2869	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3580	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2870	glColor 0, 0, 0, 1;	3581	glColor 0, 0, 0, 1;
2871	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3582	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872	glDisable GL_TEXTURE_2D;	3583	glDisable GL_TEXTURE_2D;
2873	}	3584	}
2874	}	3585	}
2875		3586
2876	sub DESTROY {	3587	sub destroy {
2877	my ($self) = @_;	3588	my ($self) = @_;
2878		3589
2879	$self->{timer}->cancel	3590	(delete $self->{timer})->cancel
2880	if $self->{timer};	3591	if $self->{timer};
2881		3592
2882	$self->SUPER::DESTROY;	3593	$self->SUPER::destroy;
2883	}	3594	}
2884		3595
2885	#############################################################################	3596	#############################################################################
2886		3597
2887	package CFClient::UI::Buttonbar;	3598	package CFPlus::UI::Buttonbar;
2888		3599
2889	our @ISA = CFClient::UI::HBox::;	3600	our @ISA = CFPlus::UI::HBox::;
2890		3601
2891	# TODO: should actualyl wrap buttons and other goodies.	3602	# TODO: should actually wrap buttons and other goodies.
2892		3603
2893	#############################################################################	3604	#############################################################################
2894		3605
2895	package CFClient::UI::Menu;	3606	package CFPlus::UI::Menu;
2896		3607
2897	our @ISA = CFClient::UI::FancyFrame::;	3608	our @ISA = CFPlus::UI::Toplevel::;
2898		3609
2899	use CFClient::OpenGL;	3610	use CFPlus::OpenGL;
2900		3611
2901	sub new {	3612	sub new {
2902	my $class = shift;	3613	my $class = shift;
2903		3614
2904	my $self = $class->SUPER::new (	3615	my $self = $class->SUPER::new (
2905	items => [],	3616	items => [],
2906	z => 100,	3617	z => 100,
2907	@_,	3618	@_,
2908	);	3619	);
2909		3620
2910	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3621	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2911		3622
2912	for my $item (@{ $self->{items} }) {	3623	for my $item (@{ $self->{items} }) {
2913	my ($widget, $cb) = @$item;	3624	my ($widget, $cb, $tooltip) = @$item;
2914		3625
2915	# handle various types of items, only text for now	3626	# handle various types of items, only text for now
2916	if (!ref $widget) {	3627	if (!ref $widget) {
		3628	if ($widget =~ /\t/) {
		3629	my ($left, $right) = split /\t/, $widget, 2;
		3630
2917	$widget = new CFClient::UI::Label	3631	$widget = new CFPlus::UI::HBox
2918	can_hover => 1,	3632	can_hover => 1,
2919	can_events => 1,	3633	can_events => 1,
		3634	tooltip => $tooltip,
		3635	children => [
		3636	(new CFPlus::UI::Label markup => $left, expand => 1),
		3637	(new CFPlus::UI::Label markup => $right, align => +1),
		3638	],
		3639	;
		3640
		3641	} else {
		3642	$widget = new CFPlus::UI::Label
		3643	can_hover => 1,
		3644	can_events => 1,
2920	text => $widget;	3645	markup => $widget,
		3646	tooltip => $tooltip;
		3647	}
2921	}	3648	}
2922		3649
2923	$self->{item}{$widget} = $item;	3650	$self->{item}{$widget} = $item;
2924		3651
2925	$self->{vbox}->add ($widget);	3652	$self->{vbox}->add ($widget);
…		…
2930		3657
2931	# popup given the event (must be a mouse button down event currently)	3658	# popup given the event (must be a mouse button down event currently)
2932	sub popup {	3659	sub popup {
2933	my ($self, $ev) = @_;	3660	my ($self, $ev) = @_;
2934		3661
2935	$self->_emit ("popdown");	3662	$self->emit ("popdown");
2936		3663
2937	# maybe save $GRAB? must be careful about events...	3664	# maybe save $GRAB? must be careful about events...
2938	$GRAB = $self;	3665	$GRAB = $self;
2939	$self->{button} = $ev->{button};	3666	$self->{button} = $ev->{button};
2940		3667
2941	$self->show;	3668	$self->show;
2942	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3669	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943	}	3670	}
2944		3671
2945	sub mouse_motion {	3672	sub invoke_mouse_motion {
2946	my ($self, $ev, $x, $y) = @_;	3673	my ($self, $ev, $x, $y) = @_;
2947		3674
2948	# TODO: should use vbox->find_widget or so	3675	# TODO: should use vbox->find_widget or so
2949	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3676	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950	$self->{hover} = $self->{item}{$HOVER};	3677	$self->{hover} = $self->{item}{$HOVER};
2951		3678
2952	0	3679	0
2953	}	3680	}
2954		3681
2955	sub button_up {	3682	sub invoke_button_up {
2956	my ($self, $ev, $x, $y) = @_;	3683	my ($self, $ev, $x, $y) = @_;
2957		3684
2958	if ($ev->{button} == $self->{button}) {	3685	if ($ev->{button} == $self->{button}) {
2959	undef $GRAB;	3686	undef $GRAB;
2960	$self->hide;	3687	$self->hide;
2961		3688
2962	$self->_emit ("popdown");	3689	$self->emit ("popdown");
2963	$self->{hover}[1]->() if $self->{hover};	3690	$self->{hover}[1]->() if $self->{hover};
2964	} else {	3691	} else {
2965	return 0	3692	return 0
2966	}	3693	}
2967		3694
2968	1	3695	1
2969	}	3696	}
2970		3697
2971	#############################################################################	3698	#############################################################################
2972		3699
2973	package CFClient::UI::Multiplexer;	3700	package CFPlus::UI::Multiplexer;
2974		3701
2975	our @ISA = CFClient::UI::Container::;	3702	our @ISA = CFPlus::UI::Container::;
2976		3703
2977	sub new {	3704	sub new {
2978	my $class = shift;	3705	my $class = shift;
2979		3706
2980	my $self = $class->SUPER::new (	3707	my $self = $class->SUPER::new (
…		…
2994		3721
2995	$self->{current} = $self->{children}[0]	3722	$self->{current} = $self->{children}[0]
2996	if @{ $self->{children} };	3723	if @{ $self->{children} };
2997	}	3724	}
2998		3725
		3726	sub get_current_page {
		3727	my ($self) = @_;
		3728
		3729	$self->{current}
		3730	}
		3731
2999	sub set_current_page {	3732	sub set_current_page {
3000	my ($self, $page_or_widget) = @_;	3733	my ($self, $page_or_widget) = @_;
3001		3734
3002	my $widget = ref $page_or_widget	3735	my $widget = ref $page_or_widget
3003	? $page_or_widget	3736	? $page_or_widget
3004	: $self->{children}[$page_or_widget];	3737	: $self->{children}[$page_or_widget];
3005		3738
3006	$self->{current} = $widget;	3739	$self->{current} = $widget;
3007	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3740	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008		3741
3009	$self->_emit (page_changed => $self->{current});	3742	$self->emit (page_changed => $self->{current});
3010		3743
3011	$self->realloc;	3744	$self->realloc;
3012	}	3745	}
3013		3746
3014	sub visible_children {	3747	sub visible_children {
…		…
3019	my ($self) = @_;	3752	my ($self) = @_;
3020		3753
3021	$self->{current}->size_request	3754	$self->{current}->size_request
3022	}	3755	}
3023		3756
3024	sub size_allocate {	3757	sub invoke_size_allocate {
3025	my ($self, $w, $h) = @_;	3758	my ($self, $w, $h) = @_;
3026		3759
3027	$self->{current}->configure (0, 0, $w, $h);	3760	$self->{current}->configure (0, 0, $w, $h);
		3761
		3762	1
3028	}	3763	}
3029		3764
3030	sub _draw {	3765	sub _draw {
3031	my ($self) = @_;	3766	my ($self) = @_;
3032		3767
3033	$self->{current}->draw;	3768	$self->{current}->draw;
3034	}	3769	}
3035		3770
3036	#############################################################################	3771	#############################################################################
3037		3772
3038	package CFClient::UI::Notebook;	3773	package CFPlus::UI::Notebook;
3039		3774
3040	our @ISA = CFClient::UI::VBox::;	3775	our @ISA = CFPlus::UI::VBox::;
3041		3776
3042	sub new {	3777	sub new {
3043	my $class = shift;	3778	my $class = shift;
3044		3779
3045	my $self = $class->SUPER::new (	3780	my $self = $class->SUPER::new (
3046	buttonbar => (new CFClient::UI::Buttonbar),	3781	buttonbar => (new CFPlus::UI::Buttonbar),
3047	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3782	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3048	# filter => # will be put between multiplexer and $self	3783	# filter => # will be put between multiplexer and $self
3049	@_,	3784	@_,
3050	);	3785	);
3051		3786
3052	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3787	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3056	}	3791	}
3057		3792
3058	sub add {	3793	sub add {
3059	my ($self, $title, $widget, $tooltip) = @_;	3794	my ($self, $title, $widget, $tooltip) = @_;
3060		3795
3061	Scalar::Util::weaken $self;	3796	CFPlus::weaken $self;
3062		3797
3063	$self->{buttonbar}->add (new CFClient::UI::Button	3798	$self->{buttonbar}->add (new CFPlus::UI::Button
3064	markup => $title,	3799	markup => $title,
3065	tooltip => $tooltip,	3800	tooltip => $tooltip,
3066	on_activate => sub { $self->set_current_page ($widget) },	3801	on_activate => sub { $self->set_current_page ($widget) },
3067	);	3802	);
3068		3803
3069	$self->{multiplexer}->add ($widget);	3804	$self->{multiplexer}->add ($widget);
3070	}	3805	}
3071		3806
		3807	sub get_current_page {
		3808	my ($self) = @_;
		3809
		3810	$self->{multiplexer}->get_current_page
		3811	}
		3812
3072	sub set_current_page {	3813	sub set_current_page {
3073	my ($self, $page) = @_;	3814	my ($self, $page) = @_;
3074		3815
3075	$self->{multiplexer}->set_current_page ($page);	3816	$self->{multiplexer}->set_current_page ($page);
3076	$self->_emit (page_changed => $self->{multiplexer}{current});	3817	$self->emit (page_changed => $self->{multiplexer}{current});
3077	}	3818	}
3078		3819
3079	#############################################################################	3820	#############################################################################
3080		3821
		3822	package CFPlus::UI::Selector;
		3823
		3824	use utf8;
		3825
		3826	our @ISA = CFPlus::UI::Button::;
		3827
		3828	sub new {
		3829	my $class = shift;
		3830
		3831	my $self = $class->SUPER::new (
		3832	options => [], # [value, title, longdesc], ...
		3833	value => undef,
		3834	@_,
		3835	);
		3836
		3837	$self->_set_value ($self->{value});
		3838
		3839	$self
		3840	}
		3841
		3842	sub invoke_button_down {
		3843	my ($self, $ev) = @_;
		3844
		3845	my @menu_items;
		3846
		3847	for (@{ $self->{options} }) {
		3848	my ($value, $title, $tooltip) = @$_;
		3849
		3850	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3851	}
		3852
		3853	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3854	}
		3855
		3856	sub _set_value {
		3857	my ($self, $value) = @_;
		3858
		3859	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3860	or return;
		3861
		3862	$self->{value} = $item->[0];
		3863	$self->set_markup ("$item->[1] ⇓");
		3864	$self->set_tooltip ($item->[2]);
		3865	}
		3866
		3867	sub set_value {
		3868	my ($self, $value) = @_;
		3869
		3870	return unless $self->{value} ne $value;
		3871
		3872	$self->_set_value ($value);
		3873	$self->emit (changed => $value);
		3874	}
		3875
		3876	#############################################################################
		3877
3081	package CFClient::UI::Statusbox;	3878	package CFPlus::UI::Statusbox;
3082		3879
3083	our @ISA = CFClient::UI::VBox::;	3880	our @ISA = CFPlus::UI::VBox::;
3084		3881
3085	sub new {	3882	sub new {
3086	my $class = shift;	3883	my $class = shift;
3087		3884
3088	my $self = $class->SUPER::new (	3885	my $self = $class->SUPER::new (
3089	fontsize => 0.8,	3886	fontsize => 0.8,
3090	@_,	3887	@_,
3091	);	3888	);
3092		3889
3093	Scalar::Util::weaken (my $this = $self);	3890	CFPlus::weaken (my $this = $self);
3094		3891
3095	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3892	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096		3893
3097	$self	3894	$self
3098	}	3895	}
…		…
3100	sub reorder {	3897	sub reorder {
3101	my ($self) = @_;	3898	my ($self) = @_;
3102	my $NOW = Time::HiRes::time;	3899	my $NOW = Time::HiRes::time;
3103		3900
3104	# freeze display when hovering over any label	3901	# freeze display when hovering over any label
3105	return if $CFClient::UI::TOOLTIP->{owner}	3902	return if $CFPlus::UI::TOOLTIP->{owner}
3106	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3903	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3107	values %{ $self->{item} };	3904	values %{ $self->{item} };
3108		3905
3109	while (my ($k, $v) = each %{ $self->{item} }) {	3906	while (my ($k, $v) = each %{ $self->{item} }) {
3110	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3907	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111	}	3908	}
…		…
3132	for ($short) {	3929	for ($short) {
3133	s/^\s+//;	3930	s/^\s+//;
3134	s/\s+/ /g;	3931	s/\s+/ /g;
3135	}	3932	}
3136		3933
3137	new CFClient::UI::Label	3934	new CFPlus::UI::Label
3138	markup => $short,	3935	markup => $short,
3139	tooltip => $item->{tooltip},	3936	tooltip => $item->{tooltip},
3140	tooltip_font => $::FONT_PROP,	3937	tooltip_font => $::FONT_PROP,
3141	tooltip_width => 0.67,	3938	tooltip_width => 0.67,
3142	fontsize => $item->{fontsize} || $self->{fontsize},	3939	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3180	$item->{count}++;	3977	$item->{count}++;
3181	} else {	3978	} else {
3182	$item->{count} = 1;	3979	$item->{count} = 1;
3183	$item->{text} = $item->{tooltip} = $text;	3980	$item->{text} = $item->{tooltip} = $text;
3184	}	3981	}
3185	$item->{id} = ++$self->{id};	3982	$item->{id} += 0.2;#d#
3186	$item->{timeout} = $timeout;	3983	$item->{timeout} = $timeout;
3187	delete $item->{label};	3984	delete $item->{label};
3188	} else {	3985	} else {
3189	$self->{item}{$group} = {	3986	$self->{item}{$group} = {
3190	id => ++$self->{id},	3987	id => ++$self->{id},
…		…
3196	count => 1,	3993	count => 1,
3197	%arg,	3994	%arg,
3198	};	3995	};
3199	}	3996	}
3200		3997
		3998	$ROOT->on_refresh (reorder => sub {
3201	$self->reorder;	3999	$self->reorder;
		4000	});
3202	}	4001	}
3203		4002
3204	sub reconfigure {	4003	sub reconfigure {
3205	my ($self) = @_;	4004	my ($self) = @_;
3206		4005
…		…
3209		4008
3210	$self->reorder;	4009	$self->reorder;
3211	$self->SUPER::reconfigure;	4010	$self->SUPER::reconfigure;
3212	}	4011	}
3213		4012
3214	sub DESTROY {	4013	sub destroy {
3215	my ($self) = @_;	4014	my ($self) = @_;
3216		4015
3217	$self->{timer}->cancel;	4016	$self->{timer}->cancel;
3218		4017
3219	$self->SUPER::DESTROY;	4018	$self->SUPER::destroy;
3220	}	4019	}
3221		4020
3222	#############################################################################	4021	#############################################################################
3223		4022
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;	4023	package CFPlus::UI::Root;
3520		4024
3521	our @ISA = CFClient::UI::Container::;	4025	our @ISA = CFPlus::UI::Container::;
3522		4026
3523	use List::Util qw(min max);	4027	use List::Util qw(min max);
3524		4028
3525	use CFClient::OpenGL;	4029	use CFPlus::OpenGL;
3526		4030
3527	sub new {	4031	sub new {
3528	my $class = shift;	4032	my $class = shift;
3529		4033
3530	my $self = $class->SUPER::new (	4034	my $self = $class->SUPER::new (
3531	visible => 1,	4035	visible => 1,
3532	@_,	4036	@_,
3533	);	4037	);
3534		4038
3535	Scalar::Util::weaken ($self->{root} = $self);	4039	CFPlus::weaken ($self->{root} = $self);
3536		4040
3537	$self	4041	$self
3538	}	4042	}
3539		4043
3540	sub size_request {	4044	sub size_request {
…		…
3555	$coord = $max - $size if $coord > $max - $size;	4059	$coord = $max - $size if $coord > $max - $size;
3556		4060
3557	int $coord + 0.5	4061	int $coord + 0.5
3558	}	4062	}
3559		4063
3560	sub size_allocate {	4064	sub invoke_size_allocate {
3561	my ($self, $w, $h) = @_;	4065	my ($self, $w, $h) = @_;
3562		4066
3563	for my $child ($self->children) {	4067	for my $child ($self->children) {
3564	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4068	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565		4069
…		…
3569	$X = _to_pixel $X, $W, $self->{w};	4073	$X = _to_pixel $X, $W, $self->{w};
3570	$Y = _to_pixel $Y, $H, $self->{h};	4074	$Y = _to_pixel $Y, $H, $self->{h};
3571		4075
3572	$child->configure ($X, $Y, $W, $H);	4076	$child->configure ($X, $Y, $W, $H);
3573	}	4077	}
		4078
		4079	1
3574	}	4080	}
3575		4081
3576	sub coord2local {	4082	sub coord2local {
3577	my ($self, $x, $y) = @_;	4083	my ($self, $x, $y) = @_;
3578		4084
…		…
3704	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4210	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705		4211
3706	$w = 0 if $w < 0;	4212	$w = 0 if $w < 0;
3707	$h = 0 if $h < 0;	4213	$h = 0 if $h < 0;
3708		4214
		4215	$w = max $widget->{min_w}, $w;
		4216	$h = max $widget->{min_h}, $h;
		4217
		4218	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4219	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4220
		4221	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4222	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4223
3709	$w = int $w + 0.5;	4224	$w = int $w + 0.5;
3710	$h = int $h + 0.5;	4225	$h = int $h + 0.5;
3711		4226
3712	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4227	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713	$widget->{old_w} = $widget->{w};	4228	$widget->{old_w} = $widget->{w};
…		…
3723		4238
3724	while ($self->{post_alloc_hook}) {	4239	while ($self->{post_alloc_hook}) {
3725	$_->()	4240	$_->()
3726	for values %{delete $self->{post_alloc_hook}};	4241	for values %{delete $self->{post_alloc_hook}};
3727	}	4242	}
3728
3729		4243
3730	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4244	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3731	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4245	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3732	glClear GL_COLOR_BUFFER_BIT;	4246	glClear GL_COLOR_BUFFER_BIT;
3733		4247
…		…
3736	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4250	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737	glMatrixMode GL_MODELVIEW;	4251	glMatrixMode GL_MODELVIEW;
3738	glLoadIdentity;	4252	glLoadIdentity;
3739		4253
3740	{	4254	{
3741	package CFClient::UI::Base;	4255	package CFPlus::UI::Base;
3742		4256
3743	($draw_x, $draw_y, $draw_w, $draw_h) =	4257	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3744	(0, 0, $self->{w}, $self->{h});	4258	(0, 0, $self->{w}, $self->{h});
3745	}
3746		4259
3747	$self->_draw;	4260	$self->_draw;
		4261	}
3748	}	4262	}
3749		4263
3750	#############################################################################	4264	#############################################################################
3751		4265
3752	package CFClient::UI;	4266	package CFPlus::UI;
3753		4267
3754	$ROOT = new CFClient::UI::Root;	4268	$ROOT = new CFPlus::UI::Root;
3755	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4269	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3756		4270
3757	1	4271	1
3758		4272

Diff Legend

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