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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

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

Diff Legend

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