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

Diff Legend

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