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

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

Diff Legend

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