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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

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

Diff Legend

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