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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

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

Diff Legend

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