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.287 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 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) = @_;
… …
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
874our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
875 950
876sub new { 951sub new {
877 my $class = shift; 952 my $class = shift;
878 953
879 $class->SUPER::new ( 954 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
893 968
894 ($w, $h) 969 ($w, $h)
895} 970}
896 971
897sub size_allocate { 972sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
899 974
900 my $child = $self->child; 975 my $child = $self->child;
901 976
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 979
905 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
906 $self->update; 981 $self->update;
982
983 1
907} 984}
908 985
909sub set_offset { 986sub set_offset {
910 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
911 988
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1016 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1018 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1020 }
944} 1021}
945 1022
946sub _render { 1023sub _render {
947 my ($self) = @_; 1024 my ($self) = @_;
948 1025
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 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}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1028
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1030
954 $self->SUPER::_render; 1031 $self->SUPER::_render;
955} 1032}
956 1033
957############################################################################# 1034#############################################################################
958 1035
959package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
960 1037
961our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::HBox::;
962 1039
963sub new { 1040sub new {
964 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
965 1042
966 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
967 1044
968 my $self; 1045 my $self;
969 1046
970 my $slider = new CFClient::UI::Slider 1047 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1048 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1050 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1051 $self->{vp}->set_offset (0, $_[1]);
975 }, 1052 },
976 ; 1053 ;
977 1054
978 $self = $class->SUPER::new ( 1055 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1056 vp => (new CFPlus::UI::ViewPort expand => 1),
1057 can_events => 1,
980 slider => $slider, 1058 slider => $slider,
981 %arg, 1059 %arg,
982 ); 1060 );
983 1061
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1063 $self->add ($child) if $child;
986 1064
987 $self 1065 $self
988} 1066}
989 1067
1068#TODO# update range on size_allocate depending on child
1069
990sub add { 1070sub add {
991 my ($self, $widget) = @_; 1071 my ($self, $widget) = @_;
992 1072
993 $self->{vp}->add ($self->{child} = $widget); 1073 $self->{vp}->add ($self->{child} = $widget);
994} 1074}
995 1075
1076sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_;
1078
1079 return 0 unless $ev->{dy}; # only vertical movements
1080
1081 $self->{slider}->emit (mouse_wheel => $ev);
1082
1083 1
1084}
1085
1086sub update_slider {
1087 my ($self) = @_;
1088
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1090}
1091
996sub update { 1092sub update {
997 my ($self) = @_; 1093 my ($self) = @_;
998 1094
999 $self->SUPER::update; 1095 $self->SUPER::update;
1000 1096
1001 # todo: overwrite size_allocate of child 1097 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1098}
1005 1099
1006sub size_allocate { 1100sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1101 my ($self, $w, $h) = @_;
1008 1102
1103 $self->update_slider;
1104
1009 $self->SUPER::size_allocate ($w, $h); 1105 $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} 1106}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1107
1018############################################################################# 1108#############################################################################
1019 1109
1020package CFClient::UI::Frame; 1110package CFPlus::UI::Frame;
1021 1111
1022our @ISA = CFClient::UI::Bin::; 1112our @ISA = CFPlus::UI::Bin::;
1023 1113
1024use CFClient::OpenGL; 1114use CFPlus::OpenGL;
1025 1115
1026sub new { 1116sub new {
1027 my $class = shift; 1117 my $class = shift;
1028 1118
1029 $class->SUPER::new ( 1119 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1145 $self->SUPER::_draw;
1056} 1146}
1057 1147
1058############################################################################# 1148#############################################################################
1059 1149
1060package CFClient::UI::FancyFrame; 1150package CFPlus::UI::FancyFrame;
1061 1151
1062our @ISA = CFClient::UI::Bin::; 1152our @ISA = CFPlus::UI::Bin::;
1063 1153
1064use CFClient::OpenGL; 1154use 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 1155
1074sub new { 1156sub new {
1075 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1076 1158
1077 my $title = delete $arg{title}; 1159 if ((exists $arg{label}) && !ref $arg{label}) {
1160 $arg{label} = new CFPlus::UI::Label
1161 align => 1,
1162 valign => 0,
1163 text => $arg{label},
1164 fontsize => ($arg{border} || 0.8) * 0.75;
1165 }
1166
1167 my $self = $class->SUPER::new (
1168 # label => "",
1169 fg => [0.6, 0.3, 0.1],
1170 border => 0.8,
1171 style => 'single',
1172 %arg,
1173 );
1174
1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1183}
1184
1185sub border {
1186 int $_[0]{border} * $::FONTSIZE
1187}
1188
1189sub size_request {
1190 my ($self) = @_;
1191
1192 ($self->{label_w}, undef) = $self->{label}->size_request
1193 if $self->{label};
1194
1195 my ($w, $h) = $self->SUPER::size_request;
1196
1197 (
1198 $w + $self->border * 2,
1199 $h + $self->border * 2,
1200 )
1201}
1202
1203sub invoke_size_allocate {
1204 my ($self, $w, $h) = @_;
1205
1206 my $border = $self->border;
1207
1208 $w -= List::Util::max 0, $border * 2;
1209 $h -= List::Util::max 0, $border * 2;
1210
1211 if (my $label = $self->{label}) {
1212 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1213 $label->{h} = List::Util::min $h, $border;
1214 $label->invoke_size_allocate ($label->{w}, $label->{h});
1215 }
1216
1217 $self->child->configure ($border, $border, $w, $h);
1218
1219 1
1220}
1221
1222sub _draw {
1223 my ($self) = @_;
1224
1225 my $child = $self->{children}[0];
1226
1227 my $border = $self->border;
1228 my ($w, $h) = ($self->{w}, $self->{h});
1229
1230 $child->draw;
1231
1232 glColor @{$self->{fg}};
1233 glBegin GL_LINE_STRIP;
1234 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1235 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1236 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1237 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1238 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1239 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1240 glEnd;
1241
1242 if ($self->{label}) {
1243 glTranslate $border * 2, 0;
1244 $self->{label}->_draw;
1245 }
1246}
1247
1248#############################################################################
1249
1250package CFPlus::UI::Toplevel;
1251
1252our @ISA = CFPlus::UI::Bin::;
1253
1254use CFPlus::OpenGL;
1255
1256my $bg =
1257 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1258 mipmap => 1, wrap => 1;
1259
1260my @border =
1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1262 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1263
1264sub new {
1265 my ($class, %arg) = @_;
1078 1266
1079 my $self = $class->SUPER::new ( 1267 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1268 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1269 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1270 border => 0.6,
1083 can_events => 1, 1271 can_events => 1,
1084 min_w => 16, 1272 min_w => 64,
1085 min_h => 16, 1273 min_h => 32,
1086 %arg, 1274 %arg,
1087 ); 1275 );
1088 1276
1089 $self->{title} = new CFClient::UI::Label 1277 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1278 align => 0,
1091 valign => 1, 1279 valign => 1,
1092 text => $title, 1280 text => $self->{title},
1093 fontsize => $self->{border} 1281 fontsize => $self->{border},
1094 if defined $title; 1282 if exists $self->{title};
1283
1284 if ($self->{has_close_button}) {
1285 $self->{close_button} =
1286 new CFPlus::UI::ImageButton
1287 path => 'x1_close.png',
1288 on_activate => sub { $self->emit ("delete") };
1289
1290 $self->CFPlus::UI::Container::add ($self->{close_button});
1291 }
1095 1292
1096 $self 1293 $self
1097} 1294}
1098 1295
1099sub add { 1296sub add {
1100 my ($self, @widgets) = @_; 1297 my ($self, @widgets) = @_;
1101 1298
1102 $self->SUPER::add (@widgets); 1299 $self->SUPER::add (@widgets);
1300 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1301 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1302}
1105 1303
1106sub border { 1304sub border {
1107 int $_[0]{border} * $::FONTSIZE 1305 int $_[0]{border} * $::FONTSIZE
1108} 1306}
1109 1307
1110sub size_request { 1308sub size_request {
1111 my ($self) = @_; 1309 my ($self) = @_;
1112 1310
1113 $self->{title}->size_request 1311 $self->{title_widget}->size_request
1114 if $self->{title}; 1312 if $self->{title_widget};
1313
1314 $self->{close_button}->size_request
1315 if $self->{close_button};
1115 1316
1116 my ($w, $h) = $self->SUPER::size_request; 1317 my ($w, $h) = $self->SUPER::size_request;
1117 1318
1118 ( 1319 (
1119 $w + $self->border * 2, 1320 $w + $self->border * 2,
1120 $h + $self->border * 2, 1321 $h + $self->border * 2,
1121 ) 1322 )
1122} 1323}
1123 1324
1124sub size_allocate { 1325sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1126 1327
1127 if ($self->{title}) { 1328 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1329 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1330 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1331 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1332 }
1132 1333
1133 my $border = $self->border; 1334 my $border = $self->border;
1134 1335
1135 $h -= List::Util::max 0, $border * 2; 1336 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1337 $w -= List::Util::max 0, $border * 2;
1338
1339 $self->child->configure ($border, $border, $w, $h);
1340
1341 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1342 if $self->{close_button};
1343
1344 1
1345}
1346
1347sub invoke_delete {
1348 my ($self) = @_;
1349
1350 $self->hide;
1137 1351
1138 $self->child->configure ($border, $border, $w, $h); 1352 1
1139} 1353}
1140 1354
1141sub button_down { 1355sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1356 my ($self, $ev, $x, $y) = @_;
1143 1357
1144 my ($w, $h) = @$self{qw(w h)}; 1358 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1359 my $border = $self->border;
1146 1360
… …
1177 1391
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1392 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1393
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1394 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1395 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1396 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1397 };
1184 } else { 1398 } else {
1185 return 0; 1399 return 0;
1186 } 1400 }
1187 1401
1188 1 1402 1
1189} 1403}
1190 1404
1191sub button_up { 1405sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
1193 1407
1194 !!delete $self->{motion} 1408 ! ! delete $self->{motion}
1195} 1409}
1196 1410
1197sub mouse_motion { 1411sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1412 my ($self, $ev, $x, $y) = @_;
1199 1413
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1414 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1415
1202 !!$self->{motion} 1416 ! ! $self->{motion}
1417}
1418
1419sub invoke_visibility_change {
1420 my ($self, $visible) = @_;
1421
1422 delete $self->{motion} unless $visible;
1423
1424 0
1203} 1425}
1204 1426
1205sub _draw { 1427sub _draw {
1206 my ($self) = @_; 1428 my ($self) = @_;
1207 1429
… …
1233 1455
1234 glDisable GL_TEXTURE_2D; 1456 glDisable GL_TEXTURE_2D;
1235 1457
1236 $child->draw; 1458 $child->draw;
1237 1459
1238 if ($self->{title}) { 1460 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1461 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1462 $self->{title_widget}->_draw;
1463
1464 glTranslate 0, - ($border - $self->{h});
1241 } 1465 }
1466
1467 $self->{close_button}->draw
1468 if $self->{close_button};
1242} 1469}
1243 1470
1244############################################################################# 1471#############################################################################
1245 1472
1246package CFClient::UI::Table; 1473package CFPlus::UI::Table;
1247 1474
1248our @ISA = CFClient::UI::Base::; 1475our @ISA = CFPlus::UI::Base::;
1249 1476
1250use List::Util qw(max sum); 1477use List::Util qw(max sum);
1251 1478
1252use CFClient::OpenGL; 1479use CFPlus::OpenGL;
1253 1480
1254sub new { 1481sub new {
1255 my $class = shift; 1482 my $class = shift;
1256 1483
1257 $class->SUPER::new ( 1484 $class->SUPER::new (
… …
1263sub children { 1490sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1492}
1266 1493
1267sub add { 1494sub add {
1268 my ($self, $x, $y, $child) = @_; 1495 my ($self) = shift;
1269 1496
1497 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1499 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1500 $self->{children}[$y][$x] = $child;
1501 }
1272 1502
1503 $self->{force_realloc} = 1;
1504 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1505 $self->realloc;
1506}
1507
1508sub remove {
1509 my ($self, $child) = @_;
1510
1511 # TODO: not yet implemented
1274} 1512}
1275 1513
1276# TODO: move to container class maybe? send children a signal on removal? 1514# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1515sub clear {
1278 my ($self) = @_; 1516 my ($self) = @_;
… …
1319 (sum @$ws), 1557 (sum @$ws),
1320 (sum @$hs), 1558 (sum @$hs),
1321 ) 1559 )
1322} 1560}
1323 1561
1324sub size_allocate { 1562sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1563 my ($self, $w, $h) = @_;
1326 1564
1327 my ($ws, $hs) = $self->get_wh; 1565 my ($ws, $hs) = $self->get_wh;
1328 1566
1329 my $req_w = (sum @$ws) || 1; 1567 my $req_w = (sum @$ws) || 1;
… …
1336 1574
1337 # linearly scale sizes 1575 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1578
1341 CFClient::UI::harmonize $ws; 1579 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1580 CFPlus::UI::harmonize $hs;
1343 1581
1344 my $y; 1582 my $y;
1345 1583
1346 for my $r (0 .. $#{$self->{children}}) { 1584 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1585 my $row = $self->{children}[$r]
… …
1361 } 1599 }
1362 1600
1363 $y += $row_h; 1601 $y += $row_h;
1364 } 1602 }
1365 1603
1604 1
1366} 1605}
1367 1606
1368sub find_widget { 1607sub find_widget {
1369 my ($self, $x, $y) = @_; 1608 my ($self, $x, $y) = @_;
1370 1609
… …
1389 } 1628 }
1390} 1629}
1391 1630
1392############################################################################# 1631#############################################################################
1393 1632
1394package CFClient::UI::Box; 1633package CFPlus::UI::Box;
1395 1634
1396our @ISA = CFClient::UI::Container::; 1635our @ISA = CFPlus::UI::Container::;
1397 1636
1398sub size_request { 1637sub size_request {
1399 my ($self) = @_; 1638 my ($self) = @_;
1400 1639
1401 $self->{vertical} 1640 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1646 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1647 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1648 )
1410} 1649}
1411 1650
1412sub size_allocate { 1651sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1414 1653
1415 my $space = $self->{vertical} ? $h : $w; 1654 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1655 my @children = $self->visible_children;
1417 1656
1418 my @req; 1657 my @req;
1419 1658
1420 if ($self->{homogeneous}) { 1659 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1660 @req = ($space / (@children || 1)) x @children;
1422 } else { 1661 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1662 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1663 my $req = List::Util::sum @req;
1425 1664
1426 if ($req > $space) { 1665 if ($req > $space) {
1427 # ah well, not enough space 1666 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1667 $_ *= $space / $req for @req;
1429 } else { 1668 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1669 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1670
1432 $space = ($space - $req) / $expand; # remaining space to give away 1671 $space = ($space - $req) / $expand; # remaining space to give away
1433 1672
1434 $req[$_] += $space * $children->[$_]{expand} 1673 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1674 for 0 .. $#children;
1436 } 1675 }
1437 } 1676 }
1438 1677
1439 CFClient::UI::harmonize \@req; 1678 CFPlus::UI::harmonize \@req;
1440 1679
1441 my $pos = 0; 1680 my $pos = 0;
1442 for (0 .. $#$children) { 1681 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1682 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1683 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1684
1446 $pos += $alloc; 1685 $pos += $alloc;
1447 } 1686 }
1448 1687
1449 1 1688 1
1450} 1689}
1451 1690
1452############################################################################# 1691#############################################################################
1453 1692
1454package CFClient::UI::HBox; 1693package CFPlus::UI::HBox;
1455 1694
1456our @ISA = CFClient::UI::Box::; 1695our @ISA = CFPlus::UI::Box::;
1457 1696
1458sub new { 1697sub new {
1459 my $class = shift; 1698 my $class = shift;
1460 1699
1461 $class->SUPER::new ( 1700 $class->SUPER::new (
… …
1464 ) 1703 )
1465} 1704}
1466 1705
1467############################################################################# 1706#############################################################################
1468 1707
1469package CFClient::UI::VBox; 1708package CFPlus::UI::VBox;
1470 1709
1471our @ISA = CFClient::UI::Box::; 1710our @ISA = CFPlus::UI::Box::;
1472 1711
1473sub new { 1712sub new {
1474 my $class = shift; 1713 my $class = shift;
1475 1714
1476 $class->SUPER::new ( 1715 $class->SUPER::new (
… …
1479 ) 1718 )
1480} 1719}
1481 1720
1482############################################################################# 1721#############################################################################
1483 1722
1484package CFClient::UI::Label; 1723package CFPlus::UI::Label;
1485 1724
1486our @ISA = CFClient::UI::DrawBG::; 1725our @ISA = CFPlus::UI::DrawBG::;
1487 1726
1488use CFClient::OpenGL; 1727use CFPlus::OpenGL;
1489 1728
1490sub new { 1729sub new {
1491 my ($class, %arg) = @_; 1730 my ($class, %arg) = @_;
1492 1731
1493 my $self = $class->SUPER::new ( 1732 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1735 #active_bg => none
1497 #font => default_font 1736 #font => default_font
1498 #text => initial text 1737 #text => initial text
1499 #markup => initial narkup 1738 #markup => initial narkup
1500 #max_w => maximum pixel width 1739 #max_w => maximum pixel width
1740 #style => 0, # render flags
1501 ellipsise => 3, # end 1741 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1742 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1743 fontsize => 1,
1504 align => -1, 1744 align => -1,
1505 valign => -1, 1745 valign => -1,
1506 padding_x => 2, 1746 padding_x => 2,
1507 padding_y => 2, 1747 padding_y => 2,
1508 can_events => 0, 1748 can_events => 0,
1509 %arg 1749 %arg
1510 ); 1750 );
1511 1751
1512 if (exists $self->{template}) { 1752 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1753 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1754 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1755 $self->{template} = $layout;
1516 } 1756 }
1517 1757
1518 if (exists $self->{markup}) { 1758 if (exists $self->{markup}) {
… …
1522 } 1762 }
1523 1763
1524 $self 1764 $self
1525} 1765}
1526 1766
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1767sub update {
1538 my ($self) = @_; 1768 my ($self) = @_;
1539 1769
1540 delete $self->{texture}; 1770 delete $self->{texture};
1541 $self->SUPER::update; 1771 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1782 my ($self, $text) = @_;
1553 1783
1554 return if $self->{text} eq "T$text"; 1784 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1785 $self->{text} = "T$text";
1556 1786
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1787 $self->{layout}->set_text ($text);
1788
1559 delete $self->{req_h}; 1789 delete $self->{size_req};
1560
1561 $self->realloc; 1790 $self->realloc;
1562 $self->update; 1791 $self->update;
1563} 1792}
1564 1793
1565sub set_markup { 1794sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1797 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1798 $self->{text} = "M$markup";
1570 1799
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1800 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1801
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1802 $self->{layout}->set_markup ($markup);
1803
1575 delete $self->{req_h}; 1804 delete $self->{size_req};
1576
1577 $self->realloc; 1805 $self->realloc;
1578 $self->update; 1806 $self->update;
1579} 1807}
1580 1808
1581sub size_request { 1809sub size_request {
1582 my ($self) = @_; 1810 my ($self) = @_;
1583 1811
1584 if (exists $self->{req_h}) { 1812 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1813 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1814 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1815 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1816 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1818
1593 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1594 1820
1595 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1822 $self->{template}->set_font ($self->{font}) if $self->{font};
1823 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1825
1599 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1600 1827
1601 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1829 $h = List::Util::max $h, $h2;
1603 } 1830 }
1604 1831
1605 ($w, $h) 1832 [$w, $h]
1606 } 1833 };
1607}
1608 1834
1835 @{ $self->{size_req} }
1836}
1837
1838sub baseline_shift {
1839 $_[0]{layout}->descent
1840}
1841
1609sub size_allocate { 1842sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1843 my ($self, $w, $h) = @_;
1611 1844
1612 delete $self->{ox}; 1845 delete $self->{ox};
1613 1846
1614 delete $self->{texture} 1847 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1848 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1849
1850 1
1616} 1851}
1617 1852
1618sub set_fontsize { 1853sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1854 my ($self, $fontsize) = @_;
1620 1855
1621 $self->{fontsize} = $fontsize; 1856 $self->{fontsize} = $fontsize;
1857 delete $self->{size_req};
1622 delete $self->{texture}; 1858 delete $self->{texture};
1623 1859
1624 $self->realloc; 1860 $self->realloc;
1625} 1861}
1626 1862
1863sub reconfigure {
1864 my ($self) = @_;
1865
1866 delete $self->{size_req};
1867 delete $self->{texture};
1868
1869 $self->SUPER::reconfigure;
1870}
1871
1627sub _draw { 1872sub _draw {
1628 my ($self) = @_; 1873 my ($self) = @_;
1629 1874
1630 $self->SUPER::_draw; # draw background, if applicable 1875 $self->SUPER::_draw; # draw background, if applicable
1631 1876
1632 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1878 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1880 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1881 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1882 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1884
1640 new_from_layout CFClient::Texture $self->{layout} 1885 [$self->{layout}->size]
1641 }; 1886 };
1642 1887
1643 unless (exists $self->{ox}) { 1888 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1889 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1890 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1891 : ($self->{w} - $size->[0]) * 0.5);
1647 1892
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1895 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1896 };
1652 1897
1653 glEnable GL_TEXTURE_2D; 1898 my $w = List::Util::min $self->{w} + 4, $size->[0];
1899 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1900
1655 if ($tex->{format} == GL_ALPHA) { 1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1662 }
1663
1664 glDisable GL_TEXTURE_2D;
1665} 1902}
1666 1903
1667############################################################################# 1904#############################################################################
1668 1905
1669package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1670 1907
1671our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1672 1909
1673use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1674 1911
1675sub new { 1912sub new {
1676 my $class = shift; 1913 my $class = shift;
1677 1914
1678 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1682 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1683 can_hover => 1, 1920 can_hover => 1,
1684 can_focus => 1, 1921 can_focus => 1,
1685 valign => 0, 1922 valign => 0,
1686 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1687 #text => ... 1925 #text => ...
1926 #hidden => "*",
1688 @_ 1927 @_
1689 ) 1928 )
1690} 1929}
1691 1930
1692sub _set_text { 1931sub _set_text {
… …
1699 $self->{last_activity} = $::NOW; 1938 $self->{last_activity} = $::NOW;
1700 $self->{text} = $text; 1939 $self->{text} = $text;
1701 1940
1702 $text =~ s/./*/g if $self->{hidden}; 1941 $text =~ s/./*/g if $self->{hidden};
1703 $self->{layout}->set_text ("$text "); 1942 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h}; 1943 delete $self->{size_req};
1705 1944
1706 $self->_emit (changed => $self->{text}); 1945 $self->emit (changed => $self->{text});
1707 1946
1708 $self->realloc; 1947 $self->realloc;
1709 $self->update; 1948 $self->update;
1710} 1949}
1711 1950
… …
1726 my ($w, $h) = $self->SUPER::size_request; 1965 my ($w, $h) = $self->SUPER::size_request;
1727 1966
1728 ($w + 1, $h) # add 1 for cursor 1967 ($w + 1, $h) # add 1 for cursor
1729} 1968}
1730 1969
1731sub key_down { 1970sub invoke_key_down {
1732 my ($self, $ev) = @_; 1971 my ($self, $ev) = @_;
1733 1972
1734 my $mod = $ev->{mod}; 1973 my $mod = $ev->{mod};
1735 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1736 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1737 1976
1738 my $text = $self->get_text; 1977 my $text = $self->get_text;
1978
1979 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1739 1980
1740 if ($uni == 8) { 1981 if ($uni == 8) {
1741 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1742 } elsif ($uni == 127) { 1983 } elsif ($uni == 127) {
1743 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1744 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1745 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1746 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1747 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1748 } elsif ($sym == CFClient::SDLK_HOME) { 1989 } elsif ($sym == CFPlus::SDLK_HOME) {
1990 # what a hack
1991 $self->{cursor} =
1992 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1993 ? length $1
1994 : 0;
1995 } elsif ($sym == CFPlus::SDLK_END) {
1996 # uh, again
1997 $self->{cursor} =
1998 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1999 ? $self->{cursor} + length $1
2000 : length $self->{text};
2001 } elsif ($uni == 21) { # ctrl-u
2002 $text = "";
1749 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1750 } elsif ($sym == CFClient::SDLK_END) {
1751 $self->{cursor} = length $text;
1752 } elsif ($uni == 27) { 2004 } elsif ($uni == 27) {
1753 $self->_emit ('escape'); 2005 $self->emit ('escape');
1754 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1755 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else { 2010 } else {
1757 return 0; 2011 return 0;
1758 } 2012 }
1759 2013
1760 $self->_set_text ($text); 2014 $self->_set_text ($text);
1761 2015
1762 $self->realloc; 2016 $self->realloc;
2017 $self->update;
1763 2018
1764 1 2019 1
1765} 2020}
1766 2021
1767sub focus_in { 2022sub invoke_focus_in {
1768 my ($self) = @_; 2023 my ($self) = @_;
1769 2024
1770 $self->{last_activity} = $::NOW; 2025 $self->{last_activity} = $::NOW;
1771 2026
1772 $self->SUPER::focus_in; 2027 $self->SUPER::invoke_focus_in
1773} 2028}
1774 2029
1775sub button_down { 2030sub invoke_button_down {
1776 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1777 2032
1778 $self->SUPER::button_down ($ev, $x, $y); 2033 $self->SUPER::invoke_button_down ($ev, $x, $y);
1779 2034
1780 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1781 2036
1782 # byte-index to char-index 2037 # byte-index to char-index
1783 my $text = $self->{text}; 2038 my $text = $self->{text};
1784 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1785 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1786 2041
1787 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1788 $self->update; 2043 $self->update;
1789 2044
1790 1 2045 1
1791} 2046}
1792 2047
1793sub mouse_motion { 2048sub invoke_mouse_motion {
1794 my ($self, $ev, $x, $y) = @_; 2049 my ($self, $ev, $x, $y) = @_;
1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2050# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796 2051
1797 0 2052 1
1798} 2053}
1799 2054
1800sub _draw { 2055sub _draw {
1801 my ($self) = @_; 2056 my ($self) = @_;
1802 2057
… …
1829 utf8::encode $text; 2084 utf8::encode $text;
1830 2085
1831 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2086 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1832 } 2087 }
1833 2088
1834 glColor @{$self->{fg}};
1835 glBegin GL_LINES; 2089 glBegin GL_LINES;
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2090 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1837 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2091 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1838 glEnd; 2092 glEnd;
1839 } 2093 }
1840} 2094}
1841 2095
2096#############################################################################
2097
1842package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1843 2099
1844our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1845 2101
1846use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1847 2103
1848sub key_down { 2104sub invoke_key_down {
1849 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1850 2106
1851 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1852 2108
1853 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1854 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1855 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
2112
1856 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1857 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1858 $self->_emit (activate => $txt); 2115 $self->emit (activate => $txt);
1859 $self->update; 2116 $self->update;
1860 2117
1861 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1862 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1863 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1864 } 2121 }
1865 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1866 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1868 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1869 } 2126 }
1870 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1871 } 2128 }
1872 2129
1873 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1874 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1875 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1876 2133
1877 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1878 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1879 } else { 2136 } else {
1880 $self->set_text ($self->{history_saveback}); 2137 $self->set_text ($self->{history_saveback});
1881 } 2138 }
1882 2139
1883 } else { 2140 } else {
1884 return $self->SUPER::key_down ($ev) 2141 return $self->SUPER::invoke_key_down ($ev)
1885 } 2142 }
1886 2143
1887 1 2144 1
1888} 2145}
1889 2146
1890############################################################################# 2147#############################################################################
1891 2148
2149package CFPlus::UI::TextEdit;
2150
2151our @ISA = CFPlus::UI::EntryBase::;
2152
2153use CFPlus::OpenGL;
2154
2155sub move_cursor_ver {
2156 my ($self, $dy) = @_;
2157
2158 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2159
2160 $y += $dy;
2161
2162 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2163 $self->{cursor} = $index;
2164 delete $self->{cur_h};
2165 $self->update;
2166 return;
2167 }
2168}
2169
2170sub invoke_key_down {
2171 my ($self, $ev) = @_;
2172
2173 my $sym = $ev->{sym};
2174
2175 if ($sym == CFPlus::SDLK_UP) {
2176 $self->move_cursor_ver (-1);
2177 } elsif ($sym == CFPlus::SDLK_DOWN) {
2178 $self->move_cursor_ver (+1);
2179 } else {
2180 return $self->SUPER::invoke_key_down ($ev)
2181 }
2182
2183 1
2184}
2185
2186#############################################################################
2187
1892package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1893 2189
1894our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1895 2191
1896use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1897 2193
1898my @tex = 2194my @tex =
1899 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1900 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1901 2197
1902sub new { 2198sub new {
1903 my $class = shift; 2199 my $class = shift;
1904 2200
… …
1913 can_events => 1, 2209 can_events => 1,
1914 @_ 2210 @_
1915 ) 2211 )
1916} 2212}
1917 2213
1918sub activate { }
1919
1920sub button_up { 2214sub invoke_button_up {
1921 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1922 2216
1923 $self->emit ("activate") 2217 $self->emit ("activate")
1924 if $x >= 0 && $x < $self->{w} 2218 if $x >= 0 && $x < $self->{w}
1925 && $y >= 0 && $y < $self->{h}; 2219 && $y >= 0 && $y < $self->{h};
… …
1943 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1944} 2238}
1945 2239
1946############################################################################# 2240#############################################################################
1947 2241
1948package CFClient::UI::CheckBox; 2242package CFPlus::UI::CheckBox;
1949 2243
1950our @ISA = CFClient::UI::DrawBG::; 2244our @ISA = CFPlus::UI::DrawBG::;
1951 2245
1952my @tex = 2246my @tex =
1953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1954 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1955 2249
1956use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1957 2251
1958sub new { 2252sub new {
1959 my $class = shift; 2253 my $class = shift;
1960 2254
1961 $class->SUPER::new ( 2255 $class->SUPER::new (
… …
1975 my ($self) = @_; 2269 my ($self) = @_;
1976 2270
1977 (6) x 2 2271 (6) x 2
1978} 2272}
1979 2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
1980sub button_down { 2282sub invoke_button_down {
1981 my ($self, $ev, $x, $y) = @_; 2283 my ($self, $ev, $x, $y) = @_;
1982 2284
1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1985 $self->{state} = !$self->{state}; 2287 $self->toggle;
1986 $self->_emit (changed => $self->{state});
1987 } else { 2288 } else {
1988 return 0 2289 return 0
1989 } 2290 }
1990 2291
1991 1 2292 1
… …
2011 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
2012} 2313}
2013 2314
2014############################################################################# 2315#############################################################################
2015 2316
2016package CFClient::UI::Image; 2317package CFPlus::UI::Image;
2017 2318
2018our @ISA = CFClient::UI::Base::; 2319our @ISA = CFPlus::UI::Base::;
2019 2320
2020use CFClient::OpenGL; 2321use CFPlus::OpenGL;
2021use Carp qw/confess/;
2022 2322
2023our %loaded_images; 2323our %texture_cache;
2024 2324
2025sub new { 2325sub new {
2026 my $class = shift; 2326 my $class = shift;
2027 2327
2028 my $self = $class->SUPER::new (can_events => 0, @_); 2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
2029 2332
2030 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2333 $self->{path} || $self->{tex}
2334 or Carp::croak "'path' or 'tex' attributes required";
2031 2335
2032 $loaded_images{$self->{image}} ||= 2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2033 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2337 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2034 2338
2035 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2339 CFPlus::weaken $texture_cache{$self->{path}};
2036 2340
2037 Scalar::Util::weaken $loaded_images{$self->{image}}; 2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2038
2039 $self->{aspect} = $tex->{w} / $tex->{h};
2040 2342
2041 $self 2343 $self
2042} 2344}
2043 2345
2346sub STORABLE_freeze {
2347 my ($self, $cloning) = @_;
2348
2349 $self->{path}
2350 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2351
2352 $self->{path}
2353}
2354
2355sub STORABLE_attach {
2356 my ($self, $cloning, $path) = @_;
2357
2358 $self->new (path => $path)
2359}
2360
2044sub size_request { 2361sub size_request {
2045 my ($self) = @_; 2362 my ($self) = @_;
2046 2363
2047 ($self->{tex}->{w}, $self->{tex}->{h}) 2364 ($self->{tex}{w}, $self->{tex}{h})
2048} 2365}
2049 2366
2050sub _draw { 2367sub _draw {
2051 my ($self) = @_; 2368 my ($self) = @_;
2052 2369
… …
2062 } 2379 }
2063 2380
2064 glEnable GL_TEXTURE_2D; 2381 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2383
2067 $tex->draw_quad_alpha (0, 0, $w, $h); 2384 $tex->draw_quad (0, 0, $w, $h);
2068 2385
2069 glDisable GL_TEXTURE_2D; 2386 glDisable GL_TEXTURE_2D;
2070} 2387}
2071 2388
2072############################################################################# 2389#############################################################################
2073 2390
2391package CFPlus::UI::ImageButton;
2392
2393our @ISA = CFPlus::UI::Image::;
2394
2395use CFPlus::OpenGL;
2396
2397my %textures;
2398
2399sub new {
2400 my $class = shift;
2401
2402 my $self = $class->SUPER::new (
2403 padding_x => 4,
2404 padding_y => 4,
2405 fg => [1, 1, 1],
2406 active_fg => [0, 0, 1],
2407 can_hover => 1,
2408 align => 0,
2409 valign => 0,
2410 can_events => 1,
2411 @_
2412 );
2413}
2414
2415sub invoke_button_up {
2416 my ($self, $ev, $x, $y) = @_;
2417
2418 $self->emit ("activate")
2419 if $x >= 0 && $x < $self->{w}
2420 && $y >= 0 && $y < $self->{h};
2421
2422 1
2423}
2424
2425#############################################################################
2426
2074package CFClient::UI::VGauge; 2427package CFPlus::UI::VGauge;
2075 2428
2076our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
2077 2430
2078use List::Util qw(min max); 2431use List::Util qw(min max);
2079 2432
2080use CFClient::OpenGL; 2433use CFPlus::OpenGL;
2081 2434
2082my %tex = ( 2435my %tex = (
2083 food => [ 2436 food => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2085 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2086 ], 2439 ],
2087 grace => [ 2440 grace => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2442 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2090 ], 2443 ],
2091 hp => [ 2444 hp => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2094 ], 2447 ],
2095 mana => [ 2448 mana => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2450 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2098 ], 2451 ],
2099); 2452);
2100 2453
2101# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2161 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
2162 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
2163 2516
2164 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
2165 my $h2 = $self->{h} * (1 - $ycut2); 2518 my $h2 = $self->{h} * (1 - $ycut2);
2519 my $h3 = $self->{h};
2520
2521 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2166 2522
2167 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2524 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2525 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
… …
2189 2545
2190 if ($t3) { 2546 if ($t3) {
2191 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
2192 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
2193 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2194 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2195 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2196 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2197 glEnd; 2553 glEnd;
2198 } 2554 }
2199 2555
2200 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
2201 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
2202} 2558}
2203 2559
2204############################################################################# 2560#############################################################################
2205 2561
2206package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
2207 2563
2208our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
2209 2565
2210sub new { 2566sub new {
2211 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
2212 2568
2213 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
2215 can_hover => 1, 2571 can_hover => 1,
2216 can_events => 1, 2572 can_events => 1,
2217 %arg, 2573 %arg,
2218 ); 2574 );
2219 2575
2220 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2576 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2221 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2577 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2222 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2578 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2223 2579
2224 $self 2580 $self
2225} 2581}
2226 2582
2227sub set_fontsize { 2583sub set_fontsize {
… …
2248 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
2249} 2605}
2250 2606
2251############################################################################# 2607#############################################################################
2252 2608
2253package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
2254 2610
2255use strict; 2611use strict;
2256 2612
2257use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2258 2614
2259our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
2260 2616
2261my @tex = 2617my @tex =
2262 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2263 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
2264 2620
2265sub new { 2621sub new {
2266 my $class = shift; 2622 my $class = shift;
2267 2623
… …
2288 $self->update; 2644 $self->update;
2289 2645
2290 $self 2646 $self
2291} 2647}
2292 2648
2293sub changed { }
2294
2295sub set_range { 2649sub set_range {
2296 my ($self, $range) = @_; 2650 my ($self, $range) = @_;
2297 2651
2298 ($range, $self->{range}) = ($self->{range}, $range); 2652 ($range, $self->{range}) = ($self->{range}, $range);
2299 2653
2300 $self->update
2301 if "@$range" ne "@{$self->{range}}"; 2654 if ("@$range" ne "@{$self->{range}}") {
2655 $self->update;
2656 $self->set_value ($self->{range}[0]);
2657 }
2302} 2658}
2303 2659
2304sub set_value { 2660sub set_value {
2305 my ($self, $value) = @_; 2661 my ($self, $value) = @_;
2306 2662
… …
2317 if $unit; 2673 if $unit;
2318 2674
2319 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2675 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2320 2676
2321 if ($value != $old_value) { 2677 if ($value != $old_value) {
2322 $self->_emit (changed => $value); 2678 $self->emit (changed => $value);
2323 $self->update; 2679 $self->update;
2324 } 2680 }
2325} 2681}
2326 2682
2327sub size_request { 2683sub size_request {
2328 my ($self) = @_; 2684 my ($self) = @_;
2329 2685
2330 ($self->{req_w}, $self->{req_h}) 2686 ($self->{req_w}, $self->{req_h})
2331} 2687}
2332 2688
2333sub button_down { 2689sub invoke_button_down {
2334 my ($self, $ev, $x, $y) = @_; 2690 my ($self, $ev, $x, $y) = @_;
2335 2691
2336 $self->SUPER::button_down ($ev, $x, $y); 2692 $self->SUPER::invoke_button_down ($ev, $x, $y);
2337 2693
2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2339 2695
2340 $self->mouse_motion ($ev, $x, $y) 2696 $self->invoke_mouse_motion ($ev, $x, $y)
2341} 2697}
2342 2698
2343sub mouse_motion { 2699sub invoke_mouse_motion {
2344 my ($self, $ev, $x, $y) = @_; 2700 my ($self, $ev, $x, $y) = @_;
2345 2701
2346 if ($GRAB == $self) { 2702 if ($GRAB == $self) {
2347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2703 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2348 2704
… …
2354 } else { 2710 } else {
2355 return 0; 2711 return 0;
2356 } 2712 }
2357 2713
2358 1 2714 1
2715}
2716
2717sub invoke_mouse_wheel {
2718 my ($self, $ev) = @_;
2719
2720 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2721
2722 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723
2724 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725
2726 ! ! $delta
2359} 2727}
2360 2728
2361sub update { 2729sub update {
2362 my ($self) = @_; 2730 my ($self) = @_;
2363 2731
… …
2412 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2413} 2781}
2414 2782
2415############################################################################# 2783#############################################################################
2416 2784
2417package CFClient::UI::ValSlider; 2785package CFPlus::UI::ValSlider;
2418 2786
2419our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2420 2788
2421sub new { 2789sub new {
2422 my ($class, %arg) = @_; 2790 my ($class, %arg) = @_;
2423 2791
2424 my $range = delete $arg{range}; 2792 my $range = delete $arg{range};
2425 2793
2426 my $self = $class->SUPER::new ( 2794 my $self = $class->SUPER::new (
2427 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2795 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2428 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2796 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2429 to_value => sub { shift }, 2797 to_value => sub { shift },
2430 from_value => sub { shift }, 2798 from_value => sub { shift },
2431 %arg, 2799 %arg,
2432 ); 2800 );
2433 2801
… …
2453sub set_range { shift->{slider}->set_range (@_) } 2821sub set_range { shift->{slider}->set_range (@_) }
2454sub set_value { shift->{slider}->set_value (@_) } 2822sub set_value { shift->{slider}->set_value (@_) }
2455 2823
2456############################################################################# 2824#############################################################################
2457 2825
2458package CFClient::UI::TextView; 2826package CFPlus::UI::TextScroller;
2459 2827
2460our @ISA = CFClient::UI::HBox::; 2828our @ISA = CFPlus::UI::HBox::;
2461 2829
2462use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2463 2831
2464sub new { 2832sub new {
2465 my $class = shift; 2833 my $class = shift;
2466 2834
2467 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2468 fontsize => 1, 2836 fontsize => 1,
2469 can_events => 0, 2837 can_events => 1,
2838 indent => 0,
2470 #font => default_font 2839 #font => default_font
2471 @_, 2840 @_,
2472 2841
2473 layout => (new CFClient::Layout 1), 2842 layout => (new CFPlus::Layout),
2474 par => [], 2843 par => [],
2844 max_par => 0,
2475 height => 0, 2845 height => 0,
2476 children => [ 2846 children => [
2477 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2478 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2479 ], 2849 ],
2480 ); 2850 );
2481 2851
2482 $self->{children}[1]->connect (changed => sub { $self->update }); 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2483 2853
… …
2489 2859
2490 $self->{fontsize} = $fontsize; 2860 $self->{fontsize} = $fontsize;
2491 $self->reflow; 2861 $self->reflow;
2492} 2862}
2493 2863
2864sub size_request {
2865 my ($self) = @_;
2866
2867 my ($empty, $slider) = @{ $self->{children} };
2868
2869 local $self->{children} = [$empty, $slider];
2870 $self->SUPER::size_request
2871}
2872
2494sub size_allocate { 2873sub invoke_size_allocate {
2495 my ($self, $w, $h) = @_; 2874 my ($self, $w, $h) = @_;
2496 2875
2497 $self->SUPER::size_allocate ($w, $h); 2876 my ($empty, $slider, @other) = @{ $self->{children} };
2877 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2498 2878
2499 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2879 $self->{layout}->set_font ($self->{font}) if $self->{font};
2500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2880 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $self->{layout}->set_width ($self->{children}[0]{w}); 2881 $self->{layout}->set_width ($empty->{w});
2882 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 2883
2503 $self->reflow; 2884 $self->reflow;
2504}
2505 2885
2506sub text_size { 2886 local $self->{children} = [$empty, $slider];
2887 $self->SUPER::invoke_size_allocate ($w, $h)
2888}
2889
2890sub invoke_mouse_wheel {
2507 my ($self, $text, $indent) = @_; 2891 my ($self, $ev) = @_;
2892
2893 return 0 unless $ev->{dy}; # only vertical movements
2894
2895 $self->{children}[1]->emit (mouse_wheel => $ev);
2896
2897 1
2898}
2899
2900sub get_layout {
2901 my ($self, $para) = @_;
2508 2902
2509 my $layout = $self->{layout}; 2903 my $layout = $self->{layout};
2510 2904
2905 $layout->set_font ($self->{font}) if $self->{font};
2906 $layout->set_foreground (@{$para->{fg}});
2511 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2907 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2512 $layout->set_width ($self->{children}[0]{w} - $indent); 2908 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2909 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2513 $layout->set_markup ($text); 2910 $layout->set_markup ($para->{markup});
2911
2912 $layout->set_shapes (
2913 map
2914 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2915 @{$para->{widget}}
2514 2916 );
2917
2515 $layout->size 2918 $layout
2516} 2919}
2517 2920
2518sub reflow { 2921sub reflow {
2519 my ($self) = @_; 2922 my ($self) = @_;
2520 2923
… …
2527 2930
2528 # todo: base offset on lines or so, not on pixels 2931 # todo: base offset on lines or so, not on pixels
2529 $self->{children}[1]->set_value ($offset); 2932 $self->{children}[1]->set_value ($offset);
2530} 2933}
2531 2934
2935sub current_paragraph {
2936 my ($self) = @_;
2937
2938 $self->{top_paragraph} - 1
2939}
2940
2941sub scroll_to {
2942 my ($self, $para) = @_;
2943
2944 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2945
2946 $self->{scroll_to} = $para;
2947 $self->update;
2948}
2949
2532sub clear { 2950sub clear {
2533 my ($self) = @_; 2951 my ($self) = @_;
2952
2953 my (undef, undef, @other) = @{ $self->{children} };
2954 $self->remove ($_) for @other;
2534 2955
2535 $self->{par} = []; 2956 $self->{par} = [];
2536 $self->{height} = 0; 2957 $self->{height} = 0;
2537 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2958 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2538} 2959}
2539 2960
2540sub add_paragraph { 2961sub add_paragraph {
2541 my ($self, $color, $text, $indent) = @_; 2962 my $self = shift;
2542 2963
2543 for my $line (split /\n/, $text) { 2964 for my $para (@_) {
2544 my ($w, $h) = $self->text_size ($line); 2965 $para = {
2966 fg => [1, 1, 1, 1],
2967 indent => 0,
2968 markup => "",
2969 widget => [],
2970 ref $para ? %$para : (markup => $para),
2971 w => 1e10,
2972 wrapped => 1,
2973 };
2974
2975 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2976 push @{$self->{par}}, $para;
2977 }
2978
2979 if (my $max = $self->{max_par}) {
2980 shift @{$self->{par}} while @{$self->{par}} > $max;
2981 }
2982
2983 $self->{need_reflow}++;
2984 $self->update;
2985}
2986
2987sub scroll_to_bottom {
2988 my ($self) = @_;
2989
2990 $self->{scroll_to} = $#{$self->{par}};
2991 $self->update;
2992}
2993
2994sub force_uptodate {
2995 my ($self) = @_;
2996
2997 if (delete $self->{need_reflow}) {
2998 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2999
3000 my $height = 0;
3001
3002 for my $para (@{$self->{par}}) {
3003 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3004 my $layout = $self->get_layout ($para);
3005 my ($w, $h) = $layout->size;
3006
3007 $para->{w} = $w + $para->{indent};
3008 $para->{h} = $h;
3009 $para->{wrapped} = $layout->has_wrapped;
3010 }
3011
3012 $para->{y} = $height;
3013 $height += $para->{h};
3014 }
3015
2545 $self->{height} += $h; 3016 $self->{height} = $height;
2546 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2547 }
2548 3018
2549 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3019 delete $self->{texture};
3020 }
3021
3022 if (my $paridx = delete $self->{scroll_to}) {
3023 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3024 }
2550} 3025}
2551 3026
2552sub update { 3027sub update {
2553 my ($self) = @_; 3028 my ($self) = @_;
2554 3029
… …
2556 3031
2557 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2558 3033
2559 delete $self->{texture}; 3034 delete $self->{texture};
2560 3035
2561 $ROOT->on_post_alloc ($self, sub { 3036 $ROOT->on_post_alloc ($self => sub {
3037 $self->force_uptodate;
3038
2562 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2563 3040
2564 if (delete $self->{need_reflow}) {
2565 my $height = 0;
2566
2567 my $layout = $self->{layout};
2568
2569 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2570
2571 for (@{$self->{par}}) {
2572 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2573 $layout->set_width ($W - $_->[3]);
2574 $layout->set_markup ($_->[4]);
2575 my ($w, $h) = $layout->size;
2576 $_->[0] = $w + $_->[3];
2577 $_->[1] = $h;
2578 }
2579
2580 $height += $_->[1];
2581 }
2582
2583 $self->{height} = $height;
2584
2585 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2586
2587 delete $self->{texture};
2588 }
2589
2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2591 glClearColor 0, 0, 0, 0; 3042 glClearColor 0, 0, 0, 0;
2592 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2593 3044
3045 package CFPlus::UI::Base;
3046 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3047 (0, 0, $self->{w}, $self->{h});
3048
3049 my $top = int $self->{children}[1]{range}[0];
3050
3051 my $paridx = 0;
3052 my $top_paragraph;
2594 my $top = int $self->{children}[1]{range}[0]; 3053 my $top = int $self->{children}[1]{range}[0];
2595 3054
2596 my $y0 = $top; 3055 my $y0 = $top;
2597 my $y1 = $top + $H; 3056 my $y1 = $top + $H;
2598 3057
2599 my $y = 0;
2600
2601 my $layout = $self->{layout};
2602
2603 $layout->set_font ($self->{font}) if $self->{font};
2604
2605 glEnable GL_BLEND;
2606 #TODO# not correct in windows where rgba is forced off
2607 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2608
2609 for my $par (@{$self->{par}}) { 3058 for my $para (@{$self->{par}}) {
2610 my $h = $par->[1]; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2611 3061
2612 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2613 $layout->set_foreground (@{ $par->[2] }); 3063 my $layout = $self->get_layout ($para);
2614 $layout->set_width ($W - $par->[3]);
2615 $layout->set_markup ($par->[4]);
2616 3064
2617 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3065 $layout->render ($para->{indent}, $y - $y0);
2618 3066
2619 glRasterPos $par->[3], $y - $y0; 3067 if (my @w = @{ $para->{widget} }) {
2620 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3068 my @s = $layout->get_shapes;
3069
3070 for (@w) {
3071 my ($dx, $dy) = splice @s, 0, 2, ();
3072
3073 $_->{x} = $dx + $para->{indent};
3074 $_->{y} = $dy + $y - $y0;
3075
3076 $_->draw;
3077 }
3078 }
2621 } 3079 }
2622 3080
2623 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2624 } 3083 }
2625 3084
2626 glDisable GL_BLEND; 3085 $self->{top_paragraph} = $top_paragraph;
2627 }; 3086 };
2628 }); 3087 });
3088}
3089
3090sub reconfigure {
3091 my ($self) = @_;
3092
3093 $self->SUPER::reconfigure;
3094
3095 $_->{w} = 1e10 for @{ $self->{par} };
3096 $self->reflow;
2629} 3097}
2630 3098
2631sub _draw { 3099sub _draw {
2632 my ($self) = @_; 3100 my ($self) = @_;
2633 3101
… …
2636 glColor 0, 0, 0, 1; 3104 glColor 0, 0, 0, 1;
2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3105 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2638 glDisable GL_TEXTURE_2D; 3106 glDisable GL_TEXTURE_2D;
2639 3107
2640 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2641
2642} 3109}
2643 3110
2644############################################################################# 3111#############################################################################
2645 3112
2646package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2647 3114
2648use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2649 3116
2650our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2651 3118
2652sub moveto { 3119sub moveto {
2653 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2654 3121
2655 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2683 glPopMatrix; 3150 glPopMatrix;
2684} 3151}
2685 3152
2686############################################################################# 3153#############################################################################
2687 3154
2688package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2689 3156
2690our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2691 3158
2692sub new { 3159sub new {
2693 my $class = shift; 3160 my $class = shift;
2694 3161
2695 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
… …
2707 $self->{other}->toggle_visibility; 3174 $self->{other}->toggle_visibility;
2708} 3175}
2709 3176
2710############################################################################# 3177#############################################################################
2711 3178
2712package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2713 3180
2714our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2715 3182
2716use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2717 3184
2718sub new { 3185sub new {
2719 my $class = shift; 3186 my $class = shift;
2720 3187
2721 $class->SUPER::new ( 3188 $class->SUPER::new (
… …
2724 ) 3191 )
2725} 3192}
2726 3193
2727sub set_tooltip_from { 3194sub set_tooltip_from {
2728 my ($self, $widget) = @_; 3195 my ($self, $widget) = @_;
3196
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
2729 3199
2730 my $tooltip = $widget->{tooltip}; 3200 my $tooltip = $widget->{tooltip};
2731 3201
2732 if ($ENV{CFPLUS_DEBUG} & 2) { 3202 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n" 3203 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3204 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n" 3205 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}"; 3206 . "visible $widget->{visible}";
2737 } 3207 }
2738 3208
3209 $tooltip =~ s/^\n+//;
3210 $tooltip =~ s/\n+$//;
3211
2739 $self->add (new CFClient::UI::Label 3212 $self->add (new CFPlus::UI::Label
2740 markup => $tooltip, 3213 markup => $tooltip,
2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2742 fontsize => 0.8, 3215 fontsize => 0.8,
2743 fg => [0, 0, 0, 1], 3216 style => 1, # FLAG_INVERSE
2744 ellipsise => 0, 3217 ellipsise => 0,
2745 font => ($widget->{tooltip_font} || $::FONT_PROP), 3218 font => ($widget->{tooltip_font} || $::FONT_PROP),
2746 ); 3219 );
2747} 3220}
2748 3221
… …
2752 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3225 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2753 3226
2754 ($w + 4, $h + 4) 3227 ($w + 4, $h + 4)
2755} 3228}
2756 3229
2757sub size_allocate { 3230sub invoke_size_allocate {
2758 my ($self, $w, $h) = @_; 3231 my ($self, $w, $h) = @_;
2759 3232
2760 $self->SUPER::size_allocate ($w - 4, $h - 4); 3233 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2761} 3234}
2762 3235
2763sub visibility_change { 3236sub invoke_visibility_change {
2764 my ($self, $visible) = @_; 3237 my ($self, $visible) = @_;
2765 3238
2766 return unless $visible; 3239 return unless $visible;
2767 3240
2768 $self->{root}->on_post_alloc ("move_$self" => sub { 3241 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner} 3242 my $widget = $self->{owner}
2770 or return; 3243 or return;
2771 3244
3245 if ($widget->{visible}) {
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3246 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773 3247
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3248 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH; 3249 if $x + $self->{w} > $self->{root}{w};
2776 3250
2777 $self->move_abs ($x, $y); 3251 $self->move_abs ($x, $y);
3252 } else {
3253 $self->hide;
3254 }
2778 }); 3255 });
2779} 3256}
2780 3257
2781sub _draw { 3258sub _draw {
2782 my ($self) = @_; 3259 my ($self) = @_;
… …
2806 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2807} 3284}
2808 3285
2809############################################################################# 3286#############################################################################
2810 3287
2811package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2812 3289
2813our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2814 3291
2815use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2816 3293
2817sub new { 3294sub new {
2818 my $class = shift; 3295 my $class = shift;
2819 3296
2820 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2822 can_events => 0, 3299 can_events => 0,
2823 @_, 3300 @_,
2824 ); 3301 );
2825 3302
2826 if ($self->{anim} && $self->{animspeed}) { 3303 if ($self->{anim} && $self->{animspeed}) {
2827 Scalar::Util::weaken (my $widget = $self); 3304 CFPlus::weaken (my $widget = $self);
2828 3305
2829 $self->{timer} = Event->timer ( 3306 $self->{timer} = Event->timer (
2830 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2831 hard => 1, 3308 hard => 1,
2832 interval => $self->{animspeed}, 3309 interval => $self->{animspeed},
… …
2855sub _draw { 3332sub _draw {
2856 my ($self) = @_; 3333 my ($self) = @_;
2857 3334
2858 return unless $::CONN; 3335 return unless $::CONN;
2859 3336
3337 $self->SUPER::_draw;
3338
2860 my $face; 3339 my $face;
2861 3340
2862 if ($self->{frame}) { 3341 if ($self->{frame}) {
2863 my $anim = $::CONN->{anim}[$self->{anim}]; 3342 my $anim = $::CONN->{anim}[$self->{anim}];
2864 3343
… …
2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2876 glDisable GL_TEXTURE_2D; 3355 glDisable GL_TEXTURE_2D;
2877 } 3356 }
2878} 3357}
2879 3358
2880sub DESTROY { 3359sub destroy {
2881 my ($self) = @_; 3360 my ($self) = @_;
2882 3361
2883 $self->{timer}->cancel 3362 $self->{timer}->cancel
2884 if $self->{timer}; 3363 if $self->{timer};
2885 3364
2886 $self->SUPER::DESTROY; 3365 $self->SUPER::destroy;
2887} 3366}
2888 3367
2889############################################################################# 3368#############################################################################
2890 3369
2891package CFClient::UI::Buttonbar; 3370package CFPlus::UI::Buttonbar;
2892 3371
2893our @ISA = CFClient::UI::HBox::; 3372our @ISA = CFPlus::UI::HBox::;
2894 3373
2895# TODO: should actualyl wrap buttons and other goodies. 3374# TODO: should actually wrap buttons and other goodies.
2896 3375
2897############################################################################# 3376#############################################################################
2898 3377
2899package CFClient::UI::Menu; 3378package CFPlus::UI::Menu;
2900 3379
2901our @ISA = CFClient::UI::FancyFrame::; 3380our @ISA = CFPlus::UI::Toplevel::;
2902 3381
2903use CFClient::OpenGL; 3382use CFPlus::OpenGL;
2904 3383
2905sub new { 3384sub new {
2906 my $class = shift; 3385 my $class = shift;
2907 3386
2908 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
2909 items => [], 3388 items => [],
2910 z => 100, 3389 z => 100,
2911 @_, 3390 @_,
2912 ); 3391 );
2913 3392
2914 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2915 3394
2916 for my $item (@{ $self->{items} }) { 3395 for my $item (@{ $self->{items} }) {
2917 my ($widget, $cb) = @$item; 3396 my ($widget, $cb, $tooltip) = @$item;
2918 3397
2919 # handle various types of items, only text for now 3398 # handle various types of items, only text for now
2920 if (!ref $widget) { 3399 if (!ref $widget) {
3400 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2;
3402
2921 $widget = new CFClient::UI::Label 3403 $widget = new CFPlus::UI::HBox
2922 can_hover => 1, 3404 can_hover => 1,
2923 can_events => 1, 3405 can_events => 1,
3406 tooltip => $tooltip,
3407 children => [
3408 (new CFPlus::UI::Label markup => $left, expand => 1),
3409 (new CFPlus::UI::Label markup => $right, align => +1),
3410 ],
3411 ;
3412
3413 } else {
3414 $widget = new CFPlus::UI::Label
3415 can_hover => 1,
3416 can_events => 1,
2924 text => $widget; 3417 markup => $widget,
3418 tooltip => $tooltip;
3419 }
2925 } 3420 }
2926 3421
2927 $self->{item}{$widget} = $item; 3422 $self->{item}{$widget} = $item;
2928 3423
2929 $self->{vbox}->add ($widget); 3424 $self->{vbox}->add ($widget);
… …
2934 3429
2935# popup given the event (must be a mouse button down event currently) 3430# popup given the event (must be a mouse button down event currently)
2936sub popup { 3431sub popup {
2937 my ($self, $ev) = @_; 3432 my ($self, $ev) = @_;
2938 3433
2939 $self->_emit ("popdown"); 3434 $self->emit ("popdown");
2940 3435
2941 # maybe save $GRAB? must be careful about events... 3436 # maybe save $GRAB? must be careful about events...
2942 $GRAB = $self; 3437 $GRAB = $self;
2943 $self->{button} = $ev->{button}; 3438 $self->{button} = $ev->{button};
2944 3439
2945 $self->show; 3440 $self->show;
2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3441 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2947} 3442}
2948 3443
2949sub mouse_motion { 3444sub invoke_mouse_motion {
2950 my ($self, $ev, $x, $y) = @_; 3445 my ($self, $ev, $x, $y) = @_;
2951 3446
2952 # TODO: should use vbox->find_widget or so 3447 # TODO: should use vbox->find_widget or so
2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3448 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2954 $self->{hover} = $self->{item}{$HOVER}; 3449 $self->{hover} = $self->{item}{$HOVER};
2955 3450
2956 0 3451 0
2957} 3452}
2958 3453
2959sub button_up { 3454sub invoke_button_up {
2960 my ($self, $ev, $x, $y) = @_; 3455 my ($self, $ev, $x, $y) = @_;
2961 3456
2962 if ($ev->{button} == $self->{button}) { 3457 if ($ev->{button} == $self->{button}) {
2963 undef $GRAB; 3458 undef $GRAB;
2964 $self->hide; 3459 $self->hide;
2965 3460
2966 $self->_emit ("popdown"); 3461 $self->emit ("popdown");
2967 $self->{hover}[1]->() if $self->{hover}; 3462 $self->{hover}[1]->() if $self->{hover};
2968 } else { 3463 } else {
2969 return 0 3464 return 0
2970 } 3465 }
2971 3466
2972 1 3467 1
2973} 3468}
2974 3469
2975############################################################################# 3470#############################################################################
2976 3471
2977package CFClient::UI::Multiplexer; 3472package CFPlus::UI::Multiplexer;
2978 3473
2979our @ISA = CFClient::UI::Container::; 3474our @ISA = CFPlus::UI::Container::;
2980 3475
2981sub new { 3476sub new {
2982 my $class = shift; 3477 my $class = shift;
2983 3478
2984 my $self = $class->SUPER::new ( 3479 my $self = $class->SUPER::new (
… …
2998 3493
2999 $self->{current} = $self->{children}[0] 3494 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} }; 3495 if @{ $self->{children} };
3001} 3496}
3002 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{current}
3502}
3503
3003sub set_current_page { 3504sub set_current_page {
3004 my ($self, $page_or_widget) = @_; 3505 my ($self, $page_or_widget) = @_;
3005 3506
3006 my $widget = ref $page_or_widget 3507 my $widget = ref $page_or_widget
3007 ? $page_or_widget 3508 ? $page_or_widget
3008 : $self->{children}[$page_or_widget]; 3509 : $self->{children}[$page_or_widget];
3009 3510
3010 $self->{current} = $widget; 3511 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3512 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012 3513
3013 $self->_emit (page_changed => $self->{current}); 3514 $self->emit (page_changed => $self->{current});
3014 3515
3015 $self->realloc; 3516 $self->realloc;
3016} 3517}
3017 3518
3018sub visible_children { 3519sub visible_children {
… …
3023 my ($self) = @_; 3524 my ($self) = @_;
3024 3525
3025 $self->{current}->size_request 3526 $self->{current}->size_request
3026} 3527}
3027 3528
3028sub size_allocate { 3529sub invoke_size_allocate {
3029 my ($self, $w, $h) = @_; 3530 my ($self, $w, $h) = @_;
3030 3531
3031 $self->{current}->configure (0, 0, $w, $h); 3532 $self->{current}->configure (0, 0, $w, $h);
3533
3534 1
3032} 3535}
3033 3536
3034sub _draw { 3537sub _draw {
3035 my ($self) = @_; 3538 my ($self) = @_;
3036 3539
3037 $self->{current}->draw; 3540 $self->{current}->draw;
3038} 3541}
3039 3542
3040############################################################################# 3543#############################################################################
3041 3544
3042package CFClient::UI::Notebook; 3545package CFPlus::UI::Notebook;
3043 3546
3044our @ISA = CFClient::UI::VBox::; 3547our @ISA = CFPlus::UI::VBox::;
3045 3548
3046sub new { 3549sub new {
3047 my $class = shift; 3550 my $class = shift;
3048 3551
3049 my $self = $class->SUPER::new ( 3552 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar), 3553 buttonbar => (new CFPlus::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self 3555 # filter => # will be put between multiplexer and $self
3053 @_, 3556 @_,
3054 ); 3557 );
3055 3558
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3060} 3563}
3061 3564
3062sub add { 3565sub add {
3063 my ($self, $title, $widget, $tooltip) = @_; 3566 my ($self, $title, $widget, $tooltip) = @_;
3064 3567
3065 Scalar::Util::weaken $self; 3568 CFPlus::weaken $self;
3066 3569
3067 $self->{buttonbar}->add (new CFClient::UI::Button 3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3068 markup => $title, 3571 markup => $title,
3069 tooltip => $tooltip, 3572 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) }, 3573 on_activate => sub { $self->set_current_page ($widget) },
3071 ); 3574 );
3072 3575
3073 $self->{multiplexer}->add ($widget); 3576 $self->{multiplexer}->add ($widget);
3074} 3577}
3075 3578
3579sub get_current_page {
3580 my ($self) = @_;
3581
3582 $self->{multiplexer}->get_current_page
3583}
3584
3076sub set_current_page { 3585sub set_current_page {
3077 my ($self, $page) = @_; 3586 my ($self, $page) = @_;
3078 3587
3079 $self->{multiplexer}->set_current_page ($page); 3588 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current}); 3589 $self->emit (page_changed => $self->{multiplexer}{current});
3081} 3590}
3082 3591
3083############################################################################# 3592#############################################################################
3084 3593
3594package CFPlus::UI::Selector;
3595
3596use utf8;
3597
3598our @ISA = CFPlus::UI::Button::;
3599
3600sub new {
3601 my $class = shift;
3602
3603 my $self = $class->SUPER::new (
3604 options => [], # [value, title, longdesc], ...
3605 value => undef,
3606 @_,
3607 );
3608
3609 $self->_set_value ($self->{value});
3610
3611 $self
3612}
3613
3614sub invoke_button_down {
3615 my ($self, $ev) = @_;
3616
3617 my @menu_items;
3618
3619 for (@{ $self->{options} }) {
3620 my ($value, $title, $tooltip) = @$_;
3621
3622 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3623 }
3624
3625 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3626}
3627
3628sub _set_value {
3629 my ($self, $value) = @_;
3630
3631 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3632 or return;
3633
3634 $self->{value} = $item->[0];
3635 $self->set_markup ("$item->[1] ⇓");
3636 $self->set_tooltip ($item->[2]);
3637}
3638
3639sub set_value {
3640 my ($self, $value) = @_;
3641
3642 return unless $self->{value} ne $value;
3643
3644 $self->_set_value ($value);
3645 $self->emit (changed => $value);
3646}
3647
3648#############################################################################
3649
3085package CFClient::UI::Statusbox; 3650package CFPlus::UI::Statusbox;
3086 3651
3087our @ISA = CFClient::UI::VBox::; 3652our @ISA = CFPlus::UI::VBox::;
3088 3653
3089sub new { 3654sub new {
3090 my $class = shift; 3655 my $class = shift;
3091 3656
3092 my $self = $class->SUPER::new ( 3657 my $self = $class->SUPER::new (
3093 fontsize => 0.8, 3658 fontsize => 0.8,
3094 @_, 3659 @_,
3095 ); 3660 );
3096 3661
3097 Scalar::Util::weaken (my $this = $self); 3662 CFPlus::weaken (my $this = $self);
3098 3663
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3664 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100 3665
3101 $self 3666 $self
3102} 3667}
… …
3104sub reorder { 3669sub reorder {
3105 my ($self) = @_; 3670 my ($self) = @_;
3106 my $NOW = Time::HiRes::time; 3671 my $NOW = Time::HiRes::time;
3107 3672
3108 # freeze display when hovering over any label 3673 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner} 3674 return if $CFPlus::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3675 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} }; 3676 values %{ $self->{item} };
3112 3677
3113 while (my ($k, $v) = each %{ $self->{item} }) { 3678 while (my ($k, $v) = each %{ $self->{item} }) {
3114 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3679 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3115 } 3680 }
… …
3136 for ($short) { 3701 for ($short) {
3137 s/^\s+//; 3702 s/^\s+//;
3138 s/\s+/ /g; 3703 s/\s+/ /g;
3139 } 3704 }
3140 3705
3141 new CFClient::UI::Label 3706 new CFPlus::UI::Label
3142 markup => $short, 3707 markup => $short,
3143 tooltip => $item->{tooltip}, 3708 tooltip => $item->{tooltip},
3144 tooltip_font => $::FONT_PROP, 3709 tooltip_font => $::FONT_PROP,
3145 tooltip_width => 0.67, 3710 tooltip_width => 0.67,
3146 fontsize => $item->{fontsize} || $self->{fontsize}, 3711 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3184 $item->{count}++; 3749 $item->{count}++;
3185 } else { 3750 } else {
3186 $item->{count} = 1; 3751 $item->{count} = 1;
3187 $item->{text} = $item->{tooltip} = $text; 3752 $item->{text} = $item->{tooltip} = $text;
3188 } 3753 }
3189 $item->{id} = ++$self->{id}; 3754 $item->{id} += 0.2;#d#
3190 $item->{timeout} = $timeout; 3755 $item->{timeout} = $timeout;
3191 delete $item->{label}; 3756 delete $item->{label};
3192 } else { 3757 } else {
3193 $self->{item}{$group} = { 3758 $self->{item}{$group} = {
3194 id => ++$self->{id}, 3759 id => ++$self->{id},
… …
3200 count => 1, 3765 count => 1,
3201 %arg, 3766 %arg,
3202 }; 3767 };
3203 } 3768 }
3204 3769
3770 $ROOT->on_refresh (reorder => sub {
3205 $self->reorder; 3771 $self->reorder;
3772 });
3206} 3773}
3207 3774
3208sub reconfigure { 3775sub reconfigure {
3209 my ($self) = @_; 3776 my ($self) = @_;
3210 3777
… …
3213 3780
3214 $self->reorder; 3781 $self->reorder;
3215 $self->SUPER::reconfigure; 3782 $self->SUPER::reconfigure;
3216} 3783}
3217 3784
3218sub DESTROY { 3785sub destroy {
3219 my ($self) = @_; 3786 my ($self) = @_;
3220 3787
3221 $self->{timer}->cancel; 3788 $self->{timer}->cancel;
3222 3789
3223 $self->SUPER::DESTROY; 3790 $self->SUPER::destroy;
3224} 3791}
3225 3792
3226############################################################################# 3793#############################################################################
3227 3794
3228package CFClient::UI::Inventory;
3229
3230our @ISA = CFClient::UI::ScrolledWindow::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
3477 @_,
3478 )
3479}
3480
3481# XXX: Do sorting? Argl...
3482sub add_spell {
3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
3485
3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
3523package CFClient::UI::Root; 3795package CFPlus::UI::Root;
3524 3796
3525our @ISA = CFClient::UI::Container::; 3797our @ISA = CFPlus::UI::Container::;
3526 3798
3527use List::Util qw(min max); 3799use List::Util qw(min max);
3528 3800
3529use CFClient::OpenGL; 3801use CFPlus::OpenGL;
3530 3802
3531sub new { 3803sub new {
3532 my $class = shift; 3804 my $class = shift;
3533 3805
3534 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
3535 visible => 1, 3807 visible => 1,
3536 @_, 3808 @_,
3537 ); 3809 );
3538 3810
3539 Scalar::Util::weaken ($self->{root} = $self); 3811 CFPlus::weaken ($self->{root} = $self);
3540 3812
3541 $self 3813 $self
3542} 3814}
3543 3815
3544sub size_request { 3816sub size_request {
… …
3559 $coord = $max - $size if $coord > $max - $size; 3831 $coord = $max - $size if $coord > $max - $size;
3560 3832
3561 int $coord + 0.5 3833 int $coord + 0.5
3562} 3834}
3563 3835
3564sub size_allocate { 3836sub invoke_size_allocate {
3565 my ($self, $w, $h) = @_; 3837 my ($self, $w, $h) = @_;
3566 3838
3567 for my $child ($self->children) { 3839 for my $child ($self->children) {
3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3840 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3569 3841
… …
3573 $X = _to_pixel $X, $W, $self->{w}; 3845 $X = _to_pixel $X, $W, $self->{w};
3574 $Y = _to_pixel $Y, $H, $self->{h}; 3846 $Y = _to_pixel $Y, $H, $self->{h};
3575 3847
3576 $child->configure ($X, $Y, $W, $H); 3848 $child->configure ($X, $Y, $W, $H);
3577 } 3849 }
3850
3851 1
3578} 3852}
3579 3853
3580sub coord2local { 3854sub coord2local {
3581 my ($self, $x, $y) = @_; 3855 my ($self, $x, $y) = @_;
3582 3856
… …
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3709 3983
3710 $w = 0 if $w < 0; 3984 $w = 0 if $w < 0;
3711 $h = 0 if $h < 0; 3985 $h = 0 if $h < 0;
3712 3986
3987 $w = max $widget->{min_w}, $w;
3988 $h = max $widget->{min_h}, $h;
3989
3990# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992
3993 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995
3713 $w = int $w + 0.5; 3996 $w = int $w + 0.5;
3714 $h = int $h + 0.5; 3997 $h = int $h + 0.5;
3715 3998
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3999 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w}; 4000 $widget->{old_w} = $widget->{w};
… …
3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3741 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
3742 glLoadIdentity; 4025 glLoadIdentity;
3743 4026
3744 { 4027 {
3745 package CFClient::UI::Base; 4028 package CFPlus::UI::Base;
3746 4029
3747 ($draw_x, $draw_y, $draw_w, $draw_h) = 4030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h}); 4031 (0, 0, $self->{w}, $self->{h});
3749 }
3750 4032
3751 $self->_draw; 4033 $self->_draw;
4034 }
3752} 4035}
3753 4036
3754############################################################################# 4037#############################################################################
3755 4038
3756package CFClient::UI; 4039package CFPlus::UI;
3757 4040
3758$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
3759$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3760 4043
37611 40441
3762 4045

Diff Legend

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