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

Diff Legend

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