ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.293 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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