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

Diff Legend

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