ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.380 by root, Tue Jul 17 17:39:07 2007 UTC

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

Diff Legend

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