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

Diff Legend

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