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

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

Diff Legend

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