ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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