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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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