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

Diff Legend

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