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.376 by root, Mon Jul 16 20:20:23 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines