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

Diff Legend

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