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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

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

Diff Legend

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