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.394 by root, Sat Jul 21 13:54:03 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}
… …
593 my ($self) = @_; 646 my ($self) = @_;
594 647
595 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
596} 649}
597 650
651my $cntx;#d#
598sub DESTROY { 652sub DESTROY {
599 my ($self) = @_; 653 my ($self) = @_;
600 654
655 return if CFPlus::in_destruct;
656
657 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
601 delete $WIDGET{$self+0}; 660 delete $WIDGET{$self+0};
602 #$self->deactivate;
603} 661}
604 662
605############################################################################# 663#############################################################################
606 664
607package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
608 666
609our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
610 668
611use strict; 669use strict;
612use CFClient::OpenGL; 670use CFPlus::OpenGL;
613 671
614sub new { 672sub new {
615 my $class = shift; 673 my $class = shift;
616 674
617 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
648 } 706 }
649} 707}
650 708
651############################################################################# 709#############################################################################
652 710
653package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
654 712
655our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
656 714
657sub new { 715sub new {
658 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
659 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
660} 718}
… …
667 725
668sub draw { } 726sub draw { }
669 727
670############################################################################# 728#############################################################################
671 729
672package CFClient::UI::Container; 730package CFPlus::UI::Container;
673 731
674our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
675 733
676sub new { 734sub new {
677 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
678 736
679 my $children = delete $arg{children}; 737 my $children = delete $arg{children};
… …
683 can_events => 0, 741 can_events => 0,
684 %arg, 742 %arg,
685 ); 743 );
686 744
687 $self->add (@$children) 745 $self->add (@$children)
688 if $children; 746 if $children && @$children;
689 747
690 $self 748 $self
749}
750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
691} 757}
692 758
693sub add { 759sub add {
694 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
695 761
696 $_->set_parent ($self) 762 $_->set_parent ($self)
697 for @widgets; 763 for @widgets;
698 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
699 use sort 'stable'; 766 use sort 'stable';
700 767
701 $self->{children} = [ 768 $self->{children} = [
702 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
703 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
722} 789}
723 790
724sub clear { 791sub clear {
725 my ($self) = @_; 792 my ($self) = @_;
726 793
727 my $children = delete $self->{children}; 794 my $children = $self->{children};
728 $self->{children} = []; 795 $self->{children} = [];
729 796
730 for (@$children) { 797 for (@$children) {
731 delete $_->{parent}; 798 delete $_->{parent};
732 $_->hide; 799 $_->hide;
… …
757 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
758} 825}
759 826
760############################################################################# 827#############################################################################
761 828
762package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
763 830
764our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
765 832
766sub new { 833sub new {
767 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
768 835
769 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
770 837
771 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
772} 839}
773 840
774sub add { 841sub add {
775 my ($self, $child) = @_; 842 my ($self, $child) = @_;
776 843
777 $self->{children} = []; 844 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 845 $self->SUPER::add ($child);
780} 846}
781 847
782sub remove { 848sub remove {
783 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
784 850
785 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
786 852
787 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
788 unless @{$self->{children}}; 854 unless @{$self->{children}};
789} 855}
790 856
791sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
792 858
793sub size_request { 859sub size_request {
794 $_[0]{children}[0]->size_request 860 $_[0]{children}[0]->size_request
795} 861}
796 862
797sub size_allocate { 863sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 864 my ($self, $w, $h) = @_;
799 865
800 $self->{children}[0]->configure (0, 0, $w, $h); 866 $self->{children}[0]->configure (0, 0, $w, $h);
867
868 1
801} 869}
802 870
803############################################################################# 871#############################################################################
804 872
805# back-buffered drawing area 873# back-buffered drawing area
806 874
807package CFClient::UI::Window; 875package CFPlus::UI::Window;
808 876
809our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
810 878
811use CFClient::OpenGL; 879use CFPlus::OpenGL;
812 880
813sub new { 881sub new {
814 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
815 883
816 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
821 889
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 890 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 891 $self->SUPER::update;
824} 892}
825 893
826sub size_allocate { 894sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
828 896
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 897 $self->update;
898
899 $self->SUPER::invoke_size_allocate ($w, $h)
831} 900}
832 901
833sub _render { 902sub _render {
834 my ($self) = @_; 903 my ($self) = @_;
835 904
… …
837} 906}
838 907
839sub render_child { 908sub render_child {
840 my ($self) = @_; 909 my ($self) = @_;
841 910
842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
843 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
844 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
845 914
846 { 915 {
847 package CFClient::UI::Base; 916 package CFPlus::UI::Base;
848 917
849 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
851 } 922 }
852
853 $self->_render;
854 }; 923 };
855} 924}
856 925
857sub _draw { 926sub _draw {
858 my ($self) = @_; 927 my ($self) = @_;
859
860 my ($w, $h) = @$self{qw(w h)};
861 928
862 my $tex = $self->{texture} 929 my $tex = $self->{texture}
863 or return; 930 or return;
864 931
865 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
867 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
868 935
869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
870 937
871 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
872} 939}
873 940
874############################################################################# 941#############################################################################
875 942
876package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
877 944
945use List::Util qw(min max);
946
878our @ISA = CFClient::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
879 948
880sub new { 949sub new {
881 my $class = shift; 950 my $class = shift;
882 951
883 $class->SUPER::new ( 952 $class->SUPER::new (
… …
890sub size_request { 959sub size_request {
891 my ($self) = @_; 960 my ($self) = @_;
892 961
893 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
894 963
895 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
897 966
898 ($w, $h) 967 ($w, $h)
899} 968}
900 969
901sub size_allocate { 970sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 971 my ($self, $w, $h) = @_;
903 972
904 my $child = $self->child; 973 my $child = $self->child;
905 974
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 975 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 976 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 977
909 $self->child->configure (0, 0, $w, $h); 978 $self->child->configure (0, 0, $w, $h);
910 $self->update; 979 $self->update;
980
981 1
911} 982}
912 983
913sub set_offset { 984sub set_offset {
914 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
915 986
987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
916 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
917 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
918 993
994 $self->emit (changed => $x, $y);
919 $self->update; 995 $self->update;
996 }
920} 997}
921 998
922# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
923sub coord2local { 1000sub coord2local {
924 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
939 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
940 1017
941 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
942 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
943 ) { 1020 ) {
944 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
945 } else { 1022 } else {
946 $self->CFClient::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
947 } 1024 }
948} 1025}
949 1026
950sub _render { 1027sub _render {
951 my ($self) = @_; 1028 my ($self) = @_;
952 1029
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1030 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}; 1031 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
955 1032
956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1033 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
957 1034
958 $self->SUPER::_render; 1035 $self->SUPER::_render;
959} 1036}
960 1037
961############################################################################# 1038#############################################################################
962 1039
963package CFClient::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
964 1041
965our @ISA = CFClient::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
966 1043
967sub new { 1044sub new {
968 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
969 1046
970 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
971 1048
972 my $self; 1049 my $self;
973 1050
974 my $slider = new CFClient::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1054 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub {
1057 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 },
1060 ;
1061
1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
975 vertical => 1, 1065 vertical => 1,
976 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
977 on_changed => sub { 1067 on_changed => sub {
978 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
979 }, 1070 },
980 ; 1071 ;
981 1072
982 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
984 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
985 %arg, 1081 %arg,
986 ); 1082 );
987 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1087 expand => 1,
1088 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1098 ;
1099
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
989 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
990 1103
991 $self 1104 $self
992} 1105}
1106
1107#TODO# update range on size_allocate depending on child?
993 1108
994sub add { 1109sub add {
995 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
996 1111
997 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
998} 1113}
999 1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
1000sub update { 1141sub update {
1001 my ($self) = @_; 1142 my ($self) = @_;
1002 1143
1144 $self->update_slider;
1003 $self->SUPER::update; 1145 $self->SUPER::update;
1004
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008} 1146}
1009 1147
1148sub invoke_mouse_wheel {
1149 my ($self, $ev) = @_;
1150
1151 $self->{vslider}->emit (mouse_wheel => $ev)
1152 if $ev->{dy};
1153
1154 $self->{hslider}->emit (mouse_wheel => $ev)
1155 if $ev->{dx};
1156
1157 1
1158}
1159
1160sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_;
1162
1163 if ($ev->{button} == 2) {
1164 $self->grab_focus;
1165
1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1171
1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1175
1176 return 1;
1177 }
1178
1179 0
1180}
1181
1182sub invoke_button_up {
1183 my ($self, $ev, $x, $y) = @_;
1184
1185 if (delete $self->{motion}) {
1186 return 1;
1187 }
1188
1189 0
1190}
1191
1192sub invoke_mouse_motion {
1193 my ($self, $ev, $x, $y) = @_;
1194
1195 if ($self->{motion}) {
1196 $self->{motion}->($ev, $x, $y);
1197 return 1;
1198 }
1199
1200 0
1201}
1202
1010sub size_allocate { 1203sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1012 1205
1206 $self->update_slider;
1013 $self->SUPER::size_allocate ($w, $h); 1207 $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} 1208}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1209
1022############################################################################# 1210#############################################################################
1023 1211
1024package CFClient::UI::Frame; 1212package CFPlus::UI::Frame;
1025 1213
1026our @ISA = CFClient::UI::Bin::; 1214our @ISA = CFPlus::UI::Bin::;
1027 1215
1028use CFClient::OpenGL; 1216use CFPlus::OpenGL;
1029 1217
1030sub new { 1218sub new {
1031 my $class = shift; 1219 my $class = shift;
1032 1220
1033 $class->SUPER::new ( 1221 $class->SUPER::new (
… …
1059 $self->SUPER::_draw; 1247 $self->SUPER::_draw;
1060} 1248}
1061 1249
1062############################################################################# 1250#############################################################################
1063 1251
1064package CFClient::UI::FancyFrame; 1252package CFPlus::UI::FancyFrame;
1065 1253
1066our @ISA = CFClient::UI::Bin::; 1254our @ISA = CFPlus::UI::Bin::;
1067 1255
1068use CFClient::OpenGL; 1256use 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 1257
1078sub new { 1258sub new {
1079 my ($class, %arg) = @_; 1259 my ($class, %arg) = @_;
1080 1260
1081 my $title = delete $arg{title}; 1261 if ((exists $arg{label}) && !ref $arg{label}) {
1262 $arg{label} = new CFPlus::UI::Label
1263 align => 1,
1264 valign => 0,
1265 text => $arg{label},
1266 fontsize => ($arg{border} || 0.8) * 0.75;
1267 }
1268
1269 my $self = $class->SUPER::new (
1270 # label => "",
1271 fg => [0.6, 0.3, 0.1],
1272 border => 0.8,
1273 style => 'single',
1274 %arg,
1275 );
1276
1277 $self
1278}
1279
1280sub add {
1281 my ($self, @widgets) = @_;
1282
1283 $self->SUPER::add (@widgets);
1284 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1285}
1286
1287sub border {
1288 int $_[0]{border} * $::FONTSIZE
1289}
1290
1291sub size_request {
1292 my ($self) = @_;
1293
1294 ($self->{label_w}, undef) = $self->{label}->size_request
1295 if $self->{label};
1296
1297 my ($w, $h) = $self->SUPER::size_request;
1298
1299 (
1300 $w + $self->border * 2,
1301 $h + $self->border * 2,
1302 )
1303}
1304
1305sub invoke_size_allocate {
1306 my ($self, $w, $h) = @_;
1307
1308 my $border = $self->border;
1309
1310 $w -= List::Util::max 0, $border * 2;
1311 $h -= List::Util::max 0, $border * 2;
1312
1313 if (my $label = $self->{label}) {
1314 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1315 $label->{h} = List::Util::min $h, $border;
1316 $label->invoke_size_allocate ($label->{w}, $label->{h});
1317 }
1318
1319 $self->child->configure ($border, $border, $w, $h);
1320
1321 1
1322}
1323
1324sub _draw {
1325 my ($self) = @_;
1326
1327 my $child = $self->{children}[0];
1328
1329 my $border = $self->border;
1330 my ($w, $h) = ($self->{w}, $self->{h});
1331
1332 $child->draw;
1333
1334 glColor @{$self->{fg}};
1335 glBegin GL_LINE_STRIP;
1336 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1337 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1338 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1339 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1340 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1341 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1342 glEnd;
1343
1344 if ($self->{label}) {
1345 glTranslate $border * 2, 0;
1346 $self->{label}->_draw;
1347 }
1348}
1349
1350#############################################################################
1351
1352package CFPlus::UI::Toplevel;
1353
1354our @ISA = CFPlus::UI::Bin::;
1355
1356use CFPlus::OpenGL;
1357
1358my $bg =
1359 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1360 mipmap => 1, wrap => 1;
1361
1362my @border =
1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1364 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1369
1370sub new {
1371 my ($class, %arg) = @_;
1082 1372
1083 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1375 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1376 border => 0.6,
1087 can_events => 1, 1377 can_events => 1,
1088 min_w => 16, 1378 min_w => 64,
1089 min_h => 16, 1379 min_h => 32,
1090 %arg, 1380 %arg,
1091 ); 1381 );
1092 1382
1093 $self->{title} = new CFClient::UI::Label 1383 $self->{title_widget} = new CFPlus::UI::Label
1094 align => 0, 1384 align => 0,
1095 valign => 1, 1385 valign => 1,
1096 text => $title, 1386 text => $self->{title},
1097 fontsize => $self->{border} 1387 fontsize => $self->{border},
1098 if defined $title; 1388 if exists $self->{title};
1389
1390 if ($self->{has_close_button}) {
1391 $self->{close_button} =
1392 new CFPlus::UI::ImageButton
1393 path => 'x1_close.png',
1394 on_activate => sub { $self->emit ("delete") };
1395
1396 $self->CFPlus::UI::Container::add ($self->{close_button});
1397 }
1099 1398
1100 $self 1399 $self
1101} 1400}
1102 1401
1103sub add { 1402sub add {
1104 my ($self, @widgets) = @_; 1403 my ($self, @widgets) = @_;
1105 1404
1106 $self->SUPER::add (@widgets); 1405 $self->SUPER::add (@widgets);
1406 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1407 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1408}
1109 1409
1110sub border { 1410sub border {
1111 int $_[0]{border} * $::FONTSIZE 1411 int $_[0]{border} * $::FONTSIZE
1112} 1412}
1113 1413
1114sub size_request { 1414sub size_request {
1115 my ($self) = @_; 1415 my ($self) = @_;
1116 1416
1117 $self->{title}->size_request 1417 $self->{title_widget}->size_request
1118 if $self->{title}; 1418 if $self->{title_widget};
1419
1420 $self->{close_button}->size_request
1421 if $self->{close_button};
1119 1422
1120 my ($w, $h) = $self->SUPER::size_request; 1423 my ($w, $h) = $self->SUPER::size_request;
1121 1424
1122 ( 1425 (
1123 $w + $self->border * 2, 1426 $w + $self->border * 2,
1124 $h + $self->border * 2, 1427 $h + $self->border * 2,
1125 ) 1428 )
1126} 1429}
1127 1430
1128sub size_allocate { 1431sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1432 my ($self, $w, $h) = @_;
1130 1433
1131 if ($self->{title}) { 1434 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1435 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1436 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1437 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1438 }
1136 1439
1137 my $border = $self->border; 1440 my $border = $self->border;
1138 1441
1139 $h -= List::Util::max 0, $border * 2; 1442 $h -= List::Util::max 0, $border * 2;
1140 $w -= List::Util::max 0, $border * 2; 1443 $w -= List::Util::max 0, $border * 2;
1444
1445 $self->child->configure ($border, $border, $w, $h);
1446
1447 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1448 if $self->{close_button};
1449
1450 1
1451}
1452
1453sub invoke_delete {
1454 my ($self) = @_;
1455
1456 $self->hide;
1141 1457
1142 $self->child->configure ($border, $border, $w, $h); 1458 1
1143} 1459}
1144 1460
1145sub button_down { 1461sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1462 my ($self, $ev, $x, $y) = @_;
1147 1463
1148 my ($w, $h) = @$self{qw(w h)}; 1464 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1465 my $border = $self->border;
1150 1466
… …
1181 1497
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1498 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1499
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1500 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1501 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1502 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1503 };
1188 } else { 1504 } else {
1189 return 0; 1505 return 0;
1190 } 1506 }
1191 1507
1192 1 1508 1
1193} 1509}
1194 1510
1195sub button_up { 1511sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1512 my ($self, $ev, $x, $y) = @_;
1197 1513
1198 !!delete $self->{motion} 1514 ! ! delete $self->{motion}
1199} 1515}
1200 1516
1201sub mouse_motion { 1517sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1518 my ($self, $ev, $x, $y) = @_;
1203 1519
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1520 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1521
1206 !!$self->{motion} 1522 ! ! $self->{motion}
1523}
1524
1525sub invoke_visibility_change {
1526 my ($self, $visible) = @_;
1527
1528 delete $self->{motion} unless $visible;
1529
1530 0
1207} 1531}
1208 1532
1209sub _draw { 1533sub _draw {
1210 my ($self) = @_; 1534 my ($self) = @_;
1211 1535
… …
1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1219 1543
1220 my $border = $self->border; 1544 my $border = $self->border;
1221 1545
1222 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1223 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1550 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1551
1552 # move
1553 my $w2 = ($w - $border) * .5;
1554 my $h2 = ($h - $border) * .5;
1555 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1557 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1558
1559 # resize
1560 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1562 unless $self->{has_close_button};
1563 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1227 1565
1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1229 glColor @{ $self->{bg} }; 1567 glColor @{ $self->{bg} };
1230 1568
1231 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
… …
1237 1575
1238 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1239 1577
1240 $child->draw; 1578 $child->draw;
1241 1579
1242 if ($self->{title}) { 1580 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1581 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1582 $self->{title_widget}->_draw;
1583
1584 glTranslate 0, - ($border - $self->{h});
1245 } 1585 }
1586
1587 $self->{close_button}->draw
1588 if $self->{close_button};
1246} 1589}
1247 1590
1248############################################################################# 1591#############################################################################
1249 1592
1250package CFClient::UI::Table; 1593package CFPlus::UI::Table;
1251 1594
1252our @ISA = CFClient::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1253 1596
1254use List::Util qw(max sum); 1597use List::Util qw(max sum);
1255 1598
1256use CFClient::OpenGL; 1599use CFPlus::OpenGL;
1257 1600
1258sub new { 1601sub new {
1259 my $class = shift; 1602 my $class = shift;
1260 1603
1261 $class->SUPER::new ( 1604 $class->SUPER::new (
1262 col_expand => [], 1605 col_expand => [],
1606 row_expand => [],
1263 @_, 1607 @_,
1264 ) 1608 )
1265} 1609}
1266 1610
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1269}
1270
1271sub add { 1611sub 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) = @_; 1612 my ($self, @widgets) = @_;
1613
1614 for my $child (@widgets) {
1615 $child->{rowspan} ||= 1;
1616 $child->{colspan} ||= 1;
1617 }
1618
1619 $self->SUPER::add (@widgets);
1620}
1621
1622sub add_at {
1623 my $self = shift;
1624
1625 my @widgets;
1626
1627 while (@_) {
1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1629
1630 $child->{row} = $row;
1631 $child->{col} = $col;
1632
1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1640 my ($self) = @_;
1641
1642 my (@w, @h);
1283 1643
1284 my @children = $self->children; 1644 my @children = $self->children;
1285 delete $self->{children}; 1645
1646 # first pass, columns
1647 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1648 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1649
1650 my $sw = sum @w[$c .. $c + $cs - 1];
1651
1652 if ($w > $sw) {
1653 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1654 }
1286 1655 }
1287 for (@children) {
1288 delete $_->{parent};
1289 $_->hide;
1290 }
1291 1656
1292 $self->realloc; 1657 # second pass, rows
1293} 1658 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)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1308 1660
1309 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1310 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1311 } 1665 }
1312 } 1666 }
1313 1667
1314 (\@w, \@h) 1668 (\@w, \@h)
1315} 1669}
… …
1323 (sum @$ws), 1677 (sum @$ws),
1324 (sum @$hs), 1678 (sum @$hs),
1325 ) 1679 )
1326} 1680}
1327 1681
1328sub size_allocate { 1682sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1683 my ($self, $w, $h) = @_;
1330 1684
1331 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1332 1686
1333 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1334 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1335 1689
1336 # TODO: nicer code && do row_expand 1690 # now linearly scale the rows/columns to the allocated size
1337 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1338 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1339 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1340 1694
1341 # linearly scale sizes
1342 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1343 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1344 1696
1345 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1346 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1347 1706
1348 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1349 1709
1350 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1351 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1352 or next;
1353 1712
1354 my $x = 0; 1713 $widget->configure (
1355 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1356 1716 );
1357 for my $c (0 .. $#$row) { 1717 }
1358 my $col_w = $ws->[$c];
1359 1718
1360 if (my $widget = $row->[$c]) { 1719 1
1361 $widget->configure ($x, $y, $col_w, $row_h); 1720}
1362 }
1363 1721
1364 $x += $col_w; 1722#############################################################################
1723
1724package CFPlus::UI::Fixed;
1725
1726use List::Util qw(min max);
1727
1728our @ISA = CFPlus::UI::Container::;
1729
1730sub add {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child);
1735}
1736
1737sub _scale($$$) {
1738 my ($mode, $val, $max) = @_;
1739
1740 $mode eq "abs" ? $val
1741 : $mode eq "rel" ? $val * $max
1742 : 0
1743}
1744
1745sub size_request {
1746 my ($self) = @_;
1747
1748 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1749
1750 # determine overall size by querying abs widgets
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 if ($pos eq "abs") {
1755 $w = _scale $size, $w, $child->{req_w};
1756 $h = _scale $size, $h, $child->{req_h};
1757
1758 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1759 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1365 } 1760 }
1366
1367 $y += $row_h;
1368 } 1761 }
1369 1762
1370} 1763 my $W = $x2 - $x1;
1764 my $H = $y2 - $y1;
1371 1765
1372sub find_widget { 1766 # now layout remaining widgets
1767 for my $child ($self->visible_children) {
1768 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1769
1770 if ($pos ne "abs") {
1771 $x = _scale $pos, $x, $W;
1772 $y = _scale $pos, $x, $H;
1773 $w = _scale $size, $w, $child->{req_w};
1774 $h = _scale $size, $h, $child->{req_h};
1775
1776 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1777 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1778 }
1779 }
1780
1781 my $W = $x2 - $x1;
1782 my $H = $y2 - $y1;
1783
1784 ($W, $H)
1785}
1786
1787sub invoke_size_allocate {
1373 my ($self, $x, $y) = @_; 1788 my ($self, $W, $H) = @_;
1374 1789
1375 $x -= $self->{x}; 1790 for my $child ($self->visible_children) {
1376 $y -= $self->{y}; 1791 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1377 1792
1378 my $res; 1793 $x = _scale $pos, $x, $W;
1794 $y = _scale $pos, $x, $H;
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1379 1797
1380 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1798 $child->configure ($x, $y, $w, $h);
1381 $res = $_->find_widget ($x, $y) 1799 }
1382 and return $res; 1800
1383 } 1801 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} 1802}
1395 1803
1396############################################################################# 1804#############################################################################
1397 1805
1398package CFClient::UI::Box; 1806package CFPlus::UI::Box;
1399 1807
1400our @ISA = CFClient::UI::Container::; 1808our @ISA = CFPlus::UI::Container::;
1401 1809
1402sub size_request { 1810sub size_request {
1403 my ($self) = @_; 1811 my ($self) = @_;
1404 1812
1405 $self->{vertical} 1813 $self->{vertical}
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1819 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1820 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1821 )
1414} 1822}
1415 1823
1416sub size_allocate { 1824sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1825 my ($self, $w, $h) = @_;
1418 1826
1419 my $space = $self->{vertical} ? $h : $w; 1827 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1828 my @children = $self->visible_children;
1421 1829
1422 my @req; 1830 my @req;
1423 1831
1424 if ($self->{homogeneous}) { 1832 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1833 @req = ($space / (@children || 1)) x @children;
1426 } else { 1834 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1835 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1836 my $req = List::Util::sum @req;
1429 1837
1430 if ($req > $space) { 1838 if ($req > $space) {
1431 # ah well, not enough space 1839 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1840 $_ *= $space / $req for @req;
1433 } else { 1841 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1842 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1843
1436 $space = ($space - $req) / $expand; # remaining space to give away 1844 $space = ($space - $req) / $expand; # remaining space to give away
1437 1845
1438 $req[$_] += $space * $children->[$_]{expand} 1846 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1847 for 0 .. $#children;
1440 } 1848 }
1441 } 1849 }
1442 1850
1443 CFClient::UI::harmonize \@req; 1851 CFPlus::UI::harmonize \@req;
1444 1852
1445 my $pos = 0; 1853 my $pos = 0;
1446 for (0 .. $#$children) { 1854 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1855 my $alloc = $req[$_];
1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1856 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1449 1857
1450 $pos += $alloc; 1858 $pos += $alloc;
1451 } 1859 }
1452 1860
1453 1 1861 1
1454} 1862}
1455 1863
1456############################################################################# 1864#############################################################################
1457 1865
1458package CFClient::UI::HBox; 1866package CFPlus::UI::HBox;
1459 1867
1460our @ISA = CFClient::UI::Box::; 1868our @ISA = CFPlus::UI::Box::;
1461 1869
1462sub new { 1870sub new {
1463 my $class = shift; 1871 my $class = shift;
1464 1872
1465 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1468 ) 1876 )
1469} 1877}
1470 1878
1471############################################################################# 1879#############################################################################
1472 1880
1473package CFClient::UI::VBox; 1881package CFPlus::UI::VBox;
1474 1882
1475our @ISA = CFClient::UI::Box::; 1883our @ISA = CFPlus::UI::Box::;
1476 1884
1477sub new { 1885sub new {
1478 my $class = shift; 1886 my $class = shift;
1479 1887
1480 $class->SUPER::new ( 1888 $class->SUPER::new (
… …
1483 ) 1891 )
1484} 1892}
1485 1893
1486############################################################################# 1894#############################################################################
1487 1895
1488package CFClient::UI::Label; 1896package CFPlus::UI::Label;
1489 1897
1490our @ISA = CFClient::UI::DrawBG::; 1898our @ISA = CFPlus::UI::DrawBG::;
1491 1899
1492use CFClient::OpenGL; 1900use CFPlus::OpenGL;
1493 1901
1494sub new { 1902sub new {
1495 my ($class, %arg) = @_; 1903 my ($class, %arg) = @_;
1496 1904
1497 my $self = $class->SUPER::new ( 1905 my $self = $class->SUPER::new (
… …
1500 #active_bg => none 1908 #active_bg => none
1501 #font => default_font 1909 #font => default_font
1502 #text => initial text 1910 #text => initial text
1503 #markup => initial narkup 1911 #markup => initial narkup
1504 #max_w => maximum pixel width 1912 #max_w => maximum pixel width
1913 #style => 0, # render flags
1505 ellipsise => 3, # end 1914 ellipsise => 3, # end
1506 layout => (new CFClient::Layout), 1915 layout => (new CFPlus::Layout),
1507 fontsize => 1, 1916 fontsize => 1,
1508 align => -1, 1917 align => -1,
1509 valign => -1, 1918 valign => -1,
1510 padding_x => 2, 1919 padding_x => 2,
1511 padding_y => 2, 1920 padding_y => 2,
1512 can_events => 0, 1921 can_events => 0,
1513 %arg 1922 %arg
1514 ); 1923 );
1515 1924
1516 if (exists $self->{template}) { 1925 if (exists $self->{template}) {
1517 my $layout = new CFClient::Layout; 1926 my $layout = new CFPlus::Layout;
1518 $layout->set_text (delete $self->{template}); 1927 $layout->set_text (delete $self->{template});
1519 $self->{template} = $layout; 1928 $self->{template} = $layout;
1520 } 1929 }
1521 1930
1522 if (exists $self->{markup}) { 1931 if (exists $self->{markup}) {
… …
1526 } 1935 }
1527 1936
1528 $self 1937 $self
1529} 1938}
1530 1939
1531sub escape($) {
1532 local $_ = $_[0];
1533
1534 s/&/&amp;/g;
1535 s/>/&gt;/g;
1536 s/</&lt;/g;
1537
1538 $_
1539}
1540
1541sub update { 1940sub update {
1542 my ($self) = @_; 1941 my ($self) = @_;
1543 1942
1544 delete $self->{texture}; 1943 delete $self->{texture};
1545 $self->SUPER::update; 1944 $self->SUPER::update;
… …
1556 my ($self, $text) = @_; 1955 my ($self, $text) = @_;
1557 1956
1558 return if $self->{text} eq "T$text"; 1957 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1958 $self->{text} = "T$text";
1560 1959
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1960 $self->{layout}->set_text ($text);
1563 1961
1564 delete $self->{req_h}; 1962 delete $self->{size_req};
1565 $self->realloc; 1963 $self->realloc;
1566 $self->update; 1964 $self->update;
1567} 1965}
1568 1966
1569sub set_markup { 1967sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1970 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1971 $self->{text} = "M$markup";
1574 1972
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1973 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1974
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1975 $self->{layout}->set_markup ($markup);
1579 1976
1580 delete $self->{req_h}; 1977 delete $self->{size_req};
1581 $self->realloc; 1978 $self->realloc;
1582 $self->update; 1979 $self->update;
1583} 1980}
1584 1981
1585sub size_request { 1982sub size_request {
1586 my ($self) = @_; 1983 my ($self) = @_;
1587 1984
1588 if (exists $self->{req_h}) { 1985 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1986 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1987 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1988 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1989 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1991
1597 my ($w, $h) = $self->{layout}->size; 1992 my ($w, $h) = $self->{layout}->size;
1598 1993
1599 if (exists $self->{template}) { 1994 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font}; 1995 $self->{template}->set_font ($self->{font}) if $self->{font};
1996 $self->{template}->set_width ($self->{max_w} || -1);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1998
1603 my ($w2, $h2) = $self->{template}->size; 1999 my ($w2, $h2) = $self->{template}->size;
1604 2000
1605 $w = List::Util::max $w, $w2; 2001 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 2002 $h = List::Util::max $h, $h2;
1607 } 2003 }
1608 2004
1609 ($w, $h) 2005 [$w, $h]
1610 } 2006 };
1611}
1612 2007
2008 @{ $self->{size_req} }
2009}
2010
2011sub baseline_shift {
2012 $_[0]{layout}->descent
2013}
2014
1613sub size_allocate { 2015sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 2016 my ($self, $w, $h) = @_;
1615 2017
1616 delete $self->{ox}; 2018 delete $self->{ox};
1617 2019
1618 delete $self->{texture} 2020 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2021 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2022
2023 1
1620} 2024}
1621 2025
1622sub set_fontsize { 2026sub set_fontsize {
1623 my ($self, $fontsize) = @_; 2027 my ($self, $fontsize) = @_;
1624 2028
1625 $self->{fontsize} = $fontsize; 2029 $self->{fontsize} = $fontsize;
2030 delete $self->{size_req};
1626 delete $self->{texture}; 2031 delete $self->{texture};
1627 2032
1628 $self->realloc; 2033 $self->realloc;
1629} 2034}
1630 2035
2036sub reconfigure {
2037 my ($self) = @_;
2038
2039 delete $self->{size_req};
2040 delete $self->{texture};
2041
2042 $self->SUPER::reconfigure;
2043}
2044
1631sub _draw { 2045sub _draw {
1632 my ($self) = @_; 2046 my ($self) = @_;
1633 2047
1634 $self->SUPER::_draw; # draw background, if applicable 2048 $self->SUPER::_draw; # draw background, if applicable
1635 2049
1636 my $tex = $self->{texture} ||= do { 2050 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 2051 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2052 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 2053 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2054 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2055 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2056 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 2057
1644 new_from_layout CFClient::Texture $self->{layout} 2058 [$self->{layout}->size]
1645 }; 2059 };
1646 2060
1647 unless (exists $self->{ox}) { 2061 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2062 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2063 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 2064 : ($self->{w} - $size->[0]) * 0.5);
1651 2065
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2066 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2067 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 2068 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 2069 };
1656 2070
1657 glEnable GL_TEXTURE_2D; 2071 my $w = List::Util::min $self->{w} + 4, $size->[0];
2072 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 2073
1659 if ($tex->{format} == GL_ALPHA) { 2074 $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} 2075}
1670 2076
1671############################################################################# 2077#############################################################################
1672 2078
1673package CFClient::UI::EntryBase; 2079package CFPlus::UI::EntryBase;
1674 2080
1675our @ISA = CFClient::UI::Label::; 2081our @ISA = CFPlus::UI::Label::;
1676 2082
1677use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1678 2084
1679sub new { 2085sub new {
1680 my $class = shift; 2086 my $class = shift;
1681 2087
1682 $class->SUPER::new ( 2088 $class->SUPER::new (
… …
1686 active_fg => [0, 0, 0], 2092 active_fg => [0, 0, 0],
1687 can_hover => 1, 2093 can_hover => 1,
1688 can_focus => 1, 2094 can_focus => 1,
1689 valign => 0, 2095 valign => 0,
1690 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1691 #text => ... 2098 #text => ...
2099 #hidden => "*",
1692 @_ 2100 @_
1693 ) 2101 )
1694} 2102}
1695 2103
1696sub _set_text { 2104sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 2111 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 2112 $self->{text} = $text;
1705 2113
1706 $text =~ s/./*/g if $self->{hidden}; 2114 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 2115 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 2116 delete $self->{size_req};
1709 2117
1710 $self->_emit (changed => $self->{text}); 2118 $self->emit (changed => $self->{text});
1711 2119
1712 $self->realloc; 2120 $self->realloc;
1713 $self->update; 2121 $self->update;
1714} 2122}
1715 2123
… …
1730 my ($w, $h) = $self->SUPER::size_request; 2138 my ($w, $h) = $self->SUPER::size_request;
1731 2139
1732 ($w + 1, $h) # add 1 for cursor 2140 ($w + 1, $h) # add 1 for cursor
1733} 2141}
1734 2142
1735sub key_down { 2143sub invoke_key_down {
1736 my ($self, $ev) = @_; 2144 my ($self, $ev) = @_;
1737 2145
1738 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1741 2149
1742 my $text = $self->get_text; 2150 my $text = $self->get_text;
2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1743 2153
1744 if ($uni == 8) { 2154 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
2174 } elsif ($uni == 21) { # ctrl-u
2175 $text = "";
1753 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 2178 $self->emit ('escape');
1758 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 2183 } else {
1761 return 0; 2184 return 0;
1762 } 2185 }
1763 2186
1764 $self->_set_text ($text); 2187 $self->_set_text ($text);
1765 2188
1766 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1767 2191
1768 1 2192 1
1769} 2193}
1770 2194
1771sub focus_in { 2195sub invoke_focus_in {
1772 my ($self) = @_; 2196 my ($self) = @_;
1773 2197
1774 $self->{last_activity} = $::NOW; 2198 $self->{last_activity} = $::NOW;
1775 2199
1776 $self->SUPER::focus_in; 2200 $self->SUPER::invoke_focus_in
1777} 2201}
1778 2202
1779sub button_down { 2203sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 2204 my ($self, $ev, $x, $y) = @_;
1781 2205
1782 $self->SUPER::button_down ($ev, $x, $y); 2206 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 2207
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 2208 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 2209
1786 # byte-index to char-index 2210 # byte-index to char-index
1787 my $text = $self->{text}; 2211 my $text = $self->{text};
1788 utf8::encode $text; 2212 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 2213 $self->{cursor} = length $text;
1790 2214
1791 $self->_set_text ($self->{text}); 2215 $self->_set_text ($self->{text});
1792 $self->update; 2216 $self->update;
1793 2217
1794 1 2218 1
1795} 2219}
1796 2220
1797sub mouse_motion { 2221sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2223# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 2224
1801 0 2225 1
1802} 2226}
1803 2227
1804sub _draw { 2228sub _draw {
1805 my ($self) = @_; 2229 my ($self) = @_;
1806 2230
… …
1833 utf8::encode $text; 2257 utf8::encode $text;
1834 2258
1835 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1836 } 2260 }
1837 2261
1838 glColor @{$self->{fg}};
1839 glBegin GL_LINES; 2262 glBegin GL_LINES;
1840 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2263 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}; 2264 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1842 glEnd; 2265 glEnd;
1843 } 2266 }
1844} 2267}
1845 2268
2269#############################################################################
2270
1846package CFClient::UI::Entry; 2271package CFPlus::UI::Entry;
1847 2272
1848our @ISA = CFClient::UI::EntryBase::; 2273our @ISA = CFPlus::UI::EntryBase::;
1849 2274
1850use CFClient::OpenGL; 2275use CFPlus::OpenGL;
1851 2276
1852sub key_down { 2277sub invoke_key_down {
1853 my ($self, $ev) = @_; 2278 my ($self, $ev) = @_;
1854 2279
1855 my $sym = $ev->{sym}; 2280 my $sym = $ev->{sym};
1856 2281
1857 if ($sym == 13) { 2282 if ($ev->{uni} == 0x0d || $sym == 13) {
1858 unshift @{$self->{history}}, 2283 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 2284 my $txt = $self->get_text;
2285
1860 $self->{history_pointer} = -1; 2286 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 2287 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 2288 $self->emit (activate => $txt);
1863 $self->update; 2289 $self->update;
1864 2290
1865 } elsif ($sym == CFClient::SDLK_UP) { 2291 } elsif ($sym == CFPlus::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 2292 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 2293 $self->{history_saveback} = $self->get_text;
1868 } 2294 }
1869 if (@{$self->{history} || []} > 0) { 2295 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 2296 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 2298 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 2299 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2300 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 2301 }
1876 2302
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 2303 } elsif ($sym == CFPlus::SDLK_DOWN) {
1878 $self->{history_pointer}--; 2304 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2305 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 2306
1881 if ($self->{history_pointer} >= 0) { 2307 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2308 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 2309 } else {
1884 $self->set_text ($self->{history_saveback}); 2310 $self->set_text ($self->{history_saveback});
1885 } 2311 }
1886 2312
1887 } else { 2313 } else {
1888 return $self->SUPER::key_down ($ev) 2314 return $self->SUPER::invoke_key_down ($ev)
1889 } 2315 }
1890 2316
1891 1 2317 1
1892} 2318}
1893 2319
1894############################################################################# 2320#############################################################################
1895 2321
2322package CFPlus::UI::TextEdit;
2323
2324our @ISA = CFPlus::UI::EntryBase::;
2325
2326use CFPlus::OpenGL;
2327
2328sub move_cursor_ver {
2329 my ($self, $dy) = @_;
2330
2331 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2332
2333 $y += $dy;
2334
2335 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2336 $self->{cursor} = $index;
2337 delete $self->{cur_h};
2338 $self->update;
2339 return;
2340 }
2341}
2342
2343sub invoke_key_down {
2344 my ($self, $ev) = @_;
2345
2346 my $sym = $ev->{sym};
2347
2348 if ($sym == CFPlus::SDLK_UP) {
2349 $self->move_cursor_ver (-1);
2350 } elsif ($sym == CFPlus::SDLK_DOWN) {
2351 $self->move_cursor_ver (+1);
2352 } else {
2353 return $self->SUPER::invoke_key_down ($ev)
2354 }
2355
2356 1
2357}
2358
2359#############################################################################
2360
1896package CFClient::UI::Button; 2361package CFPlus::UI::Button;
1897 2362
1898our @ISA = CFClient::UI::Label::; 2363our @ISA = CFPlus::UI::Label::;
1899 2364
1900use CFClient::OpenGL; 2365use CFPlus::OpenGL;
1901 2366
1902my @tex = 2367my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
1905 2370
1906sub new { 2371sub new {
1907 my $class = shift; 2372 my $class = shift;
1908 2373
1909 $class->SUPER::new ( 2374 $class->SUPER::new (
1910 padding_x => 4, 2375 padding_x => 4,
1911 padding_y => 4, 2376 padding_y => 4,
1912 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
1913 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
1914 can_hover => 1, 2379 can_hover => 1,
1915 align => 0, 2380 align => 0,
1916 valign => 0, 2381 valign => 0,
1917 can_events => 1, 2382 can_events => 1,
1918 @_ 2383 @_
1919 ) 2384 )
1920} 2385}
1921 2386
1922sub activate { }
1923
1924sub button_up { 2387sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2388 my ($self, $ev, $x, $y) = @_;
1926 2389
1927 $self->emit ("activate") 2390 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2391 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2392 && $y >= 0 && $y < $self->{h};
… …
1938 2401
1939 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1941 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
1942 2405
2406 my $tex = $tex[$GRAB == $self];
1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944 2408
1945 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
1946 2410
1947 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
1948} 2412}
1949 2413
1950############################################################################# 2414#############################################################################
1951 2415
1952package CFClient::UI::CheckBox; 2416package CFPlus::UI::CheckBox;
1953 2417
1954our @ISA = CFClient::UI::DrawBG::; 2418our @ISA = CFPlus::UI::DrawBG::;
1955 2419
1956my @tex = 2420my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2422 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2423
1960use CFClient::OpenGL; 2424use CFPlus::OpenGL;
1961 2425
1962sub new { 2426sub new {
1963 my $class = shift; 2427 my $class = shift;
1964 2428
1965 $class->SUPER::new ( 2429 $class->SUPER::new (
… …
1979 my ($self) = @_; 2443 my ($self) = @_;
1980 2444
1981 (6) x 2 2445 (6) x 2
1982} 2446}
1983 2447
2448sub toggle {
2449 my ($self) = @_;
2450
2451 $self->{state} = !$self->{state};
2452 $self->emit (changed => $self->{state});
2453 $self->update;
2454}
2455
1984sub button_down { 2456sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2457 my ($self, $ev, $x, $y) = @_;
1986 2458
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2459 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2460 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2461 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2462 } else {
1992 return 0 2463 return 0
1993 } 2464 }
1994 2465
1995 1 2466 1
… …
2015 glDisable GL_TEXTURE_2D; 2486 glDisable GL_TEXTURE_2D;
2016} 2487}
2017 2488
2018############################################################################# 2489#############################################################################
2019 2490
2020package CFClient::UI::Image; 2491package CFPlus::UI::Image;
2021 2492
2022our @ISA = CFClient::UI::Base::; 2493our @ISA = CFPlus::UI::Base::;
2023 2494
2024use CFClient::OpenGL; 2495use CFPlus::OpenGL;
2025use Carp qw/confess/;
2026 2496
2027our %loaded_images; 2497our %texture_cache;
2028 2498
2029sub new { 2499sub new {
2030 my $class = shift; 2500 my $class = shift;
2031 2501
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2502 my $self = $class->SUPER::new (
2503 can_events => 0,
2504 @_,
2505 );
2033 2506
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2507 $self->{path} || $self->{tex}
2508 or Carp::croak "'path' or 'tex' attributes required";
2035 2509
2036 $loaded_images{$self->{image}} ||= 2510 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2511 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2038 2512
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2513 CFPlus::weaken $texture_cache{$self->{path}};
2040 2514
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2515 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2516
2045 $self 2517 $self
2046} 2518}
2047 2519
2520sub STORABLE_freeze {
2521 my ($self, $cloning) = @_;
2522
2523 $self->{path}
2524 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2525
2526 $self->{path}
2527}
2528
2529sub STORABLE_attach {
2530 my ($self, $cloning, $path) = @_;
2531
2532 $self->new (path => $path)
2533}
2534
2048sub size_request { 2535sub size_request {
2049 my ($self) = @_; 2536 my ($self) = @_;
2050 2537
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2538 ($self->{tex}{w}, $self->{tex}{h})
2052} 2539}
2053 2540
2054sub _draw { 2541sub _draw {
2055 my ($self) = @_; 2542 my ($self) = @_;
2056 2543
… …
2066 } 2553 }
2067 2554
2068 glEnable GL_TEXTURE_2D; 2555 glEnable GL_TEXTURE_2D;
2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2070 2557
2071 $tex->draw_quad_alpha (0, 0, $w, $h); 2558 $tex->draw_quad (0, 0, $w, $h);
2072 2559
2073 glDisable GL_TEXTURE_2D; 2560 glDisable GL_TEXTURE_2D;
2074} 2561}
2075 2562
2076############################################################################# 2563#############################################################################
2077 2564
2565package CFPlus::UI::ImageButton;
2566
2567our @ISA = CFPlus::UI::Image::;
2568
2569use CFPlus::OpenGL;
2570
2571my %textures;
2572
2573sub new {
2574 my $class = shift;
2575
2576 my $self = $class->SUPER::new (
2577 padding_x => 4,
2578 padding_y => 4,
2579 fg => [1, 1, 1],
2580 active_fg => [0, 0, 1],
2581 can_hover => 1,
2582 align => 0,
2583 valign => 0,
2584 can_events => 1,
2585 @_
2586 );
2587}
2588
2589sub invoke_button_up {
2590 my ($self, $ev, $x, $y) = @_;
2591
2592 $self->emit ("activate")
2593 if $x >= 0 && $x < $self->{w}
2594 && $y >= 0 && $y < $self->{h};
2595
2596 1
2597}
2598
2599#############################################################################
2600
2078package CFClient::UI::VGauge; 2601package CFPlus::UI::VGauge;
2079 2602
2080our @ISA = CFClient::UI::Base::; 2603our @ISA = CFPlus::UI::Base::;
2081 2604
2082use List::Util qw(min max); 2605use List::Util qw(min max);
2083 2606
2084use CFClient::OpenGL; 2607use CFPlus::OpenGL;
2085 2608
2086my %tex = ( 2609my %tex = (
2087 food => [ 2610 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2612 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2613 ],
2091 grace => [ 2614 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2615 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/ 2616 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2094 ], 2617 ],
2095 hp => [ 2618 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2619 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2620 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2621 ],
2099 mana => [ 2622 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2623 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/ 2624 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2102 ], 2625 ],
2103); 2626);
2104 2627
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2628# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2688 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2689 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2690
2168 my $h1 = $self->{h} * (1 - $ycut1); 2691 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2692 my $h2 = $self->{h} * (1 - $ycut2);
2693 my $h3 = $self->{h};
2694
2695 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2696
2171 glEnable GL_BLEND; 2697 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2698 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2699 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2700 glEnable GL_TEXTURE_2D;
… …
2193 2719
2194 if ($t3) { 2720 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2721 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2722 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2723 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2724 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2725 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2726 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2727 glEnd;
2202 } 2728 }
2203 2729
2204 glDisable GL_BLEND; 2730 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2731 glDisable GL_TEXTURE_2D;
2206} 2732}
2207 2733
2208############################################################################# 2734#############################################################################
2209 2735
2210package CFClient::UI::Gauge; 2736package CFPlus::UI::Gauge;
2211 2737
2212our @ISA = CFClient::UI::VBox::; 2738our @ISA = CFPlus::UI::VBox::;
2213 2739
2214sub new { 2740sub new {
2215 my ($class, %arg) = @_; 2741 my ($class, %arg) = @_;
2216 2742
2217 my $self = $class->SUPER::new ( 2743 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2745 can_hover => 1,
2220 can_events => 1, 2746 can_events => 1,
2221 %arg, 2747 %arg,
2222 ); 2748 );
2223 2749
2224 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2750 $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); 2751 $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"); 2752 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2227 2753
2228 $self 2754 $self
2229} 2755}
2230 2756
2231sub set_fontsize { 2757sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2778 $self->{value}->set_text ($val);
2253} 2779}
2254 2780
2255############################################################################# 2781#############################################################################
2256 2782
2257package CFClient::UI::Slider; 2783package CFPlus::UI::Slider;
2258 2784
2259use strict; 2785use strict;
2260 2786
2261use CFClient::OpenGL; 2787use CFPlus::OpenGL;
2262 2788
2263our @ISA = CFClient::UI::DrawBG::; 2789our @ISA = CFPlus::UI::DrawBG::;
2264 2790
2265my @tex = 2791my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2792 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 2793 qw(s1_slider.png s1_slider_bg.png);
2268 2794
2269sub new { 2795sub new {
2270 my $class = shift; 2796 my $class = shift;
2271 2797
… …
2292 $self->update; 2818 $self->update;
2293 2819
2294 $self 2820 $self
2295} 2821}
2296 2822
2297sub changed { }
2298
2299sub set_range { 2823sub set_range {
2300 my ($self, $range) = @_; 2824 my ($self, $range) = @_;
2301 2825
2302 ($range, $self->{range}) = ($self->{range}, $range); 2826 ($range, $self->{range}) = ($self->{range}, $range);
2303 2827
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2828 if ("@$range" ne "@{$self->{range}}") {
2829 $self->update;
2830 $self->set_value ($self->{range}[0]);
2831 }
2306} 2832}
2307 2833
2308sub set_value { 2834sub set_value {
2309 my ($self, $value) = @_; 2835 my ($self, $value) = @_;
2310 2836
… …
2321 if $unit; 2847 if $unit;
2322 2848
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2849 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2850
2325 if ($value != $old_value) { 2851 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2852 $self->emit (changed => $value);
2327 $self->update; 2853 $self->update;
2328 } 2854 }
2329} 2855}
2330 2856
2331sub size_request { 2857sub size_request {
2332 my ($self) = @_; 2858 my ($self) = @_;
2333 2859
2334 ($self->{req_w}, $self->{req_h}) 2860 ($self->{req_w}, $self->{req_h})
2335} 2861}
2336 2862
2337sub button_down { 2863sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2339 2865
2340 $self->SUPER::button_down ($ev, $x, $y); 2866 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2867
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2868 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2869
2344 $self->mouse_motion ($ev, $x, $y) 2870 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2871}
2346 2872
2347sub mouse_motion { 2873sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2874 my ($self, $ev, $x, $y) = @_;
2349 2875
2350 if ($GRAB == $self) { 2876 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2877 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2878
… …
2358 } else { 2884 } else {
2359 return 0; 2885 return 0;
2360 } 2886 }
2361 2887
2362 1 2888 1
2889}
2890
2891sub invoke_mouse_wheel {
2892 my ($self, $ev) = @_;
2893
2894 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2895
2896 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2897
2898 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2899
2900 ! ! $delta
2363} 2901}
2364 2902
2365sub update { 2903sub update {
2366 my ($self) = @_; 2904 my ($self) = @_;
2367 2905
… …
2416 glDisable GL_TEXTURE_2D; 2954 glDisable GL_TEXTURE_2D;
2417} 2955}
2418 2956
2419############################################################################# 2957#############################################################################
2420 2958
2421package CFClient::UI::ValSlider; 2959package CFPlus::UI::ValSlider;
2422 2960
2423our @ISA = CFClient::UI::HBox::; 2961our @ISA = CFPlus::UI::HBox::;
2424 2962
2425sub new { 2963sub new {
2426 my ($class, %arg) = @_; 2964 my ($class, %arg) = @_;
2427 2965
2428 my $range = delete $arg{range}; 2966 my $range = delete $arg{range};
2429 2967
2430 my $self = $class->SUPER::new ( 2968 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2969 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2970 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 2971 to_value => sub { shift },
2434 from_value => sub { shift }, 2972 from_value => sub { shift },
2435 %arg, 2973 %arg,
2436 ); 2974 );
2437 2975
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2995sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2996sub set_value { shift->{slider}->set_value (@_) }
2459 2997
2460############################################################################# 2998#############################################################################
2461 2999
2462package CFClient::UI::TextView; 3000package CFPlus::UI::TextScroller;
2463 3001
2464our @ISA = CFClient::UI::HBox::; 3002our @ISA = CFPlus::UI::HBox::;
2465 3003
2466use CFClient::OpenGL; 3004use CFPlus::OpenGL;
2467 3005
2468sub new { 3006sub new {
2469 my $class = shift; 3007 my $class = shift;
2470 3008
2471 my $self = $class->SUPER::new ( 3009 my $self = $class->SUPER::new (
2472 fontsize => 1, 3010 fontsize => 1,
2473 can_events => 0, 3011 can_events => 1,
3012 indent => 0,
2474 #font => default_font 3013 #font => default_font
2475 @_, 3014 @_,
2476 3015
2477 layout => (new CFClient::Layout 1), 3016 layout => (new CFPlus::Layout),
2478 par => [], 3017 par => [],
3018 max_par => 0,
2479 height => 0, 3019 height => 0,
2480 children => [ 3020 children => [
2481 (new CFClient::UI::Empty expand => 1), 3021 (new CFPlus::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 3022 (new CFPlus::UI::Slider vertical => 1),
2483 ], 3023 ],
2484 ); 3024 );
2485 3025
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 3026 $self->{children}[1]->connect (changed => sub { $self->update });
2487 3027
… …
2493 3033
2494 $self->{fontsize} = $fontsize; 3034 $self->{fontsize} = $fontsize;
2495 $self->reflow; 3035 $self->reflow;
2496} 3036}
2497 3037
3038sub size_request {
3039 my ($self) = @_;
3040
3041 my ($empty, $slider) = @{ $self->{children} };
3042
3043 local $self->{children} = [$empty, $slider];
3044 $self->SUPER::size_request
3045}
3046
2498sub size_allocate { 3047sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 3048 my ($self, $w, $h) = @_;
2500 3049
2501 $self->SUPER::size_allocate ($w, $h); 3050 my ($empty, $slider, @other) = @{ $self->{children} };
3051 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 3052
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3053 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3054 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 3055 $self->{layout}->set_width ($empty->{w});
3056 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 3057
2507 $self->reflow; 3058 $self->reflow;
2508}
2509 3059
2510sub text_size { 3060 local $self->{children} = [$empty, $slider];
3061 $self->SUPER::invoke_size_allocate ($w, $h)
3062}
3063
3064sub invoke_mouse_wheel {
2511 my ($self, $text, $indent) = @_; 3065 my ($self, $ev) = @_;
3066
3067 return 0 unless $ev->{dy}; # only vertical movements
3068
3069 $self->{children}[1]->emit (mouse_wheel => $ev);
3070
3071 1
3072}
3073
3074sub get_layout {
3075 my ($self, $para) = @_;
2512 3076
2513 my $layout = $self->{layout}; 3077 my $layout = $self->{layout};
2514 3078
3079 $layout->set_font ($self->{font}) if $self->{font};
3080 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3081 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 3082 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3083 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 3084 $layout->set_markup ($para->{markup});
3085
3086 $layout->set_shapes (
3087 map
3088 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3089 @{$para->{widget}}
2518 3090 );
3091
2519 $layout->size 3092 $layout
2520} 3093}
2521 3094
2522sub reflow { 3095sub reflow {
2523 my ($self) = @_; 3096 my ($self) = @_;
2524 3097
… …
2531 3104
2532 # todo: base offset on lines or so, not on pixels 3105 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset); 3106 $self->{children}[1]->set_value ($offset);
2534} 3107}
2535 3108
3109sub current_paragraph {
3110 my ($self) = @_;
3111
3112 $self->{top_paragraph} - 1
3113}
3114
3115sub scroll_to {
3116 my ($self, $para) = @_;
3117
3118 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3119
3120 $self->{scroll_to} = $para;
3121 $self->update;
3122}
3123
2536sub clear { 3124sub clear {
2537 my ($self) = @_; 3125 my ($self) = @_;
3126
3127 my (undef, undef, @other) = @{ $self->{children} };
3128 $self->remove ($_) for @other;
2538 3129
2539 $self->{par} = []; 3130 $self->{par} = [];
2540 $self->{height} = 0; 3131 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3132 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 3133}
2543 3134
2544sub add_paragraph { 3135sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 3136 my $self = shift;
2546 3137
2547 for my $line (split /\n/, $text) { 3138 for my $para (@_) {
2548 my ($w, $h) = $self->text_size ($line); 3139 $para = {
3140 fg => [1, 1, 1, 1],
3141 indent => 0,
3142 markup => "",
3143 widget => [],
3144 ref $para ? %$para : (markup => $para),
3145 w => 1e10,
3146 wrapped => 1,
3147 };
3148
3149 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3150 push @{$self->{par}}, $para;
3151 }
3152
3153 if (my $max = $self->{max_par}) {
3154 shift @{$self->{par}} while @{$self->{par}} > $max;
3155 }
3156
3157 $self->{need_reflow}++;
3158 $self->update;
3159}
3160
3161sub scroll_to_bottom {
3162 my ($self) = @_;
3163
3164 $self->{scroll_to} = $#{$self->{par}};
3165 $self->update;
3166}
3167
3168sub force_uptodate {
3169 my ($self) = @_;
3170
3171 if (delete $self->{need_reflow}) {
3172 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3173
3174 my $height = 0;
3175
3176 for my $para (@{$self->{par}}) {
3177 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3178 my $layout = $self->get_layout ($para);
3179 my ($w, $h) = $layout->size;
3180
3181 $para->{w} = $w + $para->{indent};
3182 $para->{h} = $h;
3183 $para->{wrapped} = $layout->has_wrapped;
3184 }
3185
3186 $para->{y} = $height;
3187 $height += $para->{h};
3188 }
3189
2549 $self->{height} += $h; 3190 $self->{height} = $height;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3191 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2551 }
2552 3192
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3193 delete $self->{texture};
3194 }
3195
3196 if (my $paridx = delete $self->{scroll_to}) {
3197 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3198 }
2554} 3199}
2555 3200
2556sub update { 3201sub update {
2557 my ($self) = @_; 3202 my ($self) = @_;
2558 3203
… …
2560 3205
2561 return unless $self->{h} > 0; 3206 return unless $self->{h} > 0;
2562 3207
2563 delete $self->{texture}; 3208 delete $self->{texture};
2564 3209
2565 $ROOT->on_post_alloc ($self, sub { 3210 $ROOT->on_post_alloc ($self => sub {
3211 $self->force_uptodate;
3212
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3213 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 3214
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 { 3215 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 3216 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 3217 glClear GL_COLOR_BUFFER_BIT;
2597 3218
3219 package CFPlus::UI::Base;
3220 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3221 (0, 0, $self->{w}, $self->{h});
3222
3223 my $top = int $self->{children}[1]{range}[0];
3224
3225 my $paridx = 0;
3226 my $top_paragraph;
2598 my $top = int $self->{children}[1]{range}[0]; 3227 my $top = int $self->{children}[1]{range}[0];
2599 3228
2600 my $y0 = $top; 3229 my $y0 = $top;
2601 my $y1 = $top + $H; 3230 my $y1 = $top + $H;
2602 3231
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}}) { 3232 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 3233 my $h = $para->{h};
3234 my $y = $para->{y};
2615 3235
2616 if ($y0 < $y + $h && $y < $y1) { 3236 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 3237 my $layout = $self->get_layout ($para);
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 3238
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3239 $layout->render ($para->{indent}, $y - $y0);
2622 3240
2623 glRasterPos $par->[3], $y - $y0; 3241 if (my @w = @{ $para->{widget} }) {
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3242 my @s = $layout->get_shapes;
3243
3244 for (@w) {
3245 my ($dx, $dy) = splice @s, 0, 2, ();
3246
3247 $_->{x} = $dx + $para->{indent};
3248 $_->{y} = $dy + $y - $y0;
3249
3250 $_->draw;
3251 }
3252 }
2625 } 3253 }
2626 3254
2627 $y += $h; 3255 $paridx++;
3256 $top_paragraph ||= $paridx if $y >= $top;
2628 } 3257 }
2629 3258
2630 glDisable GL_BLEND; 3259 $self->{top_paragraph} = $top_paragraph;
2631 }; 3260 };
2632 }); 3261 });
3262}
3263
3264sub reconfigure {
3265 my ($self) = @_;
3266
3267 $self->SUPER::reconfigure;
3268
3269 $_->{w} = 1e10 for @{ $self->{par} };
3270 $self->reflow;
2633} 3271}
2634 3272
2635sub _draw { 3273sub _draw {
2636 my ($self) = @_; 3274 my ($self) = @_;
2637 3275
… …
2640 glColor 0, 0, 0, 1; 3278 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3279 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 3280 glDisable GL_TEXTURE_2D;
2643 3281
2644 $self->{children}[1]->draw; 3282 $self->{children}[1]->draw;
2645
2646} 3283}
2647 3284
2648############################################################################# 3285#############################################################################
2649 3286
2650package CFClient::UI::Animator; 3287package CFPlus::UI::Animator;
2651 3288
2652use CFClient::OpenGL; 3289use CFPlus::OpenGL;
2653 3290
2654our @ISA = CFClient::UI::Bin::; 3291our @ISA = CFPlus::UI::Bin::;
2655 3292
2656sub moveto { 3293sub moveto {
2657 my ($self, $x, $y) = @_; 3294 my ($self, $x, $y) = @_;
2658 3295
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3296 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 3324 glPopMatrix;
2688} 3325}
2689 3326
2690############################################################################# 3327#############################################################################
2691 3328
2692package CFClient::UI::Flopper; 3329package CFPlus::UI::Flopper;
2693 3330
2694our @ISA = CFClient::UI::Button::; 3331our @ISA = CFPlus::UI::Button::;
2695 3332
2696sub new { 3333sub new {
2697 my $class = shift; 3334 my $class = shift;
2698 3335
2699 my $self = $class->SUPER::new ( 3336 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 3348 $self->{other}->toggle_visibility;
2712} 3349}
2713 3350
2714############################################################################# 3351#############################################################################
2715 3352
2716package CFClient::UI::Tooltip; 3353package CFPlus::UI::Tooltip;
2717 3354
2718our @ISA = CFClient::UI::Bin::; 3355our @ISA = CFPlus::UI::Bin::;
2719 3356
2720use CFClient::OpenGL; 3357use CFPlus::OpenGL;
2721 3358
2722sub new { 3359sub new {
2723 my $class = shift; 3360 my $class = shift;
2724 3361
2725 $class->SUPER::new ( 3362 $class->SUPER::new (
… …
2728 ) 3365 )
2729} 3366}
2730 3367
2731sub set_tooltip_from { 3368sub set_tooltip_from {
2732 my ($self, $widget) = @_; 3369 my ($self, $widget) = @_;
3370
3371 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3372 if $widget->{tooltip} =~ /^#(.*)$/;
2733 3373
2734 my $tooltip = $widget->{tooltip}; 3374 my $tooltip = $widget->{tooltip};
2735 3375
2736 if ($ENV{CFPLUS_DEBUG} & 2) { 3376 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 3377 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3378 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 3379 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 3380 . "visible $widget->{visible}";
2741 } 3381 }
2742 3382
3383 $tooltip =~ s/^\n+//;
3384 $tooltip =~ s/\n+$//;
3385
2743 $self->add (new CFClient::UI::Label 3386 $self->add (new CFPlus::UI::Label
2744 markup => $tooltip, 3387 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3388 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 3389 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 3390 style => 1, # FLAG_INVERSE
2748 ellipsise => 0, 3391 ellipsise => 0,
2749 font => ($widget->{tooltip_font} || $::FONT_PROP), 3392 font => ($widget->{tooltip_font} || $::FONT_PROP),
2750 ); 3393 );
2751} 3394}
2752 3395
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3399 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3400
2758 ($w + 4, $h + 4) 3401 ($w + 4, $h + 4)
2759} 3402}
2760 3403
2761sub size_allocate { 3404sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3405 my ($self, $w, $h) = @_;
2763 3406
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3407 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3408}
2766 3409
2767sub visibility_change { 3410sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3411 my ($self, $visible) = @_;
2769 3412
2770 return unless $visible; 3413 return unless $visible;
2771 3414
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3415 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3416 my $widget = $self->{owner}
2774 or return; 3417 or return;
2775 3418
3419 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3420 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3421
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3422 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3423 if $x + $self->{w} > $self->{root}{w};
2780 3424
2781 $self->move_abs ($x, $y); 3425 $self->move_abs ($x, $y);
3426 } else {
3427 $self->hide;
3428 }
2782 }); 3429 });
2783} 3430}
2784 3431
2785sub _draw { 3432sub _draw {
2786 my ($self) = @_; 3433 my ($self) = @_;
… …
2810 $self->SUPER::_draw; 3457 $self->SUPER::_draw;
2811} 3458}
2812 3459
2813############################################################################# 3460#############################################################################
2814 3461
2815package CFClient::UI::Face; 3462package CFPlus::UI::Face;
2816 3463
2817our @ISA = CFClient::UI::Base::; 3464our @ISA = CFPlus::UI::DrawBG::;
2818 3465
2819use CFClient::OpenGL; 3466use CFPlus::OpenGL;
2820 3467
2821sub new { 3468sub new {
2822 my $class = shift; 3469 my $class = shift;
2823 3470
2824 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3472 size_w => 32,
3473 size_h => 8,
2825 aspect => 1, 3474 aspect => 1,
2826 can_events => 0, 3475 can_events => 0,
2827 @_, 3476 @_,
2828 ); 3477 );
2829 3478
2830 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
2831 Scalar::Util::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
2832 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2833 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
2834 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2835 hard => 1, 3485 parked => 1,
2836 interval => $self->{animspeed},
2837 cb => sub { 3486 cb => sub {
3487 return unless $::CONN && $widget;
3488
2838 ++$widget->{frame}; 3489 ++$widget->{frame};
3490 $widget->update_face;
2839 $widget->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
2840 }, 3494 },
2841 ); 3495 );
3496
3497 $self->update_face;
3498 $self->update_timer;
2842 } 3499 }
2843 3500
2844 $self 3501 $self
2845} 3502}
2846 3503
3504sub update_timer {
3505 my ($self) = @_;
3506
3507 return unless $self->{timer};
3508
3509 if ($self->{visible}) {
3510 $self->{timer}->at (
3511 $self->{anim_start}
3512 + $self->{animspeed}
3513 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3514 );
3515 $self->{timer}->start;
3516 } else {
3517 $self->{timer}->stop;
3518 }
3519}
3520
3521sub update_face {
3522 my ($self) = @_;
3523
3524 return unless $::CONN;
3525
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) {
3528 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3530 }
3531 }
3532}
3533
2847sub size_request { 3534sub size_request {
2848 (32, 8) 3535 my ($self) = @_;
3536
3537 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) {
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3541 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc;
3544 });
3545 }
3546 }
3547 }
3548
3549 ($self->{size_w} || 8, $self->{size_h} || 8)
2849} 3550}
2850 3551
2851sub update { 3552sub update {
2852 my ($self) = @_; 3553 my ($self) = @_;
2853 3554
2854 return unless $self->{visible}; 3555 return unless $self->{visible};
2855 3556
2856 $self->SUPER::update; 3557 $self->SUPER::update;
2857} 3558}
2858 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
2859sub _draw { 3568sub _draw {
2860 my ($self) = @_; 3569 my ($self) = @_;
2861 3570
2862 return unless $::CONN; 3571 return unless $::CONN;
2863 3572
2864 my $face; 3573 $self->SUPER::_draw;
2865 3574
2866 if ($self->{frame}) {
2867 my $anim = $::CONN->{anim}[$self->{anim}]; 3575 my $faceid = $::CONN->{faceid}[$self->{face}]
2868 3576 or return;
2869 $face = $anim->[ $self->{frame} % @$anim ]
2870 if $anim && @$anim;
2871 }
2872 3577
2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3578 my $tex = $::CONN->{texture}[$faceid];
2874 3579
2875 if ($tex) { 3580 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
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4212 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 4213
3714 $w = 0 if $w < 0; 4214 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 4215 $h = 0 if $h < 0;
3716 4216
4217 $w = max $widget->{min_w}, $w;
4218 $h = max $widget->{min_h}, $h;
4219
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225
3717 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
3719 4228
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
… …
3731 4240
3732 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
3733 $_->() 4242 $_->()
3734 for values %{delete $self->{post_alloc_hook}}; 4243 for values %{delete $self->{post_alloc_hook}};
3735 } 4244 }
3736
3737 4245
3738 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4246 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4247 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3740 glClear GL_COLOR_BUFFER_BIT; 4248 glClear GL_COLOR_BUFFER_BIT;
3741 4249
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4252 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 4253 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 4254 glLoadIdentity;
3747 4255
3748 { 4256 {
3749 package CFClient::UI::Base; 4257 package CFPlus::UI::Base;
3750 4258
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 4259 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 4260 (0, 0, $self->{w}, $self->{h});
3753 }
3754 4261
3755 $self->_draw; 4262 $self->_draw;
4263 }
3756} 4264}
3757 4265
3758############################################################################# 4266#############################################################################
3759 4267
3760package CFClient::UI; 4268package CFPlus::UI;
3761 4269
3762$ROOT = new CFClient::UI::Root; 4270$ROOT = new CFPlus::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4271$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3764 4272
37651 42731
3766 4274

Diff Legend

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