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

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

Diff Legend

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