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

Diff Legend

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