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

Diff Legend

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