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.367 by root, Fri Apr 27 00:59:14 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
247sub show { 273sub show {
248 my ($self) = @_; 274 my ($self) = @_;
249 275
250 return if $self->{parent}; 276 return if $self->{parent};
251 277
252 $CFClient::UI::ROOT->add ($self); 278 $CFPlus::UI::ROOT->add ($self);
253} 279}
254 280
255sub set_visible { 281sub set_visible {
256 my ($self) = @_; 282 my ($self) = @_;
257 283
… …
272 298
273 return unless $self->{visible}; 299 return unless $self->{visible};
274 300
275 $_->set_invisible for $self->children; 301 $_->set_invisible for $self->children;
276 302
303 delete $self->{visible};
277 delete $self->{root}; 304 delete $self->{root};
278 delete $self->{visible};
279 305
280 undef $GRAB if $GRAB == $self; 306 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 307 undef $HOVER if $HOVER == $self;
282 308
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 309 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 310 if $TOOLTIP->{owner} == $self;
285 311
286 $self->focus_out; 312 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 313 $self->emit (visibility_change => 0);
289} 314}
290 315
291sub set_visibility { 316sub set_visibility {
292 my ($self, $visible) = @_; 317 my ($self, $visible) = @_;
… …
315} 340}
316 341
317sub move_abs { 342sub move_abs {
318 my ($self, $x, $y, $z) = @_; 343 my ($self, $x, $y, $z) = @_;
319 344
320 $self->{x} = List::Util::max 0, int $x; 345 $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; 346 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 347 $self->{z} = $z if defined $z;
323 348
324 $self->update; 349 $self->update;
325} 350}
326 351
… …
336sub size_request { 361sub size_request {
337 require Carp; 362 require Carp;
338 Carp::confess "size_request is abstract"; 363 Carp::confess "size_request is abstract";
339} 364}
340 365
366sub baseline_shift {
367 0
368}
369
341sub configure { 370sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 371 my ($self, $x, $y, $w, $h) = @_;
343 372
344 if ($self->{aspect}) { 373 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 374 my ($ow, $oh) = ($w, $h);
346 375
347 $w = List::Util::min $w, int $h * $self->{aspect}; 376 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 377 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 378
350 # use alignment to adjust x, y 379 # use alignment to adjust x, y
351 380
352 $x += int 0.5 * ($ow - $w); 381 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 382 $y += int 0.5 * ($oh - $h);
… …
367 396
368 $self->{root}{size_alloc}{$self+0} = $self; 397 $self->{root}{size_alloc}{$self+0} = $self;
369 } 398 }
370} 399}
371 400
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 401sub children {
377 # nop 402 # nop
378} 403}
379 404
380sub visible_children { 405sub visible_children {
… …
398 423
399 return if $self->{tooltip} eq $tooltip; 424 return if $self->{tooltip} eq $tooltip;
400 425
401 $self->{tooltip} = $tooltip; 426 $self->{tooltip} = $tooltip;
402 427
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 428 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 429 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 430 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 431 }
407} 432}
408 433
409# translate global coordinates to local coordinate system 434# translate global coordinates to local coordinate system
410sub coord2local { 435sub coord2local {
411 my ($self, $x, $y) = @_; 436 my ($self, $x, $y) = @_;
412 437
438 Carp::confess unless $self->{parent};#d#
439
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 440 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 441}
415 442
416# translate local coordinates to global coordinate system 443# translate local coordinates to global coordinate system
417sub coord2global { 444sub coord2global {
418 my ($self, $x, $y) = @_; 445 my ($self, $x, $y) = @_;
419 446
447 Carp::confess unless $self->{parent};#d#
448
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 449 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 450}
422 451
423sub focus_in { 452sub invoke_focus_in {
424 my ($self) = @_; 453 my ($self) = @_;
425 454
426 return if $FOCUS == $self; 455 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 456 return unless $self->{can_focus};
428 457
429 my $focus = $FOCUS; $FOCUS = $self; 458 $FOCUS = $self;
430 459
431 $self->_emit (focus_in => $focus); 460 $self->update;
432 461
433 $focus->update if $focus; 462 0
434 $FOCUS->update;
435} 463}
436 464
437sub focus_out { 465sub invoke_focus_out {
438 my ($self) = @_; 466 my ($self) = @_;
439 467
440 return unless $FOCUS == $self; 468 return unless $FOCUS == $self;
441 469
442 my $focus = $FOCUS; undef $FOCUS; 470 undef $FOCUS;
443 471
444 $self->_emit (focus_out => $focus); 472 $self->update;
445 473
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 474 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 475 unless $FOCUS;
450}
451 476
477 0
478}
479
480sub grab_focus {
481 my ($self) = @_;
482
483 $FOCUS->emit ("focus_out") if $FOCUS;
484 $self->emit ("focus_in");
485}
486
452sub mouse_motion { 0 } 487sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 488sub invoke_button_up { 0 }
454sub key_down { 0 } 489sub invoke_key_down { 0 }
455sub key_up { 0 } 490sub invoke_key_up { 0 }
491sub invoke_mouse_wheel { 0 }
456 492
457sub button_down { 493sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 494 my ($self, $ev, $x, $y) = @_;
459 495
460 $self->focus_in; 496 $self->grab_focus;
461 497
462 0 498 0
499}
500
501sub connect {
502 my ($self, $signal, $cb) = @_;
503
504 push @{ $self->{signal_cb}{$signal} }, $cb;
505
506 defined wantarray and CFPlus::guard {
507 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
508 @{ $self->{signal_cb}{$signal} };
509 }
510}
511
512sub disconnect_all {
513 my ($self, $signal) = @_;
514
515 delete $self->{signal_cb}{$signal};
516}
517
518my %has_coords = (
519 button_down => 1,
520 button_up => 1,
521 mouse_motion => 1,
522 mouse_wheel => 1,
523);
524
525sub emit {
526 my ($self, $signal, @args) = @_;
527
528 # I do not really like this solution, but I do not like duplication
529 # and needlessly verbose code, either.
530 my @append
531 = $has_coords{$signal}
532 ? $args[0]->xy ($self)
533 : ();
534
535 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
536
537 for my $cb (
538 @{$self->{signal_cb}{$signal} || []}, # before
539 ($self->can ("invoke_$signal") || sub { 1 }), # closure
540 ) {
541 return $cb->($self, @args, @append) || next;
542 }
543
544 # parent
545 $self->{parent} && $self->{parent}->emit ($signal, @args)
463} 546}
464 547
465sub find_widget { 548sub find_widget {
466 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
467 550
… …
475} 558}
476 559
477sub set_parent { 560sub set_parent {
478 my ($self, $parent) = @_; 561 my ($self, $parent) = @_;
479 562
480 Scalar::Util::weaken ($self->{parent} = $parent); 563 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 564 $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} 565}
506 566
507sub realloc { 567sub realloc {
508 my ($self) = @_; 568 my ($self) = @_;
509 569
… …
526} 586}
527 587
528sub reconfigure { 588sub reconfigure {
529 my ($self) = @_; 589 my ($self) = @_;
530 590
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 591 $self->realloc;
536 $self->update; 592 $self->update;
537} 593}
538 594
539# using global variables seems a bit hacky, but passing through all drawing 595# using global variables seems a bit hacky, but passing through all drawing
… …
546 return unless $self->{h} && $self->{w}; 602 return unless $self->{h} && $self->{w};
547 603
548 # update screen rectangle 604 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 605 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 606 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 607
554 # skip widgets that are entirely outside the drawing area 608 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 609 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 610 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 611
… …
580 glVertex $self->{w} - 1, 0; 634 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1; 635 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1; 636 glVertex 0 , $self->{h} - 1;
583 glEnd; 637 glEnd;
584 glPopMatrix; 638 glPopMatrix;
585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
586 } 640 }
587 641
588 $self->_draw; 642 $self->_draw;
589 glPopMatrix; 643 glPopMatrix;
590} 644}
… …
593 my ($self) = @_; 647 my ($self) = @_;
594 648
595 warn "no draw defined for $self\n"; 649 warn "no draw defined for $self\n";
596} 650}
597 651
652my $cntx;#d#
598sub DESTROY { 653sub DESTROY {
599 my ($self) = @_; 654 my ($self) = @_;
600 655
656 return if CFPlus::in_destruct;
657
658 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660
601 delete $WIDGET{$self+0}; 661 delete $WIDGET{$self+0};
602 #$self->deactivate;
603} 662}
604 663
605############################################################################# 664#############################################################################
606 665
607package CFClient::UI::DrawBG; 666package CFPlus::UI::DrawBG;
608 667
609our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
610 669
611use strict; 670use strict;
612use CFClient::OpenGL; 671use CFPlus::OpenGL;
613 672
614sub new { 673sub new {
615 my $class = shift; 674 my $class = shift;
616 675
617 # range [value, low, high, page] 676 # range [value, low, high, page]
… …
648 } 707 }
649} 708}
650 709
651############################################################################# 710#############################################################################
652 711
653package CFClient::UI::Empty; 712package CFPlus::UI::Empty;
654 713
655our @ISA = CFClient::UI::Base::; 714our @ISA = CFPlus::UI::Base::;
656 715
657sub new { 716sub new {
658 my ($class, %arg) = @_; 717 my ($class, %arg) = @_;
659 $class->SUPER::new (can_events => 0, %arg); 718 $class->SUPER::new (can_events => 0, %arg);
660} 719}
… …
667 726
668sub draw { } 727sub draw { }
669 728
670############################################################################# 729#############################################################################
671 730
672package CFClient::UI::Container; 731package CFPlus::UI::Container;
673 732
674our @ISA = CFClient::UI::Base::; 733our @ISA = CFPlus::UI::Base::;
675 734
676sub new { 735sub new {
677 my ($class, %arg) = @_; 736 my ($class, %arg) = @_;
678 737
679 my $children = delete $arg{children}; 738 my $children = delete $arg{children};
… …
688 if $children; 747 if $children;
689 748
690 $self 749 $self
691} 750}
692 751
752sub realloc {
753 my ($self) = @_;
754
755 $self->{force_realloc} = 1;
756 $self->{force_size_alloc} = 1;
757 $self->SUPER::realloc;
758}
759
693sub add { 760sub add {
694 my ($self, @widgets) = @_; 761 my ($self, @widgets) = @_;
695 762
696 $_->set_parent ($self) 763 $_->set_parent ($self)
697 for @widgets; 764 for @widgets;
… …
757 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
758} 825}
759 826
760############################################################################# 827#############################################################################
761 828
762package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
763 830
764our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
765 832
766sub new { 833sub new {
767 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
768 835
769 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
770 837
771 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
772} 839}
773 840
774sub add { 841sub add {
775 my ($self, $child) = @_; 842 my ($self, $child) = @_;
776 843
777 $self->{children} = []; 844 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 845 $self->SUPER::add ($child);
780} 846}
781 847
782sub remove { 848sub remove {
783 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
784 850
785 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
786 852
787 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
788 unless @{$self->{children}}; 854 unless @{$self->{children}};
789} 855}
790 856
791sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
792 858
793sub size_request { 859sub size_request {
794 $_[0]{children}[0]->size_request 860 $_[0]{children}[0]->size_request
795} 861}
796 862
797sub size_allocate { 863sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 864 my ($self, $w, $h) = @_;
799 865
800 $self->{children}[0]->configure (0, 0, $w, $h); 866 $self->{children}[0]->configure (0, 0, $w, $h);
867
868 1
801} 869}
802 870
803############################################################################# 871#############################################################################
804 872
805# back-buffered drawing area 873# back-buffered drawing area
806 874
807package CFClient::UI::Window; 875package CFPlus::UI::Window;
808 876
809our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
810 878
811use CFClient::OpenGL; 879use CFPlus::OpenGL;
812 880
813sub new { 881sub new {
814 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
815 883
816 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
821 889
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 890 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 891 $self->SUPER::update;
824} 892}
825 893
826sub size_allocate { 894sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
828 896
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 897 $self->update;
898
899 $self->SUPER::invoke_size_allocate ($w, $h)
831} 900}
832 901
833sub _render { 902sub _render {
834 my ($self) = @_; 903 my ($self) = @_;
835 904
… …
837} 906}
838 907
839sub render_child { 908sub render_child {
840 my ($self) = @_; 909 my ($self) = @_;
841 910
842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
843 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
844 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
845 914
846 { 915 {
847 package CFClient::UI::Base; 916 package CFPlus::UI::Base;
848 917
849 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
851 } 922 }
852
853 $self->_render;
854 }; 923 };
855} 924}
856 925
857sub _draw { 926sub _draw {
858 my ($self) = @_; 927 my ($self) = @_;
859
860 my ($w, $h) = @$self{qw(w h)};
861 928
862 my $tex = $self->{texture} 929 my $tex = $self->{texture}
863 or return; 930 or return;
864 931
865 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
867 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
868 935
869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
870 937
871 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
872} 939}
873 940
874############################################################################# 941#############################################################################
875 942
876package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
877 944
878our @ISA = CFClient::UI::Window::; 945our @ISA = CFPlus::UI::Window::;
879 946
880sub new { 947sub new {
881 my $class = shift; 948 my $class = shift;
882 949
883 $class->SUPER::new ( 950 $class->SUPER::new (
… …
896 $h = 10 if $self->{scroll_y}; 963 $h = 10 if $self->{scroll_y};
897 964
898 ($w, $h) 965 ($w, $h)
899} 966}
900 967
901sub size_allocate { 968sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 969 my ($self, $w, $h) = @_;
903 970
904 my $child = $self->child; 971 my $child = $self->child;
905 972
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 973 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 974 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 975
909 $self->child->configure (0, 0, $w, $h); 976 $self->child->configure (0, 0, $w, $h);
910 $self->update; 977 $self->update;
978
979 1
911} 980}
912 981
913sub set_offset { 982sub set_offset {
914 my ($self, $x, $y) = @_; 983 my ($self, $x, $y) = @_;
915 984
… …
941 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
942 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
943 ) { 1012 ) {
944 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
945 } else { 1014 } else {
946 $self->CFClient::UI::Base::find_widget ($x, $y) 1015 $self->CFPlus::UI::Base::find_widget ($x, $y)
947 } 1016 }
948} 1017}
949 1018
950sub _render { 1019sub _render {
951 my ($self) = @_; 1020 my ($self) = @_;
952 1021
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1022 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}; 1023 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
955 1024
956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1025 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
957 1026
958 $self->SUPER::_render; 1027 $self->SUPER::_render;
959} 1028}
960 1029
961############################################################################# 1030#############################################################################
962 1031
963package CFClient::UI::ScrolledWindow; 1032package CFPlus::UI::ScrolledWindow;
964 1033
965our @ISA = CFClient::UI::HBox::; 1034our @ISA = CFPlus::UI::HBox::;
966 1035
967sub new { 1036sub new {
968 my ($class, %arg) = @_; 1037 my ($class, %arg) = @_;
969 1038
970 my $child = delete $arg{child}; 1039 my $child = delete $arg{child};
971 1040
972 my $self; 1041 my $self;
973 1042
974 my $slider = new CFClient::UI::Slider 1043 my $slider = new CFPlus::UI::Slider
975 vertical => 1, 1044 vertical => 1,
976 range => [0, 0, 1, 0.01], # HACK fix 1045 range => [0, 0, 1, 0.01], # HACK fix
977 on_changed => sub { 1046 on_changed => sub {
978 $self->{vp}->set_offset (0, $_[1]); 1047 $self->{vp}->set_offset (0, $_[1]);
979 }, 1048 },
980 ; 1049 ;
981 1050
982 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1052 vp => (new CFPlus::UI::ViewPort expand => 1),
1053 can_events => 1,
984 slider => $slider, 1054 slider => $slider,
985 %arg, 1055 %arg,
986 ); 1056 );
987 1057
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1058 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child; 1059 $self->add ($child) if $child;
990 1060
991 $self 1061 $self
992} 1062}
993 1063
1064#TODO# update range on size_allocate depending on child
1065
994sub add { 1066sub add {
995 my ($self, $widget) = @_; 1067 my ($self, $widget) = @_;
996 1068
997 $self->{vp}->add ($self->{child} = $widget); 1069 $self->{vp}->add ($self->{child} = $widget);
998} 1070}
999 1071
1072sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_;
1074
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev);
1078
1079 1
1080}
1081
1082sub update_slider {
1083 my ($self) = @_;
1084
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1086}
1087
1000sub update { 1088sub update {
1001 my ($self) = @_; 1089 my ($self) = @_;
1002 1090
1003 $self->SUPER::update; 1091 $self->SUPER::update;
1004 1092
1005 # todo: overwrite size_allocate of child 1093 $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} 1094}
1009 1095
1010sub size_allocate { 1096sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1097 my ($self, $w, $h) = @_;
1012 1098
1099 $self->update_slider;
1100
1013 $self->SUPER::size_allocate ($w, $h); 1101 $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} 1102}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1103
1022############################################################################# 1104#############################################################################
1023 1105
1024package CFClient::UI::Frame; 1106package CFPlus::UI::Frame;
1025 1107
1026our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFPlus::UI::Bin::;
1027 1109
1028use CFClient::OpenGL; 1110use CFPlus::OpenGL;
1029 1111
1030sub new { 1112sub new {
1031 my $class = shift; 1113 my $class = shift;
1032 1114
1033 $class->SUPER::new ( 1115 $class->SUPER::new (
… …
1059 $self->SUPER::_draw; 1141 $self->SUPER::_draw;
1060} 1142}
1061 1143
1062############################################################################# 1144#############################################################################
1063 1145
1064package CFClient::UI::FancyFrame; 1146package CFPlus::UI::FancyFrame;
1065 1147
1066our @ISA = CFClient::UI::Bin::; 1148our @ISA = CFPlus::UI::Bin::;
1067 1149
1068use CFClient::OpenGL; 1150use 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 1151
1078sub new { 1152sub new {
1079 my ($class, %arg) = @_; 1153 my ($class, %arg) = @_;
1080 1154
1081 my $title = delete $arg{title}; 1155 if ((exists $arg{label}) && !ref $arg{label}) {
1156 $arg{label} = new CFPlus::UI::Label
1157 align => 1,
1158 valign => 0,
1159 text => $arg{label},
1160 fontsize => ($arg{border} || 0.8) * 0.75;
1161 }
1162
1163 my $self = $class->SUPER::new (
1164 # label => "",
1165 fg => [0.6, 0.3, 0.1],
1166 border => 0.8,
1167 style => 'single',
1168 %arg,
1169 );
1170
1171 $self
1172}
1173
1174sub add {
1175 my ($self, @widgets) = @_;
1176
1177 $self->SUPER::add (@widgets);
1178 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1179}
1180
1181sub border {
1182 int $_[0]{border} * $::FONTSIZE
1183}
1184
1185sub size_request {
1186 my ($self) = @_;
1187
1188 ($self->{label_w}, undef) = $self->{label}->size_request
1189 if $self->{label};
1190
1191 my ($w, $h) = $self->SUPER::size_request;
1192
1193 (
1194 $w + $self->border * 2,
1195 $h + $self->border * 2,
1196 )
1197}
1198
1199sub invoke_size_allocate {
1200 my ($self, $w, $h) = @_;
1201
1202 my $border = $self->border;
1203
1204 $w -= List::Util::max 0, $border * 2;
1205 $h -= List::Util::max 0, $border * 2;
1206
1207 if (my $label = $self->{label}) {
1208 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1209 $label->{h} = List::Util::min $h, $border;
1210 $label->invoke_size_allocate ($label->{w}, $label->{h});
1211 }
1212
1213 $self->child->configure ($border, $border, $w, $h);
1214
1215 1
1216}
1217
1218sub _draw {
1219 my ($self) = @_;
1220
1221 my $child = $self->{children}[0];
1222
1223 my $border = $self->border;
1224 my ($w, $h) = ($self->{w}, $self->{h});
1225
1226 $child->draw;
1227
1228 glColor @{$self->{fg}};
1229 glBegin GL_LINE_STRIP;
1230 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1231 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1233 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1234 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1235 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1236 glEnd;
1237
1238 if ($self->{label}) {
1239 glTranslate $border * 2, 0;
1240 $self->{label}->_draw;
1241 }
1242}
1243
1244#############################################################################
1245
1246package CFPlus::UI::Toplevel;
1247
1248our @ISA = CFPlus::UI::Bin::;
1249
1250use CFPlus::OpenGL;
1251
1252my $bg =
1253 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1254 mipmap => 1, wrap => 1;
1255
1256my @border =
1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1259
1260sub new {
1261 my ($class, %arg) = @_;
1082 1262
1083 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1264 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1265 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1266 border => 0.6,
1087 can_events => 1, 1267 can_events => 1,
1088 min_w => 16, 1268 min_w => 64,
1089 min_h => 16, 1269 min_h => 32,
1090 %arg, 1270 %arg,
1091 ); 1271 );
1092 1272
1093 $self->{title} = new CFClient::UI::Label 1273 $self->{title_widget} = new CFPlus::UI::Label
1094 align => 0, 1274 align => 0,
1095 valign => 1, 1275 valign => 1,
1096 text => $title, 1276 text => $self->{title},
1097 fontsize => $self->{border} 1277 fontsize => $self->{border},
1098 if defined $title; 1278 if exists $self->{title};
1279
1280 if ($self->{has_close_button}) {
1281 $self->{close_button} =
1282 new CFPlus::UI::ImageButton
1283 path => 'x1_close.png',
1284 on_activate => sub { $self->emit ("delete") };
1285
1286 $self->CFPlus::UI::Container::add ($self->{close_button});
1287 }
1099 1288
1100 $self 1289 $self
1101} 1290}
1102 1291
1103sub add { 1292sub add {
1104 my ($self, @widgets) = @_; 1293 my ($self, @widgets) = @_;
1105 1294
1106 $self->SUPER::add (@widgets); 1295 $self->SUPER::add (@widgets);
1296 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1297 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1298}
1109 1299
1110sub border { 1300sub border {
1111 int $_[0]{border} * $::FONTSIZE 1301 int $_[0]{border} * $::FONTSIZE
1112} 1302}
1113 1303
1114sub size_request { 1304sub size_request {
1115 my ($self) = @_; 1305 my ($self) = @_;
1116 1306
1117 $self->{title}->size_request 1307 $self->{title_widget}->size_request
1118 if $self->{title}; 1308 if $self->{title_widget};
1309
1310 $self->{close_button}->size_request
1311 if $self->{close_button};
1119 1312
1120 my ($w, $h) = $self->SUPER::size_request; 1313 my ($w, $h) = $self->SUPER::size_request;
1121 1314
1122 ( 1315 (
1123 $w + $self->border * 2, 1316 $w + $self->border * 2,
1124 $h + $self->border * 2, 1317 $h + $self->border * 2,
1125 ) 1318 )
1126} 1319}
1127 1320
1128sub size_allocate { 1321sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1130 1323
1131 if ($self->{title}) { 1324 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1325 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1326 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1327 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1328 }
1136 1329
1137 my $border = $self->border; 1330 my $border = $self->border;
1138 1331
1139 $h -= List::Util::max 0, $border * 2; 1332 $h -= List::Util::max 0, $border * 2;
1140 $w -= List::Util::max 0, $border * 2; 1333 $w -= List::Util::max 0, $border * 2;
1334
1335 $self->child->configure ($border, $border, $w, $h);
1336
1337 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1338 if $self->{close_button};
1339
1340 1
1341}
1342
1343sub invoke_delete {
1344 my ($self) = @_;
1345
1346 $self->hide;
1141 1347
1142 $self->child->configure ($border, $border, $w, $h); 1348 1
1143} 1349}
1144 1350
1145sub button_down { 1351sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1352 my ($self, $ev, $x, $y) = @_;
1147 1353
1148 my ($w, $h) = @$self{qw(w h)}; 1354 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1355 my $border = $self->border;
1150 1356
… …
1181 1387
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1388 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1389
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1390 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1391 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1392 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1393 };
1188 } else { 1394 } else {
1189 return 0; 1395 return 0;
1190 } 1396 }
1191 1397
1192 1 1398 1
1193} 1399}
1194 1400
1195sub button_up { 1401sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1402 my ($self, $ev, $x, $y) = @_;
1197 1403
1198 !!delete $self->{motion} 1404 ! ! delete $self->{motion}
1199} 1405}
1200 1406
1201sub mouse_motion { 1407sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1408 my ($self, $ev, $x, $y) = @_;
1203 1409
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1410 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1411
1206 !!$self->{motion} 1412 ! ! $self->{motion}
1413}
1414
1415sub invoke_visibility_change {
1416 my ($self, $visible) = @_;
1417
1418 delete $self->{motion} unless $visible;
1419
1420 0
1207} 1421}
1208 1422
1209sub _draw { 1423sub _draw {
1210 my ($self) = @_; 1424 my ($self) = @_;
1211 1425
… …
1237 1451
1238 glDisable GL_TEXTURE_2D; 1452 glDisable GL_TEXTURE_2D;
1239 1453
1240 $child->draw; 1454 $child->draw;
1241 1455
1242 if ($self->{title}) { 1456 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1457 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1458 $self->{title_widget}->_draw;
1459
1460 glTranslate 0, - ($border - $self->{h});
1245 } 1461 }
1462
1463 $self->{close_button}->draw
1464 if $self->{close_button};
1246} 1465}
1247 1466
1248############################################################################# 1467#############################################################################
1249 1468
1250package CFClient::UI::Table; 1469package CFPlus::UI::Table;
1251 1470
1252our @ISA = CFClient::UI::Base::; 1471our @ISA = CFPlus::UI::Base::;
1253 1472
1254use List::Util qw(max sum); 1473use List::Util qw(max sum);
1255 1474
1256use CFClient::OpenGL; 1475use CFPlus::OpenGL;
1257 1476
1258sub new { 1477sub new {
1259 my $class = shift; 1478 my $class = shift;
1260 1479
1261 $class->SUPER::new ( 1480 $class->SUPER::new (
… …
1267sub children { 1486sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1269} 1488}
1270 1489
1271sub add { 1490sub add {
1272 my ($self, $x, $y, $child) = @_; 1491 my ($self) = shift;
1273 1492
1493 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, ();
1274 $child->set_parent ($self); 1495 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1496 $self->{children}[$y][$x] = $child;
1497 }
1276 1498
1499 $self->{force_realloc} = 1;
1500 $self->{force_size_alloc} = 1;
1277 $self->realloc; 1501 $self->realloc;
1502}
1503
1504sub remove {
1505 my ($self, $child) = @_;
1506
1507 # TODO: not yet implemented
1278} 1508}
1279 1509
1280# TODO: move to container class maybe? send children a signal on removal? 1510# TODO: move to container class maybe? send children a signal on removal?
1281sub clear { 1511sub clear {
1282 my ($self) = @_; 1512 my ($self) = @_;
… …
1323 (sum @$ws), 1553 (sum @$ws),
1324 (sum @$hs), 1554 (sum @$hs),
1325 ) 1555 )
1326} 1556}
1327 1557
1328sub size_allocate { 1558sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1559 my ($self, $w, $h) = @_;
1330 1560
1331 my ($ws, $hs) = $self->get_wh; 1561 my ($ws, $hs) = $self->get_wh;
1332 1562
1333 my $req_w = (sum @$ws) || 1; 1563 my $req_w = (sum @$ws) || 1;
… …
1340 1570
1341 # linearly scale sizes 1571 # linearly scale sizes
1342 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1343 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1344 1574
1345 CFClient::UI::harmonize $ws; 1575 CFPlus::UI::harmonize $ws;
1346 CFClient::UI::harmonize $hs; 1576 CFPlus::UI::harmonize $hs;
1347 1577
1348 my $y; 1578 my $y;
1349 1579
1350 for my $r (0 .. $#{$self->{children}}) { 1580 for my $r (0 .. $#{$self->{children}}) {
1351 my $row = $self->{children}[$r] 1581 my $row = $self->{children}[$r]
… …
1365 } 1595 }
1366 1596
1367 $y += $row_h; 1597 $y += $row_h;
1368 } 1598 }
1369 1599
1600 1
1370} 1601}
1371 1602
1372sub find_widget { 1603sub find_widget {
1373 my ($self, $x, $y) = @_; 1604 my ($self, $x, $y) = @_;
1374 1605
… …
1393 } 1624 }
1394} 1625}
1395 1626
1396############################################################################# 1627#############################################################################
1397 1628
1398package CFClient::UI::Box; 1629package CFPlus::UI::Box;
1399 1630
1400our @ISA = CFClient::UI::Container::; 1631our @ISA = CFPlus::UI::Container::;
1401 1632
1402sub size_request { 1633sub size_request {
1403 my ($self) = @_; 1634 my ($self) = @_;
1404 1635
1405 $self->{vertical} 1636 $self->{vertical}
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1642 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1643 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1644 )
1414} 1645}
1415 1646
1416sub size_allocate { 1647sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1648 my ($self, $w, $h) = @_;
1418 1649
1419 my $space = $self->{vertical} ? $h : $w; 1650 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1651 my @children = $self->visible_children;
1421 1652
1422 my @req; 1653 my @req;
1423 1654
1424 if ($self->{homogeneous}) { 1655 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1656 @req = ($space / (@children || 1)) x @children;
1426 } else { 1657 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1658 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1659 my $req = List::Util::sum @req;
1429 1660
1430 if ($req > $space) { 1661 if ($req > $space) {
1431 # ah well, not enough space 1662 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1663 $_ *= $space / $req for @req;
1433 } else { 1664 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1665 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1666
1436 $space = ($space - $req) / $expand; # remaining space to give away 1667 $space = ($space - $req) / $expand; # remaining space to give away
1437 1668
1438 $req[$_] += $space * $children->[$_]{expand} 1669 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1670 for 0 .. $#children;
1440 } 1671 }
1441 } 1672 }
1442 1673
1443 CFClient::UI::harmonize \@req; 1674 CFPlus::UI::harmonize \@req;
1444 1675
1445 my $pos = 0; 1676 my $pos = 0;
1446 for (0 .. $#$children) { 1677 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1678 my $alloc = $req[$_];
1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1679 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1449 1680
1450 $pos += $alloc; 1681 $pos += $alloc;
1451 } 1682 }
1452 1683
1453 1 1684 1
1454} 1685}
1455 1686
1456############################################################################# 1687#############################################################################
1457 1688
1458package CFClient::UI::HBox; 1689package CFPlus::UI::HBox;
1459 1690
1460our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1461 1692
1462sub new { 1693sub new {
1463 my $class = shift; 1694 my $class = shift;
1464 1695
1465 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1468 ) 1699 )
1469} 1700}
1470 1701
1471############################################################################# 1702#############################################################################
1472 1703
1473package CFClient::UI::VBox; 1704package CFPlus::UI::VBox;
1474 1705
1475our @ISA = CFClient::UI::Box::; 1706our @ISA = CFPlus::UI::Box::;
1476 1707
1477sub new { 1708sub new {
1478 my $class = shift; 1709 my $class = shift;
1479 1710
1480 $class->SUPER::new ( 1711 $class->SUPER::new (
… …
1483 ) 1714 )
1484} 1715}
1485 1716
1486############################################################################# 1717#############################################################################
1487 1718
1488package CFClient::UI::Label; 1719package CFPlus::UI::Label;
1489 1720
1490our @ISA = CFClient::UI::DrawBG::; 1721our @ISA = CFPlus::UI::DrawBG::;
1491 1722
1492use CFClient::OpenGL; 1723use CFPlus::OpenGL;
1493 1724
1494sub new { 1725sub new {
1495 my ($class, %arg) = @_; 1726 my ($class, %arg) = @_;
1496 1727
1497 my $self = $class->SUPER::new ( 1728 my $self = $class->SUPER::new (
… …
1500 #active_bg => none 1731 #active_bg => none
1501 #font => default_font 1732 #font => default_font
1502 #text => initial text 1733 #text => initial text
1503 #markup => initial narkup 1734 #markup => initial narkup
1504 #max_w => maximum pixel width 1735 #max_w => maximum pixel width
1736 #style => 0, # render flags
1505 ellipsise => 3, # end 1737 ellipsise => 3, # end
1506 layout => (new CFClient::Layout), 1738 layout => (new CFPlus::Layout),
1507 fontsize => 1, 1739 fontsize => 1,
1508 align => -1, 1740 align => -1,
1509 valign => -1, 1741 valign => -1,
1510 padding_x => 2, 1742 padding_x => 2,
1511 padding_y => 2, 1743 padding_y => 2,
1512 can_events => 0, 1744 can_events => 0,
1513 %arg 1745 %arg
1514 ); 1746 );
1515 1747
1516 if (exists $self->{template}) { 1748 if (exists $self->{template}) {
1517 my $layout = new CFClient::Layout; 1749 my $layout = new CFPlus::Layout;
1518 $layout->set_text (delete $self->{template}); 1750 $layout->set_text (delete $self->{template});
1519 $self->{template} = $layout; 1751 $self->{template} = $layout;
1520 } 1752 }
1521 1753
1522 if (exists $self->{markup}) { 1754 if (exists $self->{markup}) {
… …
1526 } 1758 }
1527 1759
1528 $self 1760 $self
1529} 1761}
1530 1762
1531sub escape($) {
1532 local $_ = $_[0];
1533
1534 s/&/&amp;/g;
1535 s/>/&gt;/g;
1536 s/</&lt;/g;
1537
1538 $_
1539}
1540
1541sub update { 1763sub update {
1542 my ($self) = @_; 1764 my ($self) = @_;
1543 1765
1544 delete $self->{texture}; 1766 delete $self->{texture};
1545 $self->SUPER::update; 1767 $self->SUPER::update;
… …
1556 my ($self, $text) = @_; 1778 my ($self, $text) = @_;
1557 1779
1558 return if $self->{text} eq "T$text"; 1780 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1781 $self->{text} = "T$text";
1560 1782
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1783 $self->{layout}->set_text ($text);
1563 1784
1564 delete $self->{req_h}; 1785 delete $self->{size_req};
1565 $self->realloc; 1786 $self->realloc;
1566 $self->update; 1787 $self->update;
1567} 1788}
1568 1789
1569sub set_markup { 1790sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1793 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1794 $self->{text} = "M$markup";
1574 1795
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1796 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1797
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1798 $self->{layout}->set_markup ($markup);
1579 1799
1580 delete $self->{req_h}; 1800 delete $self->{size_req};
1581 $self->realloc; 1801 $self->realloc;
1582 $self->update; 1802 $self->update;
1583} 1803}
1584 1804
1585sub size_request { 1805sub size_request {
1586 my ($self) = @_; 1806 my ($self) = @_;
1587 1807
1588 if (exists $self->{req_h}) { 1808 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1809 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1810 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1811 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1812 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1813 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1814
1597 my ($w, $h) = $self->{layout}->size; 1815 my ($w, $h) = $self->{layout}->size;
1598 1816
1599 if (exists $self->{template}) { 1817 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font}; 1818 $self->{template}->set_font ($self->{font}) if $self->{font};
1819 $self->{template}->set_width ($self->{max_w} || -1);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1820 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1821
1603 my ($w2, $h2) = $self->{template}->size; 1822 my ($w2, $h2) = $self->{template}->size;
1604 1823
1605 $w = List::Util::max $w, $w2; 1824 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1825 $h = List::Util::max $h, $h2;
1607 } 1826 }
1608 1827
1609 ($w, $h) 1828 [$w, $h]
1610 } 1829 };
1611}
1612 1830
1831 @{ $self->{size_req} }
1832}
1833
1834sub baseline_shift {
1835 $_[0]{layout}->descent
1836}
1837
1613sub size_allocate { 1838sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1839 my ($self, $w, $h) = @_;
1615 1840
1616 delete $self->{ox}; 1841 delete $self->{ox};
1617 1842
1618 delete $self->{texture} 1843 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1844 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1845
1846 1
1620} 1847}
1621 1848
1622sub set_fontsize { 1849sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1850 my ($self, $fontsize) = @_;
1624 1851
1625 $self->{fontsize} = $fontsize; 1852 $self->{fontsize} = $fontsize;
1853 delete $self->{size_req};
1626 delete $self->{texture}; 1854 delete $self->{texture};
1627 1855
1628 $self->realloc; 1856 $self->realloc;
1629} 1857}
1630 1858
1859sub reconfigure {
1860 my ($self) = @_;
1861
1862 delete $self->{size_req};
1863 delete $self->{texture};
1864
1865 $self->SUPER::reconfigure;
1866}
1867
1631sub _draw { 1868sub _draw {
1632 my ($self) = @_; 1869 my ($self) = @_;
1633 1870
1634 $self->SUPER::_draw; # draw background, if applicable 1871 $self->SUPER::_draw; # draw background, if applicable
1635 1872
1636 my $tex = $self->{texture} ||= do { 1873 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 1874 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1875 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 1876 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1877 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1878 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1879 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 1880
1644 new_from_layout CFClient::Texture $self->{layout} 1881 [$self->{layout}->size]
1645 }; 1882 };
1646 1883
1647 unless (exists $self->{ox}) { 1884 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1885 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1886 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 1887 : ($self->{w} - $size->[0]) * 0.5);
1651 1888
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 1891 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 1892 };
1656 1893
1657 glEnable GL_TEXTURE_2D; 1894 my $w = List::Util::min $self->{w} + 4, $size->[0];
1895 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 1896
1659 if ($tex->{format} == GL_ALPHA) { 1897 $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} 1898}
1670 1899
1671############################################################################# 1900#############################################################################
1672 1901
1673package CFClient::UI::EntryBase; 1902package CFPlus::UI::EntryBase;
1674 1903
1675our @ISA = CFClient::UI::Label::; 1904our @ISA = CFPlus::UI::Label::;
1676 1905
1677use CFClient::OpenGL; 1906use CFPlus::OpenGL;
1678 1907
1679sub new { 1908sub new {
1680 my $class = shift; 1909 my $class = shift;
1681 1910
1682 $class->SUPER::new ( 1911 $class->SUPER::new (
… …
1686 active_fg => [0, 0, 0], 1915 active_fg => [0, 0, 0],
1687 can_hover => 1, 1916 can_hover => 1,
1688 can_focus => 1, 1917 can_focus => 1,
1689 valign => 0, 1918 valign => 0,
1690 can_events => 1, 1919 can_events => 1,
1920 ellipsise => 0,
1691 #text => ... 1921 #text => ...
1922 #hidden => "*",
1692 @_ 1923 @_
1693 ) 1924 )
1694} 1925}
1695 1926
1696sub _set_text { 1927sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 1934 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1935 $self->{text} = $text;
1705 1936
1706 $text =~ s/./*/g if $self->{hidden}; 1937 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1938 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1939 delete $self->{size_req};
1709 1940
1710 $self->_emit (changed => $self->{text}); 1941 $self->emit (changed => $self->{text});
1711 1942
1712 $self->realloc; 1943 $self->realloc;
1713 $self->update; 1944 $self->update;
1714} 1945}
1715 1946
… …
1730 my ($w, $h) = $self->SUPER::size_request; 1961 my ($w, $h) = $self->SUPER::size_request;
1731 1962
1732 ($w + 1, $h) # add 1 for cursor 1963 ($w + 1, $h) # add 1 for cursor
1733} 1964}
1734 1965
1735sub key_down { 1966sub invoke_key_down {
1736 my ($self, $ev) = @_; 1967 my ($self, $ev) = @_;
1737 1968
1738 my $mod = $ev->{mod}; 1969 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 1971 my $uni = $ev->{unicode};
1741 1972
1742 my $text = $self->get_text; 1973 my $text = $self->get_text;
1974
1975 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1743 1976
1744 if ($uni == 8) { 1977 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1978 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 1979 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 1980 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 1981 } elsif ($sym == CFPlus::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 1982 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 1983 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1984 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 1985 } elsif ($sym == CFPlus::SDLK_HOME) {
1986 # what a hack
1987 $self->{cursor} =
1988 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1989 ? length $1
1990 : 0;
1991 } elsif ($sym == CFPlus::SDLK_END) {
1992 # uh, again
1993 $self->{cursor} =
1994 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1995 ? $self->{cursor} + length $1
1996 : length $self->{text};
1997 } elsif ($uni == 21) { # ctrl-u
1998 $text = "";
1753 $self->{cursor} = 0; 1999 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 2000 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 2001 $self->emit ('escape');
1758 } elsif ($uni) { 2002 } elsif ($uni == 0x0d) {
2003 substr $text, $self->{cursor}++, 0, "\012";
2004 } elsif ($uni >= 0x20) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 2005 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 2006 } else {
1761 return 0; 2007 return 0;
1762 } 2008 }
1763 2009
1764 $self->_set_text ($text); 2010 $self->_set_text ($text);
1765 2011
1766 $self->realloc; 2012 $self->realloc;
2013 $self->update;
1767 2014
1768 1 2015 1
1769} 2016}
1770 2017
1771sub focus_in { 2018sub invoke_focus_in {
1772 my ($self) = @_; 2019 my ($self) = @_;
1773 2020
1774 $self->{last_activity} = $::NOW; 2021 $self->{last_activity} = $::NOW;
1775 2022
1776 $self->SUPER::focus_in; 2023 $self->SUPER::invoke_focus_in
1777} 2024}
1778 2025
1779sub button_down { 2026sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 2027 my ($self, $ev, $x, $y) = @_;
1781 2028
1782 $self->SUPER::button_down ($ev, $x, $y); 2029 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 2030
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 2031 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 2032
1786 # byte-index to char-index 2033 # byte-index to char-index
1787 my $text = $self->{text}; 2034 my $text = $self->{text};
1788 utf8::encode $text; 2035 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 2036 $self->{cursor} = length $text;
1790 2037
1791 $self->_set_text ($self->{text}); 2038 $self->_set_text ($self->{text});
1792 $self->update; 2039 $self->update;
1793 2040
1794 1 2041 1
1795} 2042}
1796 2043
1797sub mouse_motion { 2044sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 2045 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2046# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 2047
1801 0 2048 1
1802} 2049}
1803 2050
1804sub _draw { 2051sub _draw {
1805 my ($self) = @_; 2052 my ($self) = @_;
1806 2053
… …
1833 utf8::encode $text; 2080 utf8::encode $text;
1834 2081
1835 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2082 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1836 } 2083 }
1837 2084
1838 glColor @{$self->{fg}};
1839 glBegin GL_LINES; 2085 glBegin GL_LINES;
1840 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2086 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}; 2087 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1842 glEnd; 2088 glEnd;
1843 } 2089 }
1844} 2090}
1845 2091
2092#############################################################################
2093
1846package CFClient::UI::Entry; 2094package CFPlus::UI::Entry;
1847 2095
1848our @ISA = CFClient::UI::EntryBase::; 2096our @ISA = CFPlus::UI::EntryBase::;
1849 2097
1850use CFClient::OpenGL; 2098use CFPlus::OpenGL;
1851 2099
1852sub key_down { 2100sub invoke_key_down {
1853 my ($self, $ev) = @_; 2101 my ($self, $ev) = @_;
1854 2102
1855 my $sym = $ev->{sym}; 2103 my $sym = $ev->{sym};
1856 2104
1857 if ($sym == 13) { 2105 if ($ev->{uni} == 0x0d || $sym == 13) {
1858 unshift @{$self->{history}}, 2106 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 2107 my $txt = $self->get_text;
2108
1860 $self->{history_pointer} = -1; 2109 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 2110 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 2111 $self->emit (activate => $txt);
1863 $self->update; 2112 $self->update;
1864 2113
1865 } elsif ($sym == CFClient::SDLK_UP) { 2114 } elsif ($sym == CFPlus::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 2115 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 2116 $self->{history_saveback} = $self->get_text;
1868 } 2117 }
1869 if (@{$self->{history} || []} > 0) { 2118 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 2119 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 2121 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 2122 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2123 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 2124 }
1876 2125
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 2126 } elsif ($sym == CFPlus::SDLK_DOWN) {
1878 $self->{history_pointer}--; 2127 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2128 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 2129
1881 if ($self->{history_pointer} >= 0) { 2130 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2131 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 2132 } else {
1884 $self->set_text ($self->{history_saveback}); 2133 $self->set_text ($self->{history_saveback});
1885 } 2134 }
1886 2135
1887 } else { 2136 } else {
1888 return $self->SUPER::key_down ($ev) 2137 return $self->SUPER::invoke_key_down ($ev)
1889 } 2138 }
1890 2139
1891 1 2140 1
1892} 2141}
1893 2142
1894############################################################################# 2143#############################################################################
1895 2144
2145package CFPlus::UI::TextEdit;
2146
2147our @ISA = CFPlus::UI::EntryBase::;
2148
2149use CFPlus::OpenGL;
2150
2151sub move_cursor_ver {
2152 my ($self, $dy) = @_;
2153
2154 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2155
2156 $y += $dy;
2157
2158 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2159 $self->{cursor} = $index;
2160 delete $self->{cur_h};
2161 $self->update;
2162 return;
2163 }
2164}
2165
2166sub invoke_key_down {
2167 my ($self, $ev) = @_;
2168
2169 my $sym = $ev->{sym};
2170
2171 if ($sym == CFPlus::SDLK_UP) {
2172 $self->move_cursor_ver (-1);
2173 } elsif ($sym == CFPlus::SDLK_DOWN) {
2174 $self->move_cursor_ver (+1);
2175 } else {
2176 return $self->SUPER::invoke_key_down ($ev)
2177 }
2178
2179 1
2180}
2181
2182#############################################################################
2183
1896package CFClient::UI::Button; 2184package CFPlus::UI::Button;
1897 2185
1898our @ISA = CFClient::UI::Label::; 2186our @ISA = CFPlus::UI::Label::;
1899 2187
1900use CFClient::OpenGL; 2188use CFPlus::OpenGL;
1901 2189
1902my @tex = 2190my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2191 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png); 2192 qw(b1_button_active.png);
1905 2193
1906sub new { 2194sub new {
1907 my $class = shift; 2195 my $class = shift;
1908 2196
… …
1917 can_events => 1, 2205 can_events => 1,
1918 @_ 2206 @_
1919 ) 2207 )
1920} 2208}
1921 2209
1922sub activate { }
1923
1924sub button_up { 2210sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2211 my ($self, $ev, $x, $y) = @_;
1926 2212
1927 $self->emit ("activate") 2213 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2214 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2215 && $y >= 0 && $y < $self->{h};
… …
1947 $self->SUPER::_draw; 2233 $self->SUPER::_draw;
1948} 2234}
1949 2235
1950############################################################################# 2236#############################################################################
1951 2237
1952package CFClient::UI::CheckBox; 2238package CFPlus::UI::CheckBox;
1953 2239
1954our @ISA = CFClient::UI::DrawBG::; 2240our @ISA = CFPlus::UI::DrawBG::;
1955 2241
1956my @tex = 2242my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2243 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2244 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2245
1960use CFClient::OpenGL; 2246use CFPlus::OpenGL;
1961 2247
1962sub new { 2248sub new {
1963 my $class = shift; 2249 my $class = shift;
1964 2250
1965 $class->SUPER::new ( 2251 $class->SUPER::new (
… …
1979 my ($self) = @_; 2265 my ($self) = @_;
1980 2266
1981 (6) x 2 2267 (6) x 2
1982} 2268}
1983 2269
2270sub toggle {
2271 my ($self) = @_;
2272
2273 $self->{state} = !$self->{state};
2274 $self->emit (changed => $self->{state});
2275 $self->update;
2276}
2277
1984sub button_down { 2278sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2279 my ($self, $ev, $x, $y) = @_;
1986 2280
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2281 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2282 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2283 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2284 } else {
1992 return 0 2285 return 0
1993 } 2286 }
1994 2287
1995 1 2288 1
… …
2015 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2016} 2309}
2017 2310
2018############################################################################# 2311#############################################################################
2019 2312
2020package CFClient::UI::Image; 2313package CFPlus::UI::Image;
2021 2314
2022our @ISA = CFClient::UI::Base::; 2315our @ISA = CFPlus::UI::Base::;
2023 2316
2024use CFClient::OpenGL; 2317use CFPlus::OpenGL;
2025use Carp qw/confess/;
2026 2318
2027our %loaded_images; 2319our %texture_cache;
2028 2320
2029sub new { 2321sub new {
2030 my $class = shift; 2322 my $class = shift;
2031 2323
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2324 my $self = $class->SUPER::new (
2325 can_events => 0,
2326 @_,
2327 );
2033 2328
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2329 $self->{path} || $self->{tex}
2330 or Carp::croak "'path' or 'tex' attributes required";
2035 2331
2036 $loaded_images{$self->{image}} ||= 2332 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2333 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2038 2334
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2335 CFPlus::weaken $texture_cache{$self->{path}};
2040 2336
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2337 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2338
2045 $self 2339 $self
2046} 2340}
2047 2341
2342sub STORABLE_freeze {
2343 my ($self, $cloning) = @_;
2344
2345 $self->{path}
2346 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2347
2348 $self->{path}
2349}
2350
2351sub STORABLE_attach {
2352 my ($self, $cloning, $path) = @_;
2353
2354 $self->new (path => $path)
2355}
2356
2048sub size_request { 2357sub size_request {
2049 my ($self) = @_; 2358 my ($self) = @_;
2050 2359
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2360 ($self->{tex}{w}, $self->{tex}{h})
2052} 2361}
2053 2362
2054sub _draw { 2363sub _draw {
2055 my ($self) = @_; 2364 my ($self) = @_;
2056 2365
… …
2066 } 2375 }
2067 2376
2068 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2070 2379
2071 $tex->draw_quad_alpha (0, 0, $w, $h); 2380 $tex->draw_quad (0, 0, $w, $h);
2072 2381
2073 glDisable GL_TEXTURE_2D; 2382 glDisable GL_TEXTURE_2D;
2074} 2383}
2075 2384
2076############################################################################# 2385#############################################################################
2077 2386
2387package CFPlus::UI::ImageButton;
2388
2389our @ISA = CFPlus::UI::Image::;
2390
2391use CFPlus::OpenGL;
2392
2393my %textures;
2394
2395sub new {
2396 my $class = shift;
2397
2398 my $self = $class->SUPER::new (
2399 padding_x => 4,
2400 padding_y => 4,
2401 fg => [1, 1, 1],
2402 active_fg => [0, 0, 1],
2403 can_hover => 1,
2404 align => 0,
2405 valign => 0,
2406 can_events => 1,
2407 @_
2408 );
2409}
2410
2411sub invoke_button_up {
2412 my ($self, $ev, $x, $y) = @_;
2413
2414 $self->emit ("activate")
2415 if $x >= 0 && $x < $self->{w}
2416 && $y >= 0 && $y < $self->{h};
2417
2418 1
2419}
2420
2421#############################################################################
2422
2078package CFClient::UI::VGauge; 2423package CFPlus::UI::VGauge;
2079 2424
2080our @ISA = CFClient::UI::Base::; 2425our @ISA = CFPlus::UI::Base::;
2081 2426
2082use List::Util qw(min max); 2427use List::Util qw(min max);
2083 2428
2084use CFClient::OpenGL; 2429use CFPlus::OpenGL;
2085 2430
2086my %tex = ( 2431my %tex = (
2087 food => [ 2432 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2433 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2434 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2435 ],
2091 grace => [ 2436 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 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/ 2438 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2094 ], 2439 ],
2095 hp => [ 2440 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2442 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2443 ],
2099 mana => [ 2444 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 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/ 2446 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2102 ], 2447 ],
2103); 2448);
2104 2449
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2450# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2510 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2511 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2512
2168 my $h1 = $self->{h} * (1 - $ycut1); 2513 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2514 my $h2 = $self->{h} * (1 - $ycut2);
2515 my $h3 = $self->{h};
2516
2517 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2518
2171 glEnable GL_BLEND; 2519 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2520 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2521 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2522 glEnable GL_TEXTURE_2D;
… …
2193 2541
2194 if ($t3) { 2542 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2543 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2544 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2545 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2546 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2547 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2548 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2549 glEnd;
2202 } 2550 }
2203 2551
2204 glDisable GL_BLEND; 2552 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2553 glDisable GL_TEXTURE_2D;
2206} 2554}
2207 2555
2208############################################################################# 2556#############################################################################
2209 2557
2210package CFClient::UI::Gauge; 2558package CFPlus::UI::Gauge;
2211 2559
2212our @ISA = CFClient::UI::VBox::; 2560our @ISA = CFPlus::UI::VBox::;
2213 2561
2214sub new { 2562sub new {
2215 my ($class, %arg) = @_; 2563 my ($class, %arg) = @_;
2216 2564
2217 my $self = $class->SUPER::new ( 2565 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2567 can_hover => 1,
2220 can_events => 1, 2568 can_events => 1,
2221 %arg, 2569 %arg,
2222 ); 2570 );
2223 2571
2224 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2572 $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); 2573 $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"); 2574 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2227 2575
2228 $self 2576 $self
2229} 2577}
2230 2578
2231sub set_fontsize { 2579sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2600 $self->{value}->set_text ($val);
2253} 2601}
2254 2602
2255############################################################################# 2603#############################################################################
2256 2604
2257package CFClient::UI::Slider; 2605package CFPlus::UI::Slider;
2258 2606
2259use strict; 2607use strict;
2260 2608
2261use CFClient::OpenGL; 2609use CFPlus::OpenGL;
2262 2610
2263our @ISA = CFClient::UI::DrawBG::; 2611our @ISA = CFPlus::UI::DrawBG::;
2264 2612
2265my @tex = 2613my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2614 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 2615 qw(s1_slider.png s1_slider_bg.png);
2268 2616
2269sub new { 2617sub new {
2270 my $class = shift; 2618 my $class = shift;
2271 2619
… …
2292 $self->update; 2640 $self->update;
2293 2641
2294 $self 2642 $self
2295} 2643}
2296 2644
2297sub changed { }
2298
2299sub set_range { 2645sub set_range {
2300 my ($self, $range) = @_; 2646 my ($self, $range) = @_;
2301 2647
2302 ($range, $self->{range}) = ($self->{range}, $range); 2648 ($range, $self->{range}) = ($self->{range}, $range);
2303 2649
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2650 if ("@$range" ne "@{$self->{range}}") {
2651 $self->update;
2652 $self->set_value ($self->{range}[0]);
2653 }
2306} 2654}
2307 2655
2308sub set_value { 2656sub set_value {
2309 my ($self, $value) = @_; 2657 my ($self, $value) = @_;
2310 2658
… …
2321 if $unit; 2669 if $unit;
2322 2670
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2671 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2672
2325 if ($value != $old_value) { 2673 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2674 $self->emit (changed => $value);
2327 $self->update; 2675 $self->update;
2328 } 2676 }
2329} 2677}
2330 2678
2331sub size_request { 2679sub size_request {
2332 my ($self) = @_; 2680 my ($self) = @_;
2333 2681
2334 ($self->{req_w}, $self->{req_h}) 2682 ($self->{req_w}, $self->{req_h})
2335} 2683}
2336 2684
2337sub button_down { 2685sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2686 my ($self, $ev, $x, $y) = @_;
2339 2687
2340 $self->SUPER::button_down ($ev, $x, $y); 2688 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2689
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2690 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2691
2344 $self->mouse_motion ($ev, $x, $y) 2692 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2693}
2346 2694
2347sub mouse_motion { 2695sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2696 my ($self, $ev, $x, $y) = @_;
2349 2697
2350 if ($GRAB == $self) { 2698 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2699 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2700
… …
2358 } else { 2706 } else {
2359 return 0; 2707 return 0;
2360 } 2708 }
2361 2709
2362 1 2710 1
2711}
2712
2713sub invoke_mouse_wheel {
2714 my ($self, $ev) = @_;
2715
2716 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2717
2718 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2719
2720 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2721
2722 ! ! $delta
2363} 2723}
2364 2724
2365sub update { 2725sub update {
2366 my ($self) = @_; 2726 my ($self) = @_;
2367 2727
… …
2416 glDisable GL_TEXTURE_2D; 2776 glDisable GL_TEXTURE_2D;
2417} 2777}
2418 2778
2419############################################################################# 2779#############################################################################
2420 2780
2421package CFClient::UI::ValSlider; 2781package CFPlus::UI::ValSlider;
2422 2782
2423our @ISA = CFClient::UI::HBox::; 2783our @ISA = CFPlus::UI::HBox::;
2424 2784
2425sub new { 2785sub new {
2426 my ($class, %arg) = @_; 2786 my ($class, %arg) = @_;
2427 2787
2428 my $range = delete $arg{range}; 2788 my $range = delete $arg{range};
2429 2789
2430 my $self = $class->SUPER::new ( 2790 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2791 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2792 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 2793 to_value => sub { shift },
2434 from_value => sub { shift }, 2794 from_value => sub { shift },
2435 %arg, 2795 %arg,
2436 ); 2796 );
2437 2797
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2817sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2818sub set_value { shift->{slider}->set_value (@_) }
2459 2819
2460############################################################################# 2820#############################################################################
2461 2821
2462package CFClient::UI::TextView; 2822package CFPlus::UI::TextScroller;
2463 2823
2464our @ISA = CFClient::UI::HBox::; 2824our @ISA = CFPlus::UI::HBox::;
2465 2825
2466use CFClient::OpenGL; 2826use CFPlus::OpenGL;
2467 2827
2468sub new { 2828sub new {
2469 my $class = shift; 2829 my $class = shift;
2470 2830
2471 my $self = $class->SUPER::new ( 2831 my $self = $class->SUPER::new (
2472 fontsize => 1, 2832 fontsize => 1,
2473 can_events => 0, 2833 can_events => 1,
2834 indent => 0,
2474 #font => default_font 2835 #font => default_font
2475 @_, 2836 @_,
2476 2837
2477 layout => (new CFClient::Layout 1), 2838 layout => (new CFPlus::Layout),
2478 par => [], 2839 par => [],
2840 max_par => 0,
2479 height => 0, 2841 height => 0,
2480 children => [ 2842 children => [
2481 (new CFClient::UI::Empty expand => 1), 2843 (new CFPlus::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 2844 (new CFPlus::UI::Slider vertical => 1),
2483 ], 2845 ],
2484 ); 2846 );
2485 2847
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 2848 $self->{children}[1]->connect (changed => sub { $self->update });
2487 2849
… …
2493 2855
2494 $self->{fontsize} = $fontsize; 2856 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2857 $self->reflow;
2496} 2858}
2497 2859
2860sub size_request {
2861 my ($self) = @_;
2862
2863 my ($empty, $slider) = @{ $self->{children} };
2864
2865 local $self->{children} = [$empty, $slider];
2866 $self->SUPER::size_request
2867}
2868
2498sub size_allocate { 2869sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2870 my ($self, $w, $h) = @_;
2500 2871
2501 $self->SUPER::size_allocate ($w, $h); 2872 my ($empty, $slider, @other) = @{ $self->{children} };
2873 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 2874
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2875 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 2877 $self->{layout}->set_width ($empty->{w});
2878 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 2879
2507 $self->reflow; 2880 $self->reflow;
2508}
2509 2881
2510sub text_size { 2882 local $self->{children} = [$empty, $slider];
2883 $self->SUPER::invoke_size_allocate ($w, $h)
2884}
2885
2886sub invoke_mouse_wheel {
2511 my ($self, $text, $indent) = @_; 2887 my ($self, $ev) = @_;
2888
2889 return 0 unless $ev->{dy}; # only vertical movements
2890
2891 $self->{children}[1]->emit (mouse_wheel => $ev);
2892
2893 1
2894}
2895
2896sub get_layout {
2897 my ($self, $para) = @_;
2512 2898
2513 my $layout = $self->{layout}; 2899 my $layout = $self->{layout};
2514 2900
2901 $layout->set_font ($self->{font}) if $self->{font};
2902 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2903 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 2904 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2905 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 2906 $layout->set_markup ($para->{markup});
2907
2908 $layout->set_shapes (
2909 map
2910 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2911 @{$para->{widget}}
2518 2912 );
2913
2519 $layout->size 2914 $layout
2520} 2915}
2521 2916
2522sub reflow { 2917sub reflow {
2523 my ($self) = @_; 2918 my ($self) = @_;
2524 2919
… …
2531 2926
2532 # todo: base offset on lines or so, not on pixels 2927 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset); 2928 $self->{children}[1]->set_value ($offset);
2534} 2929}
2535 2930
2931sub current_paragraph {
2932 my ($self) = @_;
2933
2934 $self->{top_paragraph} - 1
2935}
2936
2937sub scroll_to {
2938 my ($self, $para) = @_;
2939
2940 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2941
2942 $self->{scroll_to} = $para;
2943 $self->update;
2944}
2945
2536sub clear { 2946sub clear {
2537 my ($self) = @_; 2947 my ($self) = @_;
2948
2949 my (undef, undef, @other) = @{ $self->{children} };
2950 $self->remove ($_) for @other;
2538 2951
2539 $self->{par} = []; 2952 $self->{par} = [];
2540 $self->{height} = 0; 2953 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2954 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 2955}
2543 2956
2544sub add_paragraph { 2957sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 2958 my $self = shift;
2546 2959
2547 for my $line (split /\n/, $text) { 2960 for my $para (@_) {
2548 my ($w, $h) = $self->text_size ($line); 2961 $para = {
2962 fg => [1, 1, 1, 1],
2963 indent => 0,
2964 markup => "",
2965 widget => [],
2966 ref $para ? %$para : (markup => $para),
2967 w => 1e10,
2968 wrapped => 1,
2969 };
2970
2971 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2972 push @{$self->{par}}, $para;
2973 }
2974
2975 if (my $max = $self->{max_par}) {
2976 shift @{$self->{par}} while @{$self->{par}} > $max;
2977 }
2978
2979 $self->{need_reflow}++;
2980 $self->update;
2981}
2982
2983sub scroll_to_bottom {
2984 my ($self) = @_;
2985
2986 $self->{scroll_to} = $#{$self->{par}};
2987 $self->update;
2988}
2989
2990sub force_uptodate {
2991 my ($self) = @_;
2992
2993 if (delete $self->{need_reflow}) {
2994 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2995
2996 my $height = 0;
2997
2998 for my $para (@{$self->{par}}) {
2999 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3000 my $layout = $self->get_layout ($para);
3001 my ($w, $h) = $layout->size;
3002
3003 $para->{w} = $w + $para->{indent};
3004 $para->{h} = $h;
3005 $para->{wrapped} = $layout->has_wrapped;
3006 }
3007
3008 $para->{y} = $height;
3009 $height += $para->{h};
3010 }
3011
2549 $self->{height} += $h; 3012 $self->{height} = $height;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3013 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2551 }
2552 3014
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3015 delete $self->{texture};
3016 }
3017
3018 if (my $paridx = delete $self->{scroll_to}) {
3019 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3020 }
2554} 3021}
2555 3022
2556sub update { 3023sub update {
2557 my ($self) = @_; 3024 my ($self) = @_;
2558 3025
… …
2560 3027
2561 return unless $self->{h} > 0; 3028 return unless $self->{h} > 0;
2562 3029
2563 delete $self->{texture}; 3030 delete $self->{texture};
2564 3031
2565 $ROOT->on_post_alloc ($self, sub { 3032 $ROOT->on_post_alloc ($self => sub {
3033 $self->force_uptodate;
3034
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3035 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 3036
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 { 3037 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 3038 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 3039 glClear GL_COLOR_BUFFER_BIT;
2597 3040
3041 package CFPlus::UI::Base;
3042 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3043 (0, 0, $self->{w}, $self->{h});
3044
3045 my $top = int $self->{children}[1]{range}[0];
3046
3047 my $paridx = 0;
3048 my $top_paragraph;
2598 my $top = int $self->{children}[1]{range}[0]; 3049 my $top = int $self->{children}[1]{range}[0];
2599 3050
2600 my $y0 = $top; 3051 my $y0 = $top;
2601 my $y1 = $top + $H; 3052 my $y1 = $top + $H;
2602 3053
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}}) { 3054 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 3055 my $h = $para->{h};
3056 my $y = $para->{y};
2615 3057
2616 if ($y0 < $y + $h && $y < $y1) { 3058 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 3059 my $layout = $self->get_layout ($para);
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 3060
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3061 $layout->render ($para->{indent}, $y - $y0);
2622 3062
2623 glRasterPos $par->[3], $y - $y0; 3063 if (my @w = @{ $para->{widget} }) {
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3064 my @s = $layout->get_shapes;
3065
3066 for (@w) {
3067 my ($dx, $dy) = splice @s, 0, 2, ();
3068
3069 $_->{x} = $dx + $para->{indent};
3070 $_->{y} = $dy + $y - $y0;
3071
3072 $_->draw;
3073 }
3074 }
2625 } 3075 }
2626 3076
2627 $y += $h; 3077 $paridx++;
3078 $top_paragraph ||= $paridx if $y >= $top;
2628 } 3079 }
2629 3080
2630 glDisable GL_BLEND; 3081 $self->{top_paragraph} = $top_paragraph;
2631 }; 3082 };
2632 }); 3083 });
3084}
3085
3086sub reconfigure {
3087 my ($self) = @_;
3088
3089 $self->SUPER::reconfigure;
3090
3091 $_->{w} = 1e10 for @{ $self->{par} };
3092 $self->reflow;
2633} 3093}
2634 3094
2635sub _draw { 3095sub _draw {
2636 my ($self) = @_; 3096 my ($self) = @_;
2637 3097
… …
2640 glColor 0, 0, 0, 1; 3100 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3101 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 3102 glDisable GL_TEXTURE_2D;
2643 3103
2644 $self->{children}[1]->draw; 3104 $self->{children}[1]->draw;
2645
2646} 3105}
2647 3106
2648############################################################################# 3107#############################################################################
2649 3108
2650package CFClient::UI::Animator; 3109package CFPlus::UI::Animator;
2651 3110
2652use CFClient::OpenGL; 3111use CFPlus::OpenGL;
2653 3112
2654our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2655 3114
2656sub moveto { 3115sub moveto {
2657 my ($self, $x, $y) = @_; 3116 my ($self, $x, $y) = @_;
2658 3117
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3118 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 3146 glPopMatrix;
2688} 3147}
2689 3148
2690############################################################################# 3149#############################################################################
2691 3150
2692package CFClient::UI::Flopper; 3151package CFPlus::UI::Flopper;
2693 3152
2694our @ISA = CFClient::UI::Button::; 3153our @ISA = CFPlus::UI::Button::;
2695 3154
2696sub new { 3155sub new {
2697 my $class = shift; 3156 my $class = shift;
2698 3157
2699 my $self = $class->SUPER::new ( 3158 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 3170 $self->{other}->toggle_visibility;
2712} 3171}
2713 3172
2714############################################################################# 3173#############################################################################
2715 3174
2716package CFClient::UI::Tooltip; 3175package CFPlus::UI::Tooltip;
2717 3176
2718our @ISA = CFClient::UI::Bin::; 3177our @ISA = CFPlus::UI::Bin::;
2719 3178
2720use CFClient::OpenGL; 3179use CFPlus::OpenGL;
2721 3180
2722sub new { 3181sub new {
2723 my $class = shift; 3182 my $class = shift;
2724 3183
2725 $class->SUPER::new ( 3184 $class->SUPER::new (
… …
2728 ) 3187 )
2729} 3188}
2730 3189
2731sub set_tooltip_from { 3190sub set_tooltip_from {
2732 my ($self, $widget) = @_; 3191 my ($self, $widget) = @_;
3192
3193 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3194 if $widget->{tooltip} =~ /^#(.*)$/;
2733 3195
2734 my $tooltip = $widget->{tooltip}; 3196 my $tooltip = $widget->{tooltip};
2735 3197
2736 if ($ENV{CFPLUS_DEBUG} & 2) { 3198 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 3199 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3200 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 3201 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 3202 . "visible $widget->{visible}";
2741 } 3203 }
2742 3204
3205 $tooltip =~ s/^\n+//;
3206 $tooltip =~ s/\n+$//;
3207
2743 $self->add (new CFClient::UI::Label 3208 $self->add (new CFPlus::UI::Label
2744 markup => $tooltip, 3209 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3210 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 3211 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 3212 style => 1, # FLAG_INVERSE
2748 ellipsise => 0, 3213 ellipsise => 0,
2749 font => ($widget->{tooltip_font} || $::FONT_PROP), 3214 font => ($widget->{tooltip_font} || $::FONT_PROP),
2750 ); 3215 );
2751} 3216}
2752 3217
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3221 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3222
2758 ($w + 4, $h + 4) 3223 ($w + 4, $h + 4)
2759} 3224}
2760 3225
2761sub size_allocate { 3226sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3227 my ($self, $w, $h) = @_;
2763 3228
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3229 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3230}
2766 3231
2767sub visibility_change { 3232sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3233 my ($self, $visible) = @_;
2769 3234
2770 return unless $visible; 3235 return unless $visible;
2771 3236
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3237 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3238 my $widget = $self->{owner}
2774 or return; 3239 or return;
2775 3240
3241 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3242 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3243
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3244 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3245 if $x + $self->{w} > $self->{root}{w};
2780 3246
2781 $self->move_abs ($x, $y); 3247 $self->move_abs ($x, $y);
3248 } else {
3249 $self->hide;
3250 }
2782 }); 3251 });
2783} 3252}
2784 3253
2785sub _draw { 3254sub _draw {
2786 my ($self) = @_; 3255 my ($self) = @_;
… …
2810 $self->SUPER::_draw; 3279 $self->SUPER::_draw;
2811} 3280}
2812 3281
2813############################################################################# 3282#############################################################################
2814 3283
2815package CFClient::UI::Face; 3284package CFPlus::UI::Face;
2816 3285
2817our @ISA = CFClient::UI::Base::; 3286our @ISA = CFPlus::UI::DrawBG::;
2818 3287
2819use CFClient::OpenGL; 3288use CFPlus::OpenGL;
2820 3289
2821sub new { 3290sub new {
2822 my $class = shift; 3291 my $class = shift;
2823 3292
2824 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2826 can_events => 0, 3295 can_events => 0,
2827 @_, 3296 @_,
2828 ); 3297 );
2829 3298
2830 if ($self->{anim} && $self->{animspeed}) { 3299 if ($self->{anim} && $self->{animspeed}) {
2831 Scalar::Util::weaken (my $widget = $self); 3300 CFPlus::weaken (my $widget = $self);
2832 3301
2833 $self->{timer} = Event->timer ( 3302 $self->{timer} = Event->timer (
2834 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3303 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2835 hard => 1, 3304 hard => 1,
2836 interval => $self->{animspeed}, 3305 interval => $self->{animspeed},
… …
2859sub _draw { 3328sub _draw {
2860 my ($self) = @_; 3329 my ($self) = @_;
2861 3330
2862 return unless $::CONN; 3331 return unless $::CONN;
2863 3332
3333 $self->SUPER::_draw;
3334
2864 my $face; 3335 my $face;
2865 3336
2866 if ($self->{frame}) { 3337 if ($self->{frame}) {
2867 my $anim = $::CONN->{anim}[$self->{anim}]; 3338 my $anim = $::CONN->{anim}[$self->{anim}];
2868 3339
… …
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3350 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3351 glDisable GL_TEXTURE_2D;
2881 } 3352 }
2882} 3353}
2883 3354
2884sub DESTROY { 3355sub destroy {
2885 my ($self) = @_; 3356 my ($self) = @_;
2886 3357
2887 $self->{timer}->cancel 3358 $self->{timer}->cancel
2888 if $self->{timer}; 3359 if $self->{timer};
2889 3360
2890 $self->SUPER::DESTROY; 3361 $self->SUPER::destroy;
2891} 3362}
2892 3363
2893############################################################################# 3364#############################################################################
2894 3365
2895package CFClient::UI::Buttonbar; 3366package CFPlus::UI::Buttonbar;
2896 3367
2897our @ISA = CFClient::UI::HBox::; 3368our @ISA = CFPlus::UI::HBox::;
2898 3369
2899# TODO: should actualyl wrap buttons and other goodies. 3370# TODO: should actually wrap buttons and other goodies.
2900 3371
2901############################################################################# 3372#############################################################################
2902 3373
2903package CFClient::UI::Menu; 3374package CFPlus::UI::Menu;
2904 3375
2905our @ISA = CFClient::UI::FancyFrame::; 3376our @ISA = CFPlus::UI::Toplevel::;
2906 3377
2907use CFClient::OpenGL; 3378use CFPlus::OpenGL;
2908 3379
2909sub new { 3380sub new {
2910 my $class = shift; 3381 my $class = shift;
2911 3382
2912 my $self = $class->SUPER::new ( 3383 my $self = $class->SUPER::new (
2913 items => [], 3384 items => [],
2914 z => 100, 3385 z => 100,
2915 @_, 3386 @_,
2916 ); 3387 );
2917 3388
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3389 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2919 3390
2920 for my $item (@{ $self->{items} }) { 3391 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3392 my ($widget, $cb, $tooltip) = @$item;
2922 3393
2923 # handle various types of items, only text for now 3394 # handle various types of items, only text for now
2924 if (!ref $widget) { 3395 if (!ref $widget) {
3396 if ($widget =~ /\t/) {
3397 my ($left, $right) = split /\t/, $widget, 2;
3398
2925 $widget = new CFClient::UI::Label 3399 $widget = new CFPlus::UI::HBox
2926 can_hover => 1, 3400 can_hover => 1,
2927 can_events => 1, 3401 can_events => 1,
3402 tooltip => $tooltip,
3403 children => [
3404 (new CFPlus::UI::Label markup => $left, expand => 1),
3405 (new CFPlus::UI::Label markup => $right, align => +1),
3406 ],
3407 ;
3408
3409 } else {
3410 $widget = new CFPlus::UI::Label
3411 can_hover => 1,
3412 can_events => 1,
2928 text => $widget; 3413 markup => $widget,
3414 tooltip => $tooltip;
3415 }
2929 } 3416 }
2930 3417
2931 $self->{item}{$widget} = $item; 3418 $self->{item}{$widget} = $item;
2932 3419
2933 $self->{vbox}->add ($widget); 3420 $self->{vbox}->add ($widget);
… …
2938 3425
2939# popup given the event (must be a mouse button down event currently) 3426# popup given the event (must be a mouse button down event currently)
2940sub popup { 3427sub popup {
2941 my ($self, $ev) = @_; 3428 my ($self, $ev) = @_;
2942 3429
2943 $self->_emit ("popdown"); 3430 $self->emit ("popdown");
2944 3431
2945 # maybe save $GRAB? must be careful about events... 3432 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3433 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3434 $self->{button} = $ev->{button};
2948 3435
2949 $self->show; 3436 $self->show;
2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3437 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2951} 3438}
2952 3439
2953sub mouse_motion { 3440sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3441 my ($self, $ev, $x, $y) = @_;
2955 3442
2956 # TODO: should use vbox->find_widget or so 3443 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3444 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3445 $self->{hover} = $self->{item}{$HOVER};
2959 3446
2960 0 3447 0
2961} 3448}
2962 3449
2963sub button_up { 3450sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3451 my ($self, $ev, $x, $y) = @_;
2965 3452
2966 if ($ev->{button} == $self->{button}) { 3453 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3454 undef $GRAB;
2968 $self->hide; 3455 $self->hide;
2969 3456
2970 $self->_emit ("popdown"); 3457 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3458 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3459 } else {
2973 return 0 3460 return 0
2974 } 3461 }
2975 3462
2976 1 3463 1
2977} 3464}
2978 3465
2979############################################################################# 3466#############################################################################
2980 3467
2981package CFClient::UI::Multiplexer; 3468package CFPlus::UI::Multiplexer;
2982 3469
2983our @ISA = CFClient::UI::Container::; 3470our @ISA = CFPlus::UI::Container::;
2984 3471
2985sub new { 3472sub new {
2986 my $class = shift; 3473 my $class = shift;
2987 3474
2988 my $self = $class->SUPER::new ( 3475 my $self = $class->SUPER::new (
… …
3002 3489
3003 $self->{current} = $self->{children}[0] 3490 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3491 if @{ $self->{children} };
3005} 3492}
3006 3493
3494sub get_current_page {
3495 my ($self) = @_;
3496
3497 $self->{current}
3498}
3499
3007sub set_current_page { 3500sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3501 my ($self, $page_or_widget) = @_;
3009 3502
3010 my $widget = ref $page_or_widget 3503 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3504 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3505 : $self->{children}[$page_or_widget];
3013 3506
3014 $self->{current} = $widget; 3507 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3508 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3509
3017 $self->_emit (page_changed => $self->{current}); 3510 $self->emit (page_changed => $self->{current});
3018 3511
3019 $self->realloc; 3512 $self->realloc;
3020} 3513}
3021 3514
3022sub visible_children { 3515sub visible_children {
… …
3027 my ($self) = @_; 3520 my ($self) = @_;
3028 3521
3029 $self->{current}->size_request 3522 $self->{current}->size_request
3030} 3523}
3031 3524
3032sub size_allocate { 3525sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3526 my ($self, $w, $h) = @_;
3034 3527
3035 $self->{current}->configure (0, 0, $w, $h); 3528 $self->{current}->configure (0, 0, $w, $h);
3529
3530 1
3036} 3531}
3037 3532
3038sub _draw { 3533sub _draw {
3039 my ($self) = @_; 3534 my ($self) = @_;
3040 3535
3041 $self->{current}->draw; 3536 $self->{current}->draw;
3042} 3537}
3043 3538
3044############################################################################# 3539#############################################################################
3045 3540
3046package CFClient::UI::Notebook; 3541package CFPlus::UI::Notebook;
3047 3542
3048our @ISA = CFClient::UI::VBox::; 3543our @ISA = CFPlus::UI::VBox::;
3049 3544
3050sub new { 3545sub new {
3051 my $class = shift; 3546 my $class = shift;
3052 3547
3053 my $self = $class->SUPER::new ( 3548 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar), 3549 buttonbar => (new CFPlus::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3550 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self 3551 # filter => # will be put between multiplexer and $self
3057 @_, 3552 @_,
3058 ); 3553 );
3059 3554
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3555 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3064} 3559}
3065 3560
3066sub add { 3561sub add {
3067 my ($self, $title, $widget, $tooltip) = @_; 3562 my ($self, $title, $widget, $tooltip) = @_;
3068 3563
3069 Scalar::Util::weaken $self; 3564 CFPlus::weaken $self;
3070 3565
3071 $self->{buttonbar}->add (new CFClient::UI::Button 3566 $self->{buttonbar}->add (new CFPlus::UI::Button
3072 markup => $title, 3567 markup => $title,
3073 tooltip => $tooltip, 3568 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) }, 3569 on_activate => sub { $self->set_current_page ($widget) },
3075 ); 3570 );
3076 3571
3077 $self->{multiplexer}->add ($widget); 3572 $self->{multiplexer}->add ($widget);
3078} 3573}
3079 3574
3575sub get_current_page {
3576 my ($self) = @_;
3577
3578 $self->{multiplexer}->get_current_page
3579}
3580
3080sub set_current_page { 3581sub set_current_page {
3081 my ($self, $page) = @_; 3582 my ($self, $page) = @_;
3082 3583
3083 $self->{multiplexer}->set_current_page ($page); 3584 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3585 $self->emit (page_changed => $self->{multiplexer}{current});
3085} 3586}
3086 3587
3087############################################################################# 3588#############################################################################
3088 3589
3590package CFPlus::UI::Selector;
3591
3592use utf8;
3593
3594our @ISA = CFPlus::UI::Button::;
3595
3596sub new {
3597 my $class = shift;
3598
3599 my $self = $class->SUPER::new (
3600 options => [], # [value, title, longdesc], ...
3601 value => undef,
3602 @_,
3603 );
3604
3605 $self->_set_value ($self->{value});
3606
3607 $self
3608}
3609
3610sub invoke_button_down {
3611 my ($self, $ev) = @_;
3612
3613 my @menu_items;
3614
3615 for (@{ $self->{options} }) {
3616 my ($value, $title, $tooltip) = @$_;
3617
3618 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3619 }
3620
3621 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3622}
3623
3624sub _set_value {
3625 my ($self, $value) = @_;
3626
3627 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3628 or return;
3629
3630 $self->{value} = $item->[0];
3631 $self->set_markup ("$item->[1] ⇓");
3632 $self->set_tooltip ($item->[2]);
3633}
3634
3635sub set_value {
3636 my ($self, $value) = @_;
3637
3638 return unless $self->{value} ne $value;
3639
3640 $self->_set_value ($value);
3641 $self->emit (changed => $value);
3642}
3643
3644#############################################################################
3645
3089package CFClient::UI::Statusbox; 3646package CFPlus::UI::Statusbox;
3090 3647
3091our @ISA = CFClient::UI::VBox::; 3648our @ISA = CFPlus::UI::VBox::;
3092 3649
3093sub new { 3650sub new {
3094 my $class = shift; 3651 my $class = shift;
3095 3652
3096 my $self = $class->SUPER::new ( 3653 my $self = $class->SUPER::new (
3097 fontsize => 0.8, 3654 fontsize => 0.8,
3098 @_, 3655 @_,
3099 ); 3656 );
3100 3657
3101 Scalar::Util::weaken (my $this = $self); 3658 CFPlus::weaken (my $this = $self);
3102 3659
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3660 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104 3661
3105 $self 3662 $self
3106} 3663}
… …
3108sub reorder { 3665sub reorder {
3109 my ($self) = @_; 3666 my ($self) = @_;
3110 my $NOW = Time::HiRes::time; 3667 my $NOW = Time::HiRes::time;
3111 3668
3112 # freeze display when hovering over any label 3669 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner} 3670 return if $CFPlus::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3671 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} }; 3672 values %{ $self->{item} };
3116 3673
3117 while (my ($k, $v) = each %{ $self->{item} }) { 3674 while (my ($k, $v) = each %{ $self->{item} }) {
3118 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3675 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3119 } 3676 }
… …
3140 for ($short) { 3697 for ($short) {
3141 s/^\s+//; 3698 s/^\s+//;
3142 s/\s+/ /g; 3699 s/\s+/ /g;
3143 } 3700 }
3144 3701
3145 new CFClient::UI::Label 3702 new CFPlus::UI::Label
3146 markup => $short, 3703 markup => $short,
3147 tooltip => $item->{tooltip}, 3704 tooltip => $item->{tooltip},
3148 tooltip_font => $::FONT_PROP, 3705 tooltip_font => $::FONT_PROP,
3149 tooltip_width => 0.67, 3706 tooltip_width => 0.67,
3150 fontsize => $item->{fontsize} || $self->{fontsize}, 3707 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3188 $item->{count}++; 3745 $item->{count}++;
3189 } else { 3746 } else {
3190 $item->{count} = 1; 3747 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3748 $item->{text} = $item->{tooltip} = $text;
3192 } 3749 }
3193 $item->{id} = ++$self->{id}; 3750 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3751 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3752 delete $item->{label};
3196 } else { 3753 } else {
3197 $self->{item}{$group} = { 3754 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3755 id => ++$self->{id},
… …
3204 count => 1, 3761 count => 1,
3205 %arg, 3762 %arg,
3206 }; 3763 };
3207 } 3764 }
3208 3765
3766 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3767 $self->reorder;
3768 });
3210} 3769}
3211 3770
3212sub reconfigure { 3771sub reconfigure {
3213 my ($self) = @_; 3772 my ($self) = @_;
3214 3773
… …
3217 3776
3218 $self->reorder; 3777 $self->reorder;
3219 $self->SUPER::reconfigure; 3778 $self->SUPER::reconfigure;
3220} 3779}
3221 3780
3222sub DESTROY { 3781sub destroy {
3223 my ($self) = @_; 3782 my ($self) = @_;
3224 3783
3225 $self->{timer}->cancel; 3784 $self->{timer}->cancel;
3226 3785
3227 $self->SUPER::DESTROY; 3786 $self->SUPER::destroy;
3228} 3787}
3229 3788
3230############################################################################# 3789#############################################################################
3231 3790
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; 3791package CFPlus::UI::Root;
3528 3792
3529our @ISA = CFClient::UI::Container::; 3793our @ISA = CFPlus::UI::Container::;
3530 3794
3531use List::Util qw(min max); 3795use List::Util qw(min max);
3532 3796
3533use CFClient::OpenGL; 3797use CFPlus::OpenGL;
3534 3798
3535sub new { 3799sub new {
3536 my $class = shift; 3800 my $class = shift;
3537 3801
3538 my $self = $class->SUPER::new ( 3802 my $self = $class->SUPER::new (
3539 visible => 1, 3803 visible => 1,
3540 @_, 3804 @_,
3541 ); 3805 );
3542 3806
3543 Scalar::Util::weaken ($self->{root} = $self); 3807 CFPlus::weaken ($self->{root} = $self);
3544 3808
3545 $self 3809 $self
3546} 3810}
3547 3811
3548sub size_request { 3812sub size_request {
… …
3563 $coord = $max - $size if $coord > $max - $size; 3827 $coord = $max - $size if $coord > $max - $size;
3564 3828
3565 int $coord + 0.5 3829 int $coord + 0.5
3566} 3830}
3567 3831
3568sub size_allocate { 3832sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3833 my ($self, $w, $h) = @_;
3570 3834
3571 for my $child ($self->children) { 3835 for my $child ($self->children) {
3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3836 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3573 3837
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 3841 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3842 $Y = _to_pixel $Y, $H, $self->{h};
3579 3843
3580 $child->configure ($X, $Y, $W, $H); 3844 $child->configure ($X, $Y, $W, $H);
3581 } 3845 }
3846
3847 1
3582} 3848}
3583 3849
3584sub coord2local { 3850sub coord2local {
3585 my ($self, $x, $y) = @_; 3851 my ($self, $x, $y) = @_;
3586 3852
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3978 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 3979
3714 $w = 0 if $w < 0; 3980 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 3981 $h = 0 if $h < 0;
3716 3982
3983 $w = max $widget->{min_w}, $w;
3984 $h = max $widget->{min_h}, $h;
3985
3986# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3987# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3988
3989 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3990 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3991
3717 $w = int $w + 0.5; 3992 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 3993 $h = int $h + 0.5;
3719 3994
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3995 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w}; 3996 $widget->{old_w} = $widget->{w};
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4019 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 4020 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 4021 glLoadIdentity;
3747 4022
3748 { 4023 {
3749 package CFClient::UI::Base; 4024 package CFPlus::UI::Base;
3750 4025
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 4026 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 4027 (0, 0, $self->{w}, $self->{h});
3753 }
3754 4028
3755 $self->_draw; 4029 $self->_draw;
4030 }
3756} 4031}
3757 4032
3758############################################################################# 4033#############################################################################
3759 4034
3760package CFClient::UI; 4035package CFPlus::UI;
3761 4036
3762$ROOT = new CFClient::UI::Root; 4037$ROOT = new CFPlus::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4038$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3764 4039
37651 40401
3766 4041

Diff Legend

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