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

Diff Legend

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