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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.441 by root, Mon Oct 8 16:10:14 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
… …
1160 my $dy = $ev->{y} - $oy; 1469 my $dy = $ev->{y} - $oy;
1161 1470
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1471 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1472 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1473
1474 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1475 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1476 };
1168 1477
1169 } elsif ($lr ^ $td) { 1478 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1479 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1480 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1483 my ($ev, $x, $y) = @_;
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);
1488 # HACK: the next line is required to enforce placement
1489 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1490 };
1180 } else { 1491 } else {
1181 return 0; 1492 return 0;
1182 } 1493 }
1183 1494
1184 1 1495 1
1185} 1496}
1186 1497
1187sub button_up { 1498sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1499 my ($self, $ev, $x, $y) = @_;
1189 1500
1190 !!delete $self->{motion} 1501 ! ! delete $self->{motion}
1191} 1502}
1192 1503
1193sub mouse_motion { 1504sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1505 my ($self, $ev, $x, $y) = @_;
1195 1506
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1507 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1508
1198 !!$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
1199} 1518}
1200 1519
1201sub _draw { 1520sub _draw {
1202 my ($self) = @_; 1521 my ($self) = @_;
1203 1522
… …
1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1211 1530
1212 my $border = $self->border; 1531 my $border = $self->border;
1213 1532
1214 glColor @{ $self->{border_bg} }; 1533 glColor @{ $self->{border_bg} };
1215 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1534 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1535 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1536 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1218 $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);
1219 1552
1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1553 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1221 glColor @{ $self->{bg} }; 1554 glColor @{ $self->{bg} };
1222 1555
1223 # TODO: repeat texture not scale 1556 # TODO: repeat texture not scale
… …
1229 1562
1230 glDisable GL_TEXTURE_2D; 1563 glDisable GL_TEXTURE_2D;
1231 1564
1232 $child->draw; 1565 $child->draw;
1233 1566
1234 if ($self->{title}) { 1567 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1568 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1569 $self->{title_widget}->_draw;
1570
1571 glTranslate 0, - ($border - $self->{h});
1237 } 1572 }
1573
1574 $self->{close_button}->draw
1575 if $self->{close_button};
1238} 1576}
1239 1577
1240############################################################################# 1578#############################################################################
1241 1579
1242package CFClient::UI::Table; 1580package CFPlus::UI::Table;
1243 1581
1244our @ISA = CFClient::UI::Base::; 1582our @ISA = CFPlus::UI::Container::;
1245 1583
1246use List::Util qw(max sum); 1584use List::Util qw(max sum);
1247 1585
1248use CFClient::OpenGL; 1586use CFPlus::OpenGL;
1249 1587
1250sub new { 1588sub new {
1251 my $class = shift; 1589 my $class = shift;
1252 1590
1253 $class->SUPER::new ( 1591 $class->SUPER::new (
1254 col_expand => [], 1592 col_expand => [],
1593 row_expand => [],
1255 @_, 1594 @_,
1256 ) 1595 )
1257} 1596}
1258 1597
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1261}
1262
1263sub add { 1598sub add {
1264 my ($self, $x, $y, $child) = @_;
1265
1266 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child;
1268
1269 $self->realloc;
1270}
1271
1272# TODO: move to container class maybe? send children a signal on removal?
1273sub clear {
1274 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);
1275 1630
1276 my @children = $self->children; 1631 my @children = $self->children;
1277 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 }
1278 1642 }
1279 for (@children) {
1280 delete $_->{parent};
1281 $_->hide;
1282 }
1283 1643
1284 $self->realloc; 1644 # second pass, rows
1285} 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1286
1287sub get_wh {
1288 my ($self) = @_;
1289
1290 my (@w, @h);
1291
1292 for my $y (0 .. $#{$self->{children}}) {
1293 my $row = $self->{children}[$y]
1294 or next;
1295
1296 for my $x (0 .. $#$row) {
1297 my $widget = $row->[$x]
1298 or next;
1299 my ($w, $h) = @$widget{qw(req_w req_h)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1300 1647
1301 $w[$x] = max $w[$x], $w; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1302 $h[$y] = max $h[$y], $h; 1649
1650 if ($h > $sh) {
1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1303 } 1652 }
1304 } 1653 }
1305 1654
1306 (\@w, \@h) 1655 (\@w, \@h)
1307} 1656}
… …
1315 (sum @$ws), 1664 (sum @$ws),
1316 (sum @$hs), 1665 (sum @$hs),
1317 ) 1666 )
1318} 1667}
1319 1668
1320sub size_allocate { 1669sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1670 my ($self, $w, $h) = @_;
1322 1671
1323 my ($ws, $hs) = $self->get_wh; 1672 my ($ws, $hs) = $self->get_wh;
1324 1673
1325 my $req_w = (sum @$ws) || 1; 1674 my $req_w = (sum @$ws) || 1;
1326 my $req_h = (sum @$hs) || 1; 1675 my $req_h = (sum @$hs) || 1;
1327 1676
1328 # TODO: nicer code && do row_expand 1677 # now linearly scale the rows/columns to the allocated size
1329 my @col_expand = @{$self->{col_expand}}; 1678 my @col_expand = @{$self->{col_expand}};
1330 @col_expand = (1) x @$ws unless @col_expand; 1679 @col_expand = (1) x @$ws unless @col_expand;
1331 my $col_expand = (sum @col_expand) || 1; 1680 my $col_expand = (sum @col_expand) || 1;
1332 1681
1333 # linearly scale sizes
1334 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1682 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1335 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1336 1683
1337 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
1338 CFClient::UI::harmonize $hs; 1692 CFPlus::UI::harmonize $hs;
1339 1693
1340 my $y; 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1341 1696
1342 for my $r (0 .. $#{$self->{children}}) { 1697 for my $widget ($self->children) {
1343 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)};
1344 or next;
1345 1699
1346 my $x = 0; 1700 $widget->configure (
1347 my $row_h = $hs->[$r]; 1701 $x[$c], $y[$r],
1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1348 1703 );
1349 for my $c (0 .. $#$row) { 1704 }
1350 my $col_w = $ws->[$c];
1351 1705
1352 if (my $widget = $row->[$c]) { 1706 1
1353 $widget->configure ($x, $y, $col_w, $row_h); 1707}
1354 }
1355 1708
1356 $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};
1357 } 1736 }
1358
1359 $y += $row_h;
1360 } 1737 }
1361 1738
1362} 1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1363 1741
1364sub 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 {
1365 my ($self, $x, $y) = @_; 1760 my ($self, $W, $H) = @_;
1366 1761
1367 $x -= $self->{x}; 1762 for my $child ($self->visible_children) {
1368 $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;
1369 1765
1370 my $res; 1766 $x += $child->{c_halign} * $child->{req_w};
1767 $y += $child->{c_valign} * $child->{req_h};
1371 1768
1372 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1373 $res = $_->find_widget ($x, $y) 1770 }
1374 and return $res; 1771
1375 } 1772 1
1376
1377 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1378}
1379
1380sub _draw {
1381 my ($self) = @_;
1382
1383 for (grep $_, @{$self->{children}}) {
1384 $_->draw for grep $_, @$_;
1385 }
1386} 1773}
1387 1774
1388############################################################################# 1775#############################################################################
1389 1776
1390package CFClient::UI::Box; 1777package CFPlus::UI::Box;
1391 1778
1392our @ISA = CFClient::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1393 1780
1394sub size_request { 1781sub size_request {
1395 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1396 1785
1397 $self->{vertical} 1786 $self->{vertical}
1398 ? ( 1787 ? (
1399 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1401 ) 1790 )
1402 : ( 1791 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1405 ) 1794 )
1406} 1795}
1407 1796
1408sub size_allocate { 1797sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
1410 1799
1411 my $space = $self->{vertical} ? $h : $w; 1800 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1801 my @children = $self->visible_children;
1413 1802
1414 my @req; 1803 my @req;
1415 1804
1416 if ($self->{homogeneous}) { 1805 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1806 @req = ($space / (@children || 1)) x @children;
1418 } else { 1807 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1808 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1809 my $req = List::Util::sum @req;
1421 1810
1422 if ($req > $space) { 1811 if ($req > $space) {
1423 # ah well, not enough space 1812 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1813 $_ *= $space / $req for @req;
1425 } else { 1814 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1815 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1816
1428 $space = ($space - $req) / $expand; # remaining space to give away 1817 $space = ($space - $req) / $expand; # remaining space to give away
1429 1818
1430 $req[$_] += $space * $children->[$_]{expand} 1819 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1820 for 0 .. $#children;
1432 } 1821 }
1433 } 1822 }
1434 1823
1435 CFClient::UI::harmonize \@req; 1824 CFPlus::UI::harmonize \@req;
1436 1825
1437 my $pos = 0; 1826 my $pos = 0;
1438 for (0 .. $#$children) { 1827 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1828 my $alloc = $req[$_];
1440 $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));
1441 1830
1442 $pos += $alloc; 1831 $pos += $alloc;
1443 } 1832 }
1444 1833
1445 1 1834 1
1446} 1835}
1447 1836
1448############################################################################# 1837#############################################################################
1449 1838
1450package CFClient::UI::HBox; 1839package CFPlus::UI::HBox;
1451 1840
1452our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1453 1842
1454sub new { 1843sub new {
1455 my $class = shift; 1844 my $class = shift;
1456 1845
1457 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1460 ) 1849 )
1461} 1850}
1462 1851
1463############################################################################# 1852#############################################################################
1464 1853
1465package CFClient::UI::VBox; 1854package CFPlus::UI::VBox;
1466 1855
1467our @ISA = CFClient::UI::Box::; 1856our @ISA = CFPlus::UI::Box::;
1468 1857
1469sub new { 1858sub new {
1470 my $class = shift; 1859 my $class = shift;
1471 1860
1472 $class->SUPER::new ( 1861 $class->SUPER::new (
… …
1475 ) 1864 )
1476} 1865}
1477 1866
1478############################################################################# 1867#############################################################################
1479 1868
1480package CFClient::UI::Label; 1869package CFPlus::UI::Label;
1481 1870
1482our @ISA = CFClient::UI::DrawBG::; 1871our @ISA = CFPlus::UI::DrawBG::;
1483 1872
1484use CFClient::OpenGL; 1873use CFPlus::OpenGL;
1485 1874
1486sub new { 1875sub new {
1487 my ($class, %arg) = @_; 1876 my ($class, %arg) = @_;
1488 1877
1489 my $self = $class->SUPER::new ( 1878 my $self = $class->SUPER::new (
… …
1492 #active_bg => none 1881 #active_bg => none
1493 #font => default_font 1882 #font => default_font
1494 #text => initial text 1883 #text => initial text
1495 #markup => initial narkup 1884 #markup => initial narkup
1496 #max_w => maximum pixel width 1885 #max_w => maximum pixel width
1886 #style => 0, # render flags
1497 ellipsise => 3, # end 1887 ellipsise => 3, # end
1498 layout => (new CFClient::Layout), 1888 layout => (new CFPlus::Layout),
1499 fontsize => 1, 1889 fontsize => 1,
1500 align => -1, 1890 align => -1,
1501 valign => -1, 1891 valign => -1,
1502 padding_x => 2, 1892 padding_x => 2,
1503 padding_y => 2, 1893 padding_y => 2,
1504 can_events => 0, 1894 can_events => 0,
1505 %arg 1895 %arg
1506 ); 1896 );
1507 1897
1508 if (exists $self->{template}) { 1898 if (exists $self->{template}) {
1509 my $layout = new CFClient::Layout; 1899 my $layout = new CFPlus::Layout;
1510 $layout->set_text (delete $self->{template}); 1900 $layout->set_text (delete $self->{template});
1511 $self->{template} = $layout; 1901 $self->{template} = $layout;
1512 } 1902 }
1513 1903
1514 if (exists $self->{markup}) { 1904 if (exists $self->{markup}) {
… …
1518 } 1908 }
1519 1909
1520 $self 1910 $self
1521} 1911}
1522 1912
1523sub escape($) {
1524 local $_ = $_[0];
1525
1526 s/&/&amp;/g;
1527 s/>/&gt;/g;
1528 s/</&lt;/g;
1529
1530 $_
1531}
1532
1533sub update { 1913sub update {
1534 my ($self) = @_; 1914 my ($self) = @_;
1535 1915
1536 delete $self->{texture}; 1916 delete $self->{texture};
1537 $self->SUPER::update; 1917 $self->SUPER::update;
1538} 1918}
1539 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
1540sub set_text { 1933sub set_text {
1541 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1542 1935
1543 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
1545 1938
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1939 $self->{layout}->set_text ($text);
1548 1940
1941 delete $self->{size_req};
1549 $self->realloc; 1942 $self->realloc;
1550 $self->update; 1943 $self->update;
1551} 1944}
1552 1945
1553sub set_markup { 1946sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1949 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1950 $self->{text} = "M$markup";
1558 1951
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1952 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1953
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1954 $self->{layout}->set_markup ($markup);
1563 1955
1956 delete $self->{size_req};
1564 $self->realloc; 1957 $self->realloc;
1565 $self->update; 1958 $self->update;
1566} 1959}
1567 1960
1568sub size_request { 1961sub size_request {
1569 my ($self) = @_; 1962 my ($self) = @_;
1570 1963
1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1972
1577 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
1578 1974
1579 if (exists $self->{template}) { 1975 if (exists $self->{template}) {
1580 $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);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1978 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1979
1583 my ($w2, $h2) = $self->{template}->size; 1980 my ($w2, $h2) = $self->{template}->size;
1584 1981
1585 $w = List::Util::max $w, $w2; 1982 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1983 $h = List::Util::max $h, $h2;
1984 }
1985
1986 [$w, $h]
1587 } 1987 };
1588 1988
1589 ($w, $h) 1989 @{ $self->{size_req} }
1590} 1990}
1591 1991
1992sub baseline_shift {
1993 $_[0]{layout}->descent
1994}
1995
1592sub size_allocate { 1996sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1997 my ($self, $w, $h) = @_;
1594 1998
1595 delete $self->{ox}; 1999 delete $self->{ox};
1596 2000
1597 delete $self->{texture} 2001 delete $self->{texture}
1598 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
1599} 2005}
1600 2006
1601sub set_fontsize { 2007sub set_fontsize {
1602 my ($self, $fontsize) = @_; 2008 my ($self, $fontsize) = @_;
1603 2009
1604 $self->{fontsize} = $fontsize; 2010 $self->{fontsize} = $fontsize;
2011 delete $self->{size_req};
1605 delete $self->{texture}; 2012 delete $self->{texture};
1606 2013
1607 $self->realloc; 2014 $self->realloc;
1608} 2015}
1609 2016
2017sub reconfigure {
2018 my ($self) = @_;
2019
2020 delete $self->{size_req};
2021 delete $self->{texture};
2022
2023 $self->SUPER::reconfigure;
2024}
2025
1610sub _draw { 2026sub _draw {
1611 my ($self) = @_; 2027 my ($self) = @_;
1612 2028
1613 $self->SUPER::_draw; # draw background, if applicable 2029 $self->SUPER::_draw; # draw background, if applicable
1614 2030
1615 my $tex = $self->{texture} ||= do { 2031 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 2032 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2033 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 2034 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2035 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2036 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2037 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 2038
1623 new_from_layout CFClient::Texture $self->{layout} 2039 [$self->{layout}->size]
1624 }; 2040 };
1625 2041
1626 unless (exists $self->{ox}) { 2042 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2043 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2044 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
1630 2046
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1634 }; 2052 };
1635 2053
1636 glEnable GL_TEXTURE_2D; 2054# unless ($self->{list}) {
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
1638 2056# CFPlus::OpenGL::glNewList $self->{list};
1639 if ($tex->{format} == GL_ALPHA) { 2057# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1640 glColor @{$self->{fg}}; 2058# CFPlus::OpenGL::glEndList;
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 } 2059# }
2060#
2061# CFPlus::OpenGL::glCallList $self->{list};
1645 2062
1646 glDisable GL_TEXTURE_2D; 2063 $self->{layout}->draw;
1647} 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#}
1648 2073
1649############################################################################# 2074#############################################################################
1650 2075
1651package CFClient::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
1652 2077
1653our @ISA = CFClient::UI::Label::; 2078our @ISA = CFPlus::UI::Label::;
1654 2079
1655use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1656 2081
1657sub new { 2082sub new {
1658 my $class = shift; 2083 my $class = shift;
1659 2084
1660 $class->SUPER::new ( 2085 $class->SUPER::new (
1661 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
1662 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
1663 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
1664 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
1665 can_hover => 1, 2092 can_hover => 1,
1666 can_focus => 1, 2093 can_focus => 1,
1667 valign => 0, 2094 valign => 0,
1668 can_events => 1, 2095 can_events => 1,
2096 ellipsise => 0,
1669 #text => ... 2097 #text => ...
2098 #hidden => "*",
1670 @_ 2099 @_
1671 ) 2100 )
1672} 2101}
1673 2102
1674sub _set_text { 2103sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 2110 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 2111 $self->{text} = $text;
1683 2112
1684 $text =~ s/./*/g if $self->{hidden}; 2113 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 2114 $self->{layout}->set_text ("$text ");
2115 delete $self->{size_req};
1686 2116
1687 $self->_emit (changed => $self->{text}); 2117 $self->emit (changed => $self->{text});
2118
2119 $self->realloc;
1688 $self->update; 2120 $self->update;
1689} 2121}
1690 2122
1691sub set_text { 2123sub set_text {
1692 my ($self, $text) = @_; 2124 my ($self, $text) = @_;
1693 2125
1694 $self->{cursor} = length $text; 2126 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 2127 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 2128}
1699 2129
1700sub get_text { 2130sub get_text {
1701 $_[0]{text} 2131 $_[0]{text}
1702} 2132}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 2137 my ($w, $h) = $self->SUPER::size_request;
1708 2138
1709 ($w + 1, $h) # add 1 for cursor 2139 ($w + 1, $h) # add 1 for cursor
1710} 2140}
1711 2141
1712sub key_down { 2142sub invoke_key_down {
1713 my ($self, $ev) = @_; 2143 my ($self, $ev) = @_;
1714 2144
1715 my $mod = $ev->{mod}; 2145 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 2146 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 2147 my $uni = $ev->{unicode};
1718 2148
1719 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;
1720 2152
1721 if ($uni == 8) { 2153 if ($uni == 8) {
1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2154 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1723 } elsif ($uni == 127) { 2155 } elsif ($uni == 127) {
1724 substr $text, $self->{cursor}, 1, ""; 2156 substr $text, $self->{cursor}, 1, "";
1725 } elsif ($sym == CFClient::SDLK_LEFT) { 2157 } elsif ($sym == CFPlus::SDLK_LEFT) {
1726 --$self->{cursor} if $self->{cursor}; 2158 --$self->{cursor} if $self->{cursor};
1727 } elsif ($sym == CFClient::SDLK_RIGHT) { 2159 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1728 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2160 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1729 } 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 = "";
1730 $self->{cursor} = 0; 2175 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 2176 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 2177 $self->emit ('escape');
1735 } elsif ($uni) { 2178 } elsif ($uni == 0x0d) {
2179 substr $text, $self->{cursor}++, 0, "\012";
2180 } elsif ($uni >= 0x20) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 2181 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 2182 } else {
1738 return 0; 2183 return 0;
1739 } 2184 }
1740 2185
1741 $self->_set_text ($text); 2186 $self->_set_text ($text);
1742 2187
1743 $self->realloc; 2188 $self->realloc;
2189 $self->update;
1744 2190
1745 1 2191 1
1746} 2192}
1747 2193
1748sub focus_in { 2194sub invoke_focus_in {
1749 my ($self) = @_; 2195 my ($self) = @_;
1750 2196
1751 $self->{last_activity} = $::NOW; 2197 $self->{last_activity} = $::NOW;
1752 2198
1753 $self->SUPER::focus_in; 2199 $self->SUPER::invoke_focus_in
1754} 2200}
1755 2201
1756sub button_down { 2202sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 2203 my ($self, $ev, $x, $y) = @_;
1758 2204
1759 $self->SUPER::button_down ($ev, $x, $y); 2205 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 2206
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 2207 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 2208
1763 # byte-index to char-index 2209 # byte-index to char-index
1764 my $text = $self->{text}; 2210 my $text = $self->{text};
1765 utf8::encode $text; 2211 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 2212 $self->{cursor} = length $text;
1767 2213
1768 $self->_set_text ($self->{text}); 2214 $self->_set_text ($self->{text});
1769 $self->update; 2215 $self->update;
1770 2216
1771 1 2217 1
1772} 2218}
1773 2219
1774sub mouse_motion { 2220sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
1776# 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#
1777 2223
1778 0 2224 1
1779} 2225}
1780 2226
1781sub _draw { 2227sub _draw {
1782 my ($self) = @_; 2228 my ($self) = @_;
1783 2229
1784 local $self->{fg} = $self->{fg}; 2230 local $self->{fg} = $self->{fg};
1785 2231
1786 if ($FOCUS == $self) { 2232 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 2233 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 2234 $self->{fg} = $self->{active_fg};
1789 } else { 2235 } else {
1790 glColor @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
1791 } 2237 }
1792 2238
1793 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2240 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS;
1796 glVertex 0 , 0;
1797 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 2241 glRect 0, 0, $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0;
1800 glEnd;
1801 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
1802 2243
1803 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
1804 2245
1805 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
1807 2248
1808 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
1809 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
1810 utf8::encode $text; 2251 utf8::encode $text;
1811 2252
1812 @$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);
1813 } 2254 }
1814 2255
1815 glColor @{$self->{fg}}; 2256 glColor_premultiply @{$self->{active_fg}};
1816 glBegin GL_LINES; 2257 glBegin GL_LINES;
1817 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1818 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};
1819 glEnd; 2260 glEnd;
1820 }
1821}
1822 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
1823package CFClient::UI::Entry; 2280package CFPlus::UI::Entry;
1824 2281
1825our @ISA = CFClient::UI::EntryBase::; 2282our @ISA = CFPlus::UI::EntryBase::;
1826 2283
1827use CFClient::OpenGL; 2284use CFPlus::OpenGL;
1828 2285
1829sub key_down { 2286sub invoke_key_down {
1830 my ($self, $ev) = @_; 2287 my ($self, $ev) = @_;
1831 2288
1832 my $sym = $ev->{sym}; 2289 my $sym = $ev->{sym};
1833 2290
1834 if ($sym == 13) { 2291 if ($ev->{uni} == 0x0d || $sym == 13) {
1835 unshift @{$self->{history}}, 2292 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 2293 my $txt = $self->get_text;
2294
1837 $self->{history_pointer} = -1; 2295 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 2296 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 2297 $self->emit (activate => $txt);
1840 $self->update; 2298 $self->update;
1841 2299
1842 } elsif ($sym == CFClient::SDLK_UP) { 2300 } elsif ($sym == CFPlus::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 2301 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 2302 $self->{history_saveback} = $self->get_text;
1845 } 2303 }
1846 if (@{$self->{history} || []} > 0) { 2304 if (@{$self->{history} || []} > 0) {
1847 $self->{history_pointer}++; 2305 $self->{history_pointer}++;
… …
1849 $self->{history_pointer} = @{$self->{history} || []} - 1; 2307 $self->{history_pointer} = @{$self->{history} || []} - 1;
1850 } 2308 }
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2309 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } 2310 }
1853 2311
1854 } elsif ($sym == CFClient::SDLK_DOWN) { 2312 } elsif ($sym == CFPlus::SDLK_DOWN) {
1855 $self->{history_pointer}--; 2313 $self->{history_pointer}--;
1856 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2314 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1857 2315
1858 if ($self->{history_pointer} >= 0) { 2316 if ($self->{history_pointer} >= 0) {
1859 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1860 } else { 2318 } else {
1861 $self->set_text ($self->{history_saveback}); 2319 $self->set_text ($self->{history_saveback});
1862 } 2320 }
1863 2321
1864 } else { 2322 } else {
1865 return $self->SUPER::key_down ($ev) 2323 return $self->SUPER::invoke_key_down ($ev)
1866 } 2324 }
1867 2325
1868 1 2326 1
1869} 2327}
1870 2328
1871############################################################################# 2329#############################################################################
1872 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
1873package CFClient::UI::Button; 2370package CFPlus::UI::ButtonBin;
1874 2371
1875our @ISA = CFClient::UI::Label::; 2372our @ISA = CFPlus::UI::Bin::;
1876 2373
1877use CFClient::OpenGL; 2374use CFPlus::OpenGL;
1878 2375
1879my @tex = 2376my @tex =
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw(b1_button_active.png); 2378 qw(b1_button_inactive.png b1_button_active.png);
1882 2379
1883sub new { 2380sub new {
1884 my $class = shift; 2381 my $class = shift;
1885 2382
1886 $class->SUPER::new ( 2383 $class->SUPER::new (
1887 padding_x => 4,
1888 padding_y => 4,
1889 fg => [1, 1, 1],
1890 active_fg => [0, 0, 1],
1891 can_hover => 1, 2384 can_hover => 1,
1892 align => 0, 2385 align => 0,
1893 valign => 0, 2386 valign => 0,
1894 can_events => 1, 2387 can_events => 1,
1895 @_ 2388 @_
1896 ) 2389 )
1897} 2390}
1898 2391
1899sub activate { }
1900
1901sub button_up { 2392sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2393 my ($self, $ev, $x, $y) = @_;
1903 2394
1904 $self->emit ("activate") 2395 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2396 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2397 && $y >= 0 && $y < $self->{h};
… …
1909} 2400}
1910 2401
1911sub _draw { 2402sub _draw {
1912 my ($self) = @_; 2403 my ($self) = @_;
1913 2404
1914 local $self->{fg} = $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919
1920 glEnable GL_TEXTURE_2D; 2405 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2407 glColor 0, 0, 0, 1;
1923 2408
2409 my $tex = $tex[$GRAB == $self];
1924 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2410 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925 2411
1926 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
1927 2413
1928 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
1929} 2415}
1930 2416
1931############################################################################# 2417#############################################################################
1932 2418
1933package CFClient::UI::CheckBox; 2419package CFPlus::UI::Button;
1934 2420
1935our @ISA = CFClient::UI::DrawBG::; 2421our @ISA = CFPlus::UI::Label::;
2422
2423use CFPlus::OpenGL;
1936 2424
1937my @tex = 2425my @tex =
1938 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 }
1939 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2480 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1940 2481
1941use CFClient::OpenGL; 2482use CFPlus::OpenGL;
1942 2483
1943sub new { 2484sub new {
1944 my $class = shift; 2485 my $class = shift;
1945 2486
1946 $class->SUPER::new ( 2487 $class->SUPER::new (
… …
1960 my ($self) = @_; 2501 my ($self) = @_;
1961 2502
1962 (6) x 2 2503 (6) x 2
1963} 2504}
1964 2505
2506sub toggle {
2507 my ($self) = @_;
2508
2509 $self->{state} = !$self->{state};
2510 $self->emit (changed => $self->{state});
2511 $self->update;
2512}
2513
1965sub button_down { 2514sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2515 my ($self, $ev, $x, $y) = @_;
1967 2516
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2517 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2518 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2519 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2520 } else {
1973 return 0 2521 return 0
1974 } 2522 }
1975 2523
1976 1 2524 1
… …
1979sub _draw { 2527sub _draw {
1980 my ($self) = @_; 2528 my ($self) = @_;
1981 2529
1982 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
1983 2531
1984 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1985 2533
1986 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
1987 2535
1988 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;
1989 2537
… …
1996 glDisable GL_TEXTURE_2D; 2544 glDisable GL_TEXTURE_2D;
1997} 2545}
1998 2546
1999############################################################################# 2547#############################################################################
2000 2548
2001package CFClient::UI::Image; 2549package CFPlus::UI::Image;
2002 2550
2003our @ISA = CFClient::UI::Base::; 2551our @ISA = CFPlus::UI::Base::;
2004 2552
2005use CFClient::OpenGL; 2553use CFPlus::OpenGL;
2006use Carp qw/confess/;
2007 2554
2008our %loaded_images; 2555our %texture_cache;
2009 2556
2010sub new { 2557sub new {
2011 my $class = shift; 2558 my $class = shift;
2012 2559
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2560 my $self = $class->SUPER::new (
2561 can_events => 0,
2562 scale => 1,
2563 @_,
2564 );
2014 2565
2015 $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";
2016 2568
2017 $loaded_images{$self->{image}} ||= 2569 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 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;
2019 2571
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2572 CFPlus::weaken $texture_cache{$self->{path}};
2021 2573
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2574 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2575
2026 $self 2576 $self
2027} 2577}
2028 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
2029sub size_request { 2594sub size_request {
2030 my ($self) = @_; 2595 my ($self) = @_;
2031 2596
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2033} 2598}
2034 2599
2035sub _draw { 2600sub _draw {
2036 my ($self) = @_; 2601 my ($self) = @_;
2037 2602
… …
2054 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2055} 2620}
2056 2621
2057############################################################################# 2622#############################################################################
2058 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
2059package CFClient::UI::VGauge; 2666package CFPlus::UI::VGauge;
2060 2667
2061our @ISA = CFClient::UI::Base::; 2668our @ISA = CFPlus::UI::Base::;
2062 2669
2063use List::Util qw(min max); 2670use List::Util qw(min max);
2064 2671
2065use CFClient::OpenGL; 2672use CFPlus::OpenGL;
2066 2673
2067my %tex = ( 2674my %tex = (
2068 food => [ 2675 food => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2676 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2677 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2071 ], 2678 ],
2072 grace => [ 2679 grace => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 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/
2075 ], 2682 ],
2076 hp => [ 2683 hp => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2685 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2079 ], 2686 ],
2080 mana => [ 2687 mana => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 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/
2083 ], 2690 ],
2084); 2691);
2085 2692
2086# eg. VGauge->new (gauge => 'food'), default gauge: food 2693# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2753 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2754 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2755
2149 my $h1 = $self->{h} * (1 - $ycut1); 2756 my $h1 = $self->{h} * (1 - $ycut1);
2150 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);
2151 2761
2152 glEnable GL_BLEND; 2762 glEnable GL_BLEND;
2153 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;
2154 glEnable GL_TEXTURE_2D; 2765 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2766 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2767
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2768 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2769 glBegin GL_QUADS;
… …
2173 2784
2174 if ($t3) { 2785 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2786 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2787 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2788 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2789 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2790 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2791 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2792 glEnd;
2182 } 2793 }
2183 2794
2184 glDisable GL_BLEND; 2795 glDisable GL_BLEND;
2185 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2186} 2797}
2187 2798
2188############################################################################# 2799#############################################################################
2189 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
2190package CFClient::UI::Gauge; 2939package CFPlus::UI::Gauge;
2191 2940
2192our @ISA = CFClient::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2193 2942
2194sub new { 2943sub new {
2195 my ($class, %arg) = @_; 2944 my ($class, %arg) = @_;
2196 2945
2197 my $self = $class->SUPER::new ( 2946 my $self = $class->SUPER::new (
… …
2199 can_hover => 1, 2948 can_hover => 1,
2200 can_events => 1, 2949 can_events => 1,
2201 %arg, 2950 %arg,
2202 ); 2951 );
2203 2952
2204 $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");
2205 $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);
2206 $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");
2207 2956
2208 $self 2957 $self
2209} 2958}
2210 2959
2211sub set_fontsize { 2960sub set_fontsize {
… …
2232 $self->{value}->set_text ($val); 2981 $self->{value}->set_text ($val);
2233} 2982}
2234 2983
2235############################################################################# 2984#############################################################################
2236 2985
2237package CFClient::UI::Slider; 2986package CFPlus::UI::Slider;
2238 2987
2239use strict; 2988use strict;
2240 2989
2241use CFClient::OpenGL; 2990use CFPlus::OpenGL;
2242 2991
2243our @ISA = CFClient::UI::DrawBG::; 2992our @ISA = CFPlus::UI::DrawBG::;
2244 2993
2245my @tex = 2994my @tex =
2246 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2995 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2247 qw(s1_slider.png s1_slider_bg.png); 2996 qw(s1_slider.png s1_slider_bg.png);
2248 2997
2249sub new { 2998sub new {
2250 my $class = shift; 2999 my $class = shift;
2251 3000
… …
2272 $self->update; 3021 $self->update;
2273 3022
2274 $self 3023 $self
2275} 3024}
2276 3025
2277sub changed { }
2278
2279sub set_range { 3026sub set_range {
2280 my ($self, $range) = @_; 3027 my ($self, $range) = @_;
2281 3028
2282 ($range, $self->{range}) = ($self->{range}, $range); 3029 ($range, $self->{range}) = ($self->{range}, $range);
2283 3030
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 3031 if ("@$range" ne "@{$self->{range}}") {
3032 $self->update;
3033 $self->set_value ($self->{range}[0]);
3034 }
2286} 3035}
2287 3036
2288sub set_value { 3037sub set_value {
2289 my ($self, $value) = @_; 3038 my ($self, $value) = @_;
2290 3039
… …
2301 if $unit; 3050 if $unit;
2302 3051
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3052 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 3053
2305 if ($value != $old_value) { 3054 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 3055 $self->emit (changed => $value);
2307 $self->update; 3056 $self->update;
2308 } 3057 }
2309} 3058}
2310 3059
2311sub size_request { 3060sub size_request {
2312 my ($self) = @_; 3061 my ($self) = @_;
2313 3062
2314 ($self->{req_w}, $self->{req_h}) 3063 ($self->{req_w}, $self->{req_h})
2315} 3064}
2316 3065
2317sub button_down { 3066sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 3067 my ($self, $ev, $x, $y) = @_;
2319 3068
2320 $self->SUPER::button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 3070
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 3072
2324 $self->mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
2325}
2326 3074
3075 1
3076}
3077
2327sub mouse_motion { 3078sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2329 3080
2330 if ($GRAB == $self) { 3081 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 3083
… …
2336 3087
2337 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3088 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2338 } else { 3089 } else {
2339 return 0; 3090 return 0;
2340 } 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);
2341 3104
2342 1 3105 1
2343} 3106}
2344 3107
2345sub update { 3108sub update {
… …
2396 glDisable GL_TEXTURE_2D; 3159 glDisable GL_TEXTURE_2D;
2397} 3160}
2398 3161
2399############################################################################# 3162#############################################################################
2400 3163
2401package CFClient::UI::ValSlider; 3164package CFPlus::UI::ValSlider;
2402 3165
2403our @ISA = CFClient::UI::HBox::; 3166our @ISA = CFPlus::UI::HBox::;
2404 3167
2405sub new { 3168sub new {
2406 my ($class, %arg) = @_; 3169 my ($class, %arg) = @_;
2407 3170
2408 my $range = delete $arg{range}; 3171 my $range = delete $arg{range};
2409 3172
2410 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3174 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3175 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift }, 3176 to_value => sub { shift },
2414 from_value => sub { shift }, 3177 from_value => sub { shift },
2415 %arg, 3178 %arg,
2416 ); 3179 );
2417 3180
… …
2437sub set_range { shift->{slider}->set_range (@_) } 3200sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 3201sub set_value { shift->{slider}->set_value (@_) }
2439 3202
2440############################################################################# 3203#############################################################################
2441 3204
2442package CFClient::UI::TextView; 3205package CFPlus::UI::TextScroller;
2443 3206
2444our @ISA = CFClient::UI::HBox::; 3207our @ISA = CFPlus::UI::HBox::;
2445 3208
2446use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2447 3210
2448sub new { 3211sub new {
2449 my $class = shift; 3212 my $class = shift;
2450 3213
2451 my $self = $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
2452 fontsize => 1, 3215 fontsize => 1,
2453 can_events => 0, 3216 can_events => 1,
3217 indent => 0,
2454 #font => default_font 3218 #font => default_font
2455 @_, 3219 @_,
2456 3220
2457 layout => (new CFClient::Layout 1), 3221 layout => (new CFPlus::Layout),
2458 par => [], 3222 par => [],
3223 max_par => 0,
2459 height => 0, 3224 height => 0,
2460 children => [ 3225 children => [
2461 (new CFClient::UI::Empty expand => 1), 3226 (new CFPlus::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 3227 (new CFPlus::UI::Slider vertical => 1),
2463 ], 3228 ],
2464 ); 3229 );
2465 3230
2466 $self->{children}[1]->connect (changed => sub { $self->update }); 3231 $self->{children}[1]->connect (changed => sub { $self->update });
2467 3232
… …
2473 3238
2474 $self->{fontsize} = $fontsize; 3239 $self->{fontsize} = $fontsize;
2475 $self->reflow; 3240 $self->reflow;
2476} 3241}
2477 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
2478sub size_allocate { 3252sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 3253 my ($self, $w, $h) = @_;
2480 3254
2481 $self->SUPER::size_allocate ($w, $h); 3255 my ($empty, $slider, @other) = @{ $self->{children} };
3256 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 3257
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3258 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3259 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $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});
2486 3262
2487 $self->reflow; 3263 $self->reflow;
2488}
2489 3264
2490sub text_size { 3265 local $self->{children} = [$empty, $slider];
3266 $self->SUPER::invoke_size_allocate ($w, $h)
3267}
3268
3269sub invoke_mouse_wheel {
2491 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) = @_;
2492 3281
2493 my $layout = $self->{layout}; 3282 my $layout = $self->{layout};
2494 3283
3284 $layout->set_font ($self->{font}) if $self->{font};
3285 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3286 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $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});
2497 $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}}
2498 3295 );
3296
2499 $layout->size 3297 $layout
2500} 3298}
2501 3299
2502sub reflow { 3300sub reflow {
2503 my ($self) = @_; 3301 my ($self) = @_;
2504 3302
… …
2511 3309
2512 # todo: base offset on lines or so, not on pixels 3310 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset); 3311 $self->{children}[1]->set_value ($offset);
2514} 3312}
2515 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
2516sub clear { 3329sub clear {
2517 my ($self) = @_; 3330 my ($self) = @_;
3331
3332 my (undef, undef, @other) = @{ $self->{children} };
3333 $self->remove ($_) for @other;
2518 3334
2519 $self->{par} = []; 3335 $self->{par} = [];
2520 $self->{height} = 0; 3336 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3337 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 3338}
2523 3339
2524sub add_paragraph { 3340sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 3341 my $self = shift;
2526 3342
2527 for my $line (split /\n/, $text) { 3343 for my $para (@_) {
2528 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
2529 $self->{height} += $h; 3395 $self->{height} = $height;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3396 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2531 }
2532 3397
2533 $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 }
2534} 3404}
2535 3405
2536sub update { 3406sub update {
2537 my ($self) = @_; 3407 my ($self) = @_;
2538 3408
… …
2540 3410
2541 return unless $self->{h} > 0; 3411 return unless $self->{h} > 0;
2542 3412
2543 delete $self->{texture}; 3413 delete $self->{texture};
2544 3414
2545 $ROOT->on_post_alloc ($self, sub { 3415 $ROOT->on_post_alloc ($self => sub {
3416 $self->force_uptodate;
3417
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3418 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 3419
2548 if (delete $self->{need_reflow}) {
2549 my $height = 0;
2550
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2566
2567 $self->{height} = $height;
2568
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2570
2571 delete $self->{texture};
2572 }
2573
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3420 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 3421 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 3422 glClear GL_COLOR_BUFFER_BIT;
2577 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;
2578 my $top = int $self->{children}[1]{range}[0]; 3432 my $top = int $self->{children}[1]{range}[0];
2579 3433
2580 my $y0 = $top; 3434 my $y0 = $top;
2581 my $y1 = $top + $H; 3435 my $y1 = $top + $H;
2582 3436
2583 my $y = 0;
2584
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 3437 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 3438 my $h = $para->{h};
3439 my $y = $para->{y};
2595 3440
2596 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 3442 my $layout = $self->get_layout ($para);
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 3443
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
2602 3446
2603 glRasterPos $par->[3], $y - $y0; 3447 if (my @w = @{ $para->{widget} }) {
2604 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 }
2605 } 3459 }
2606 3460
2607 $y += $h; 3461 $paridx++;
3462 $top_paragraph ||= $paridx if $y >= $top;
2608 } 3463 }
2609 3464
2610 glDisable GL_BLEND; 3465 $self->{top_paragraph} = $top_paragraph;
2611 }; 3466 };
2612 }); 3467 });
2613} 3468}
2614 3469
3470sub reconfigure {
3471 my ($self) = @_;
3472
3473 $self->SUPER::reconfigure;
3474
3475 $_->{w} = 1e10 for @{ $self->{par} };
3476 $self->reflow;
3477}
3478
2615sub _draw { 3479sub _draw {
2616 my ($self) = @_; 3480 my ($self) = @_;
2617 3481
2618 glEnable GL_TEXTURE_2D; 3482 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3483 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 3484 glColor 0, 0, 0, 1;
2621 $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});
2622 glDisable GL_TEXTURE_2D; 3486 glDisable GL_TEXTURE_2D;
2623 3487
2624 $self->{children}[1]->draw; 3488 $self->{children}[1]->draw;
2625
2626} 3489}
2627 3490
2628############################################################################# 3491#############################################################################
2629 3492
2630package CFClient::UI::Animator; 3493package CFPlus::UI::Animator;
2631 3494
2632use CFClient::OpenGL; 3495use CFPlus::OpenGL;
2633 3496
2634our @ISA = CFClient::UI::Bin::; 3497our @ISA = CFPlus::UI::Bin::;
2635 3498
2636sub moveto { 3499sub moveto {
2637 my ($self, $x, $y) = @_; 3500 my ($self, $x, $y) = @_;
2638 3501
2639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3502 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2667 glPopMatrix; 3530 glPopMatrix;
2668} 3531}
2669 3532
2670############################################################################# 3533#############################################################################
2671 3534
2672package CFClient::UI::Flopper; 3535package CFPlus::UI::Flopper;
2673 3536
2674our @ISA = CFClient::UI::Button::; 3537our @ISA = CFPlus::UI::Button::;
2675 3538
2676sub new { 3539sub new {
2677 my $class = shift; 3540 my $class = shift;
2678 3541
2679 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
2691 $self->{other}->toggle_visibility; 3554 $self->{other}->toggle_visibility;
2692} 3555}
2693 3556
2694############################################################################# 3557#############################################################################
2695 3558
2696package CFClient::UI::Tooltip; 3559package CFPlus::UI::Tooltip;
2697 3560
2698our @ISA = CFClient::UI::Bin::; 3561our @ISA = CFPlus::UI::Bin::;
2699 3562
2700use CFClient::OpenGL; 3563use CFPlus::OpenGL;
2701 3564
2702sub new { 3565sub new {
2703 my $class = shift; 3566 my $class = shift;
2704 3567
2705 $class->SUPER::new ( 3568 $class->SUPER::new (
… …
2709} 3572}
2710 3573
2711sub set_tooltip_from { 3574sub set_tooltip_from {
2712 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
2713 3576
2714 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 =~ /^#(.*)$/;
2715 3582
2716 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
2721 } 3588 }
2722 3589
3590 $tip =~ s/^\n+//;
3591 $tip =~ s/\n+$//;
3592
2723 $self->add (new CFClient::UI::Label 3593 $self->add (new CFPlus::UI::Label
2724 markup => $tooltip, 3594 markup => $tip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 3596 fontsize => 0.8,
2727 fg => [0, 0, 0, 1], 3597 style => 1, # FLAG_INVERSE
2728 ellipsise => 0, 3598 ellipsise => 0,
2729 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
2730 ); 3600 );
2731} 3601}
2732 3602
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3606 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 3607
2738 ($w + 4, $h + 4) 3608 ($w + 4, $h + 4)
2739} 3609}
2740 3610
2741sub size_allocate { 3611sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3612 my ($self, $w, $h) = @_;
2743 3613
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3614 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3615}
2746 3616
2747sub visibility_change { 3617sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3618 my ($self, $visible) = @_;
2749 3619
2750 return unless $visible; 3620 return unless $visible;
2751 3621
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3622 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3623 my $widget = $self->{owner}
2754 or return; 3624 or return;
2755 3625
3626 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3627 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3628
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3629 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3630 if $x + $self->{w} > $self->{root}{w};
2760 3631
2761 $self->move_abs ($x, $y); 3632 $self->move_abs ($x, $y);
3633 } else {
3634 $self->hide;
3635 }
2762 }); 3636 });
2763} 3637}
2764 3638
2765sub _draw { 3639sub _draw {
2766 my ($self) = @_; 3640 my ($self) = @_;
2767 3641
2768 glTranslate 0.375, 0.375;
2769
2770 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
2771 3643
2772 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
2773 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
2774 glVertex 0 , 0;
2775 glVertex 0 , $h;
2776 glVertex $w, $h;
2777 glVertex $w, 0;
2778 glEnd;
2779 3646
2780 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
2781 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
2782 glVertex 0 , 0;
2783 glVertex 0 , $h;
2784 glVertex $w, $h;
2785 glVertex $w, 0;
2786 glEnd;
2787 3649
2788 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
2789 3651
2790 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
2791} 3653}
2792 3654
2793############################################################################# 3655#############################################################################
2794 3656
2795package CFClient::UI::Face; 3657package CFPlus::UI::Face;
2796 3658
2797our @ISA = CFClient::UI::Base::; 3659our @ISA = CFPlus::UI::DrawBG::;
2798 3660
2799use CFClient::OpenGL; 3661use CFPlus::OpenGL;
2800 3662
2801sub new { 3663sub new {
2802 my $class = shift; 3664 my $class = shift;
2803 3665
2804 my $self = $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
3667 size_w => 32,
3668 size_h => 8,
2805 aspect => 1, 3669 aspect => 1,
2806 can_events => 0, 3670 can_events => 0,
2807 @_, 3671 @_,
2808 ); 3672 );
2809 3673
2810 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
2812 3676
3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2813 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1, 3680 parked => 1,
2816 interval => $self->{animspeed},
2817 cb => sub { 3681 cb => sub {
3682 return unless $::CONN;
3683
3684 my $w = $widget
3685 or return;
3686
2818 ++$widget->{frame}; 3687 ++$w->{frame};
3688 $w->update_face;
3689
3690 # somehow, $widget can go away
2819 $widget->update; 3691 $w->update;
3692 $w->update_timer;
2820 }, 3693 },
2821 ); 3694 );
3695
3696 $self->update_face;
3697 $self->update_timer;
2822 } 3698 }
2823 3699
2824 $self 3700 $self
2825} 3701}
2826 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
2827sub size_request { 3739sub size_request {
2828 (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)
2829} 3757}
2830 3758
2831sub update { 3759sub update {
2832 my ($self) = @_; 3760 my ($self) = @_;
2833 3761
2834 return unless $self->{visible}; 3762 return unless $self->{visible};
2835 3763
2836 $self->SUPER::update; 3764 $self->SUPER::update;
2837} 3765}
2838 3766
3767sub invoke_visibility_change {
3768 my ($self) = @_;
3769
3770 $self->update_timer;
3771
3772 0
3773}
3774
2839sub _draw { 3775sub _draw {
2840 my ($self) = @_; 3776 my ($self) = @_;
2841 3777
2842 return unless $::CONN; 3778 $self->SUPER::_draw;
2843 3779
2844 my $face; 3780 if (my $tex = $self->{tex}) {
2845
2846 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}];
2848
2849 $face = $anim->[ $self->{frame} % @$anim ]
2850 if $anim && @$anim;
2851 }
2852
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854
2855 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3781 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3783 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3784 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3785 glDisable GL_TEXTURE_2D;
2861 } 3786 }
2862} 3787}
2863 3788
2864sub DESTROY { 3789sub destroy {
2865 my ($self) = @_; 3790 my ($self) = @_;
2866 3791
2867 $self->{timer}->cancel 3792 (delete $self->{timer})->cancel
2868 if $self->{timer}; 3793 if $self->{timer};
2869 3794
2870 $self->SUPER::DESTROY; 3795 $self->SUPER::destroy;
2871} 3796}
2872 3797
2873############################################################################# 3798#############################################################################
2874 3799
2875package CFClient::UI::Buttonbar; 3800package CFPlus::UI::Buttonbar;
2876 3801
2877our @ISA = CFClient::UI::HBox::; 3802our @ISA = CFPlus::UI::HBox::;
2878 3803
2879# TODO: should actualyl wrap buttons and other goodies. 3804# TODO: should actually wrap buttons and other goodies.
2880 3805
2881############################################################################# 3806#############################################################################
2882 3807
2883package CFClient::UI::Menu; 3808package CFPlus::UI::Menu;
2884 3809
2885our @ISA = CFClient::UI::FancyFrame::; 3810our @ISA = CFPlus::UI::Toplevel::;
2886 3811
2887use CFClient::OpenGL; 3812use CFPlus::OpenGL;
2888 3813
2889sub new { 3814sub new {
2890 my $class = shift; 3815 my $class = shift;
2891 3816
2892 my $self = $class->SUPER::new ( 3817 my $self = $class->SUPER::new (
2893 items => [], 3818 items => [],
2894 z => 100, 3819 z => 100,
2895 @_, 3820 @_,
2896 ); 3821 );
2897 3822
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3823 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2899 3824
2900 for my $item (@{ $self->{items} }) { 3825 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3826 my ($widget, $cb, $tooltip) = @$item;
2902 3827
2903 # handle various types of items, only text for now 3828 # handle various types of items, only text for now
2904 if (!ref $widget) { 3829 if (!ref $widget) {
3830 if ($widget =~ /\t/) {
3831 my ($left, $right) = split /\t/, $widget, 2;
3832
2905 $widget = new CFClient::UI::Label 3833 $widget = new CFPlus::UI::HBox
2906 can_hover => 1, 3834 can_hover => 1,
2907 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,
2908 text => $widget; 3847 markup => $widget,
3848 tooltip => $tooltip;
3849 }
2909 } 3850 }
2910 3851
2911 $self->{item}{$widget} = $item; 3852 $self->{item}{$widget} = $item;
2912 3853
2913 $self->{vbox}->add ($widget); 3854 $self->{vbox}->add ($widget);
… …
2918 3859
2919# 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)
2920sub popup { 3861sub popup {
2921 my ($self, $ev) = @_; 3862 my ($self, $ev) = @_;
2922 3863
2923 $self->_emit ("popdown"); 3864 $self->emit ("popdown");
2924 3865
2925 # maybe save $GRAB? must be careful about events... 3866 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3867 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3868 $self->{button} = $ev->{button};
2928 3869
2929 $self->show; 3870 $self->show;
2930 $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);
2931} 3872}
2932 3873
2933sub mouse_motion { 3874sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3875 my ($self, $ev, $x, $y) = @_;
2935 3876
2936 # TODO: should use vbox->find_widget or so 3877 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3878 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3879 $self->{hover} = $self->{item}{$HOVER};
2939 3880
2940 0 3881 0
2941} 3882}
2942 3883
2943sub button_up { 3884sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3885 my ($self, $ev, $x, $y) = @_;
2945 3886
2946 if ($ev->{button} == $self->{button}) { 3887 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3888 undef $GRAB;
2948 $self->hide; 3889 $self->hide;
2949 3890
2950 $self->_emit ("popdown"); 3891 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3892 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3893 } else {
2953 return 0 3894 return 0
2954 } 3895 }
2955 3896
2956 1 3897 1
2957} 3898}
2958 3899
2959############################################################################# 3900#############################################################################
2960 3901
2961package CFClient::UI::Multiplexer; 3902package CFPlus::UI::Multiplexer;
2962 3903
2963our @ISA = CFClient::UI::Container::; 3904our @ISA = CFPlus::UI::Container::;
2964 3905
2965sub new { 3906sub new {
2966 my $class = shift; 3907 my $class = shift;
2967 3908
2968 my $self = $class->SUPER::new ( 3909 my $self = $class->SUPER::new (
… …
2982 3923
2983 $self->{current} = $self->{children}[0] 3924 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3925 if @{ $self->{children} };
2985} 3926}
2986 3927
3928sub get_current_page {
3929 my ($self) = @_;
3930
3931 $self->{current}
3932}
3933
2987sub set_current_page { 3934sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3935 my ($self, $page_or_widget) = @_;
2989 3936
2990 my $widget = ref $page_or_widget 3937 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3938 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3939 : $self->{children}[$page_or_widget];
2993 3940
2994 $self->{current} = $widget; 3941 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3942 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3943
2997 $self->_emit (page_changed => $self->{current}); 3944 $self->emit (page_changed => $self->{current});
2998 3945
2999 $self->realloc; 3946 $self->realloc;
3000} 3947}
3001 3948
3002sub visible_children { 3949sub visible_children {
… …
3007 my ($self) = @_; 3954 my ($self) = @_;
3008 3955
3009 $self->{current}->size_request 3956 $self->{current}->size_request
3010} 3957}
3011 3958
3012sub size_allocate { 3959sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3960 my ($self, $w, $h) = @_;
3014 3961
3015 $self->{current}->configure (0, 0, $w, $h); 3962 $self->{current}->configure (0, 0, $w, $h);
3963
3964 1
3016} 3965}
3017 3966
3018sub _draw { 3967sub _draw {
3019 my ($self) = @_; 3968 my ($self) = @_;
3020 3969
3021 $self->{current}->draw; 3970 $self->{current}->draw;
3022} 3971}
3023 3972
3024############################################################################# 3973#############################################################################
3025 3974
3026package CFClient::UI::Notebook; 3975package CFPlus::UI::Notebook;
3027 3976
3977use CFPlus::OpenGL;
3978
3028our @ISA = CFClient::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3029 3980
3030sub new { 3981sub new {
3031 my $class = shift; 3982 my $class = shift;
3032 3983
3033 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3036 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3037 @_, 3989 @_,
3038 ); 3990 );
3039 3991
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042 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
3043 $self 4029 $self
3044} 4030}
3045 4031
3046sub 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 {
3047 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3048 4051
3049 Scalar::Util::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3050 4054
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget); 4055 $self->add ($widget);
4056}
4057
4058sub get_current_page {
4059 my ($self) = @_;
4060
4061 $self->{multiplexer}->get_current_page
3058} 4062}
3059 4063
3060sub set_current_page { 4064sub set_current_page {
3061 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3062 4066
3063 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3064 $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 }
3065} 4089}
3066 4090
3067############################################################################# 4091#############################################################################
3068 4092
3069package CFClient::UI::Statusbox; 4093package CFPlus::UI::Selector;
3070 4094
4095use utf8;
4096
3071our @ISA = CFClient::UI::VBox::; 4097our @ISA = CFPlus::UI::Button::;
3072 4098
3073sub new { 4099sub new {
3074 my $class = shift; 4100 my $class = shift;
3075 4101
3076 $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 $item ||= $self->{options}[0]
4132 or return;
4133
4134 $self->{value} = $item->[0];
4135 $self->set_markup ("$item->[1] ⇓");
4136 $self->set_tooltip ($item->[2]);
4137}
4138
4139sub set_value {
4140 my ($self, $value) = @_;
4141
4142 return unless $self->{value} ne $value;
4143
4144 $self->_set_value ($value);
4145 $self->emit (changed => $value);
4146}
4147
4148sub set_options {
4149 my ($self, $options) = @_;
4150
4151 $self->{options} = $options;
4152 $self->_set_value ($self->{value});
4153}
4154
4155#############################################################################
4156
4157package CFPlus::UI::Statusbox;
4158
4159our @ISA = CFPlus::UI::VBox::;
4160
4161sub new {
4162 my $class = shift;
4163
4164 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 4165 fontsize => 0.8,
3078 @_, 4166 @_,
3079 ) 4167 );
4168
4169 CFPlus::weaken (my $this = $self);
4170
4171 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
4172
4173 $self
3080} 4174}
3081 4175
3082sub reorder { 4176sub reorder {
3083 my ($self) = @_; 4177 my ($self) = @_;
3084 my $NOW = time; 4178 my $NOW = Time::HiRes::time;
4179
4180 # freeze display when hovering over any label
4181 return if $CFPlus::UI::TOOLTIP->{owner}
4182 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4183 values %{ $self->{item} };
3085 4184
3086 while (my ($k, $v) = each %{ $self->{item} }) { 4185 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4186 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 4187 }
3089 4188
… …
3092 my @items = sort { 4191 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 4192 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 4193 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 4194 } values %{ $self->{item} };
3096 4195
4196 $self->{timer}->interval (1);
4197
3097 my $count = 10 + 1; 4198 my $count = 10 + 1;
3098 for my $item (@items) { 4199 for my $item (@items) {
3099 last unless --$count; 4200 last unless --$count;
3100 4201
3101 push @widgets, $item->{label} ||= do { 4202 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 4203 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 4204 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 4205 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 4206 : $item->{text};
3106 4207
3107 for ($short) { 4208 for ($short) {
3108 s/^\s+//; 4209 s/^\s+//;
3109 s/\s+/ /g; 4210 s/\s+/ /g;
3110 } 4211 }
3111 4212
3112 new CFClient::UI::Label 4213 new CFPlus::UI::Label
3113 markup => $short, 4214 markup => $short,
3114 tooltip => $item->{tooltip}, 4215 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 4216 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 4217 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 4218 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 4219 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 4220 fg => [@{ $item->{fg} }],
3120 can_events => 1, 4221 can_events => 1,
3121 can_hover => 1 4222 can_hover => 1
3122 }; 4223 };
4224
4225 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4226 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4227 $label->update;
4228 $label->set_max_size (undef, $label->{req_h} * $diff)
4229 if $diff < 1;
4230 $self->{timer}->interval (1/30);
4231 } else {
4232 $label->{fg}[3] = $item->{fg}[3] || 1;
4233 }
4234
4235 push @widgets, $label;
3123 } 4236 }
3124 4237
3125 $self->clear; 4238 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 4239 $self->SUPER::add (reverse @widgets);
3127} 4240}
… …
3132 $text =~ s/^\s+//; 4245 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 4246 $text =~ s/\s+$//;
3134 4247
3135 return unless $text; 4248 return unless $text;
3136 4249
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 4250 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 4251
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4252 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 4253
3141 if (my $item = $self->{item}{$group}) { 4254 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 4255 if ($item->{text} eq $text) {
3143 $item->{count}++; 4256 $item->{count}++;
3144 } else { 4257 } else {
3145 $item->{count} = 1; 4258 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 4259 $item->{text} = $item->{tooltip} = $text;
3147 } 4260 }
3148 $item->{id} = ++$self->{id}; 4261 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 4262 $item->{timeout} = $timeout;
3150 delete $item->{label}; 4263 delete $item->{label};
3151 } else { 4264 } else {
3152 $self->{item}{$group} = { 4265 $self->{item}{$group} = {
3153 id => ++$self->{id}, 4266 id => ++$self->{id},
… …
3159 count => 1, 4272 count => 1,
3160 %arg, 4273 %arg,
3161 }; 4274 };
3162 } 4275 }
3163 4276
4277 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 4278 $self->reorder;
4279 });
3165} 4280}
3166 4281
3167sub reconfigure { 4282sub reconfigure {
3168 my ($self) = @_; 4283 my ($self) = @_;
3169 4284
… …
3172 4287
3173 $self->reorder; 4288 $self->reorder;
3174 $self->SUPER::reconfigure; 4289 $self->SUPER::reconfigure;
3175} 4290}
3176 4291
4292sub destroy {
4293 my ($self) = @_;
4294
4295 $self->{timer}->cancel;
4296
4297 $self->SUPER::destroy;
4298}
4299
3177############################################################################# 4300#############################################################################
3178 4301
3179package CFClient::UI::Inventory;
3180
3181our @ISA = CFClient::UI::ScrolledWindow::;
3182
3183sub new {
3184 my $class = shift;
3185
3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
3428 @_,
3429 )
3430}
3431
3432# XXX: Do sorting? Argl...
3433sub add_spell {
3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
3436
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root; 4302package CFPlus::UI::Root;
3475 4303
3476our @ISA = CFClient::UI::Container::; 4304our @ISA = CFPlus::UI::Container::;
3477 4305
4306use List::Util qw(min max);
4307
3478use CFClient::OpenGL; 4308use CFPlus::OpenGL;
3479 4309
3480sub new { 4310sub new {
3481 my $class = shift; 4311 my $class = shift;
3482 4312
3483 my $self = $class->SUPER::new ( 4313 my $self = $class->SUPER::new (
3484 visible => 1, 4314 visible => 1,
3485 @_, 4315 @_,
3486 ); 4316 );
3487 4317
3488 Scalar::Util::weaken ($self->{root} = $self); 4318 CFPlus::weaken ($self->{root} = $self);
3489 4319
3490 $self 4320 $self
3491} 4321}
3492 4322
3493sub size_request { 4323sub size_request {
… …
3508 $coord = $max - $size if $coord > $max - $size; 4338 $coord = $max - $size if $coord > $max - $size;
3509 4339
3510 int $coord + 0.5 4340 int $coord + 0.5
3511} 4341}
3512 4342
3513sub size_allocate { 4343sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 4344 my ($self, $w, $h) = @_;
3515 4345
3516 for my $child ($self->children) { 4346 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 4348
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 4352 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 4353 $Y = _to_pixel $Y, $H, $self->{h};
3524 4354
3525 $child->configure ($X, $Y, $W, $H); 4355 $child->configure ($X, $Y, $W, $H);
3526 } 4356 }
4357
4358 1
3527} 4359}
3528 4360
3529sub coord2local { 4361sub coord2local {
3530 my ($self, $x, $y) = @_; 4362 my ($self, $x, $y) = @_;
3531 4363
… …
3539} 4371}
3540 4372
3541sub update { 4373sub update {
3542 my ($self) = @_; 4374 my ($self) = @_;
3543 4375
3544 $::WANT_REFRESH++; 4376 $::WANT_REFRESH->start;
3545} 4377}
3546 4378
3547sub add { 4379sub add {
3548 my ($self, @children) = @_; 4380 my ($self, @children) = @_;
3549 4381
… …
3586 while ($self->{refresh_hook}) { 4418 while ($self->{refresh_hook}) {
3587 $_->() 4419 $_->()
3588 for values %{delete $self->{refresh_hook}}; 4420 for values %{delete $self->{refresh_hook}};
3589 } 4421 }
3590 4422
3591 if ($self->{realloc}) { 4423 while ($self->{realloc}) {
3592 my %queue; 4424 my %queue;
3593 my @queue; 4425 my @queue;
3594 my $widget; 4426 my $widget;
3595 4427
3596 outer: 4428 outer:
… …
3616 4448
3617 delete $queue{$widget+0}; 4449 delete $queue{$widget+0};
3618 4450
3619 my ($w, $h) = $widget->size_request; 4451 my ($w, $h) = $widget->size_request;
3620 4452
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4453 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4454 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4455
4456 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4457 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 4458
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 4459 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 4460 $h = $widget->{force_h} if exists $widget->{force_h};
3626 4461
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4462 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3640 } 4475 }
3641 } 4476 }
3642 4477
3643 delete $self->{realloc}{$widget+0}; 4478 delete $self->{realloc}{$widget+0};
3644 } 4479 }
3645 }
3646 4480
3647 while (my $size_alloc = delete $self->{size_alloc}) { 4481 while (my $size_alloc = delete $self->{size_alloc}) {
3648 my @queue = sort { $b->{visible} <=> $a->{visible} } 4482 my @queue = sort { $a->{visible} <=> $b->{visible} }
3649 values %$size_alloc; 4483 values %$size_alloc;
3650 4484
3651 while () { 4485 while () {
3652 my $widget = pop @queue || last; 4486 my $widget = pop @queue || last;
3653 4487
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4488 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 4489
3656 $w = 0 if $w < 0; 4490 $w = max $widget->{min_w}, $w;
3657 $h = 0 if $h < 0; 4491 $h = max $widget->{min_h}, $h;
3658 4492
4493# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4494# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4495
4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4498
3659 $w = int $w + 0.5; 4499 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 4500 $h = int $h + 0.5;
3661 4501
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4502 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3663 $widget->{old_w} = $widget->{w}; 4503 $widget->{old_w} = $widget->{w};
3664 $widget->{old_h} = $widget->{h}; 4504 $widget->{old_h} = $widget->{h};
3665 4505
3666 $widget->{w} = $w; 4506 $widget->{w} = $w;
3667 $widget->{h} = $h; 4507 $widget->{h} = $h;
3668 4508
3669 $widget->emit (size_allocate => $w, $h); 4509 $widget->emit (size_allocate => $w, $h);
4510 }
3670 } 4511 }
3671 } 4512 }
3672 } 4513 }
3673 4514
3674 while ($self->{post_alloc_hook}) { 4515 while ($self->{post_alloc_hook}) {
3675 $_->() 4516 $_->()
3676 for values %{delete $self->{post_alloc_hook}}; 4517 for values %{delete $self->{post_alloc_hook}};
3677 } 4518 }
3678
3679 4519
3680 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4520 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4521 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3682 glClear GL_COLOR_BUFFER_BIT; 4522 glClear GL_COLOR_BUFFER_BIT;
3683 4523
… …
3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4526 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3687 glMatrixMode GL_MODELVIEW; 4527 glMatrixMode GL_MODELVIEW;
3688 glLoadIdentity; 4528 glLoadIdentity;
3689 4529
3690 { 4530 {
3691 package CFClient::UI::Base; 4531 package CFPlus::UI::Base;
3692 4532
3693 ($draw_x, $draw_y, $draw_w, $draw_h) = 4533 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h}); 4534 (0, 0, $self->{w}, $self->{h});
3695 }
3696 4535
3697 $self->_draw; 4536 $self->_draw;
4537 }
3698} 4538}
3699 4539
3700############################################################################# 4540#############################################################################
3701 4541
3702package CFClient::UI; 4542package CFPlus::UI;
3703 4543
3704$ROOT = new CFClient::UI::Root; 4544$ROOT = new CFPlus::UI::Root;
3705$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4545$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3706 4546
37071 45471
3708 4548

Diff Legend

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