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

Diff Legend

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