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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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