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

Diff Legend

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